[Letux-kernel] [PATCH 09/20] fixup! Added missing, fixed JZ4730 DT file.

Lubomir Rintel lkundrak at v3.sk
Tue Nov 17 21:58:02 CET 2020


Make the UART compatible with ingenic,jz4780-uart. There shoudn't have
been separate compatible strings for each silicon variant -- the 8250
driver can already understand a bunch of standard properties that can
parametrize the differencies.

I guess this doesn't make a difference for Linux since both compatible
strings are set in stone already, but U-Boot only understands
ingenic,jz4780-uart.

Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
---
 arch/mips/boot/dts/ingenic/jz4730.dtsi | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/arch/mips/boot/dts/ingenic/jz4730.dtsi b/arch/mips/boot/dts/ingenic/jz4730.dtsi
index c3059b3017590..e70ac8b97c460 100644
--- a/arch/mips/boot/dts/ingenic/jz4730.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4730.dtsi
@@ -218,9 +218,13 @@ mmc: mmc at 10021000 {
 	};
 
 	uart0: serial at 10030000 {
-		compatible = "ingenic,jz4740-uart";
+		compatible = "ingenic,jz4740-uart", "ingenic,jz4780-uart";
 		reg = <0x10030000 0x100>;
 
+		reg-shift = <2>;
+		fifo-size = <16>;
+		tx-threshold = <8>;
+
 		interrupt-parent = <&intc>;
 		interrupts = <9>;
 
@@ -229,9 +233,13 @@ uart0: serial at 10030000 {
 	};
 
 	uart1: serial at 10031000 {
-		compatible = "ingenic,jz4740-uart";
+		compatible = "ingenic,jz4740-uart", "ingenic,jz4780-uart";
 		reg = <0x10031000 0x100>;
 
+		reg-shift = <2>;
+		fifo-size = <16>;
+		tx-threshold = <8>;
+
 		interrupt-parent = <&intc>;
 		interrupts = <8>;
 
@@ -240,9 +248,13 @@ uart1: serial at 10031000 {
 	};
 
 	uart2: serial at 10032000 {
-		compatible = "ingenic,jz4740-uart";
+		compatible = "ingenic,jz4740-uart", "ingenic,jz4780-uart";
 		reg = <0x10032000 0x100>;
 
+		reg-shift = <2>;
+		fifo-size = <16>;
+		tx-threshold = <8>;
+
 		interrupt-parent = <&intc>;
 		interrupts = <7>;
 
@@ -251,9 +263,13 @@ uart2: serial at 10032000 {
 	};
 
 	uart3: serial at 10033000 {
-		compatible = "ingenic,jz4740-uart";
+		compatible = "ingenic,jz4740-uart", "ingenic,jz4780-uart";
 		reg = <0x10033000 0x100>;
 
+		reg-shift = <2>;
+		fifo-size = <16>;
+		tx-threshold = <8>;
+
 		interrupt-parent = <&intc>;
 		interrupts = <6>;
 
-- 
2.28.0



More information about the Letux-kernel mailing list