Commit ecd755fb authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Greg Kroah-Hartman
Browse files

ARM: dts: mmp*: Make the serial ports compatible with xscale-uart 



XScale serial port driver is perfectly capable of supporting this hardware. A
separate compatible string is probably a historical mess.

Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20200320174107.29406-7-lkundrak@v3.sk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c10419f9

arch/arm/boot/dts/mmp2.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ 
			};



			uart1: serial@d4030000 {

				compatible = "mrvl,mmp-uart";

				compatible = "mrvl,mmp-uart", "intel,xscale-uart";

				reg = <0xd4030000 0x1000>;

				interrupts = <27>;

				clocks = <&soc_clocks MMP2_CLK_UART0>;
@@ -219,7 +219,7 @@ 
			};



			uart2: serial@d4017000 {

				compatible = "mrvl,mmp-uart";

				compatible = "mrvl,mmp-uart", "intel,xscale-uart";

				reg = <0xd4017000 0x1000>;

				interrupts = <28>;

				clocks = <&soc_clocks MMP2_CLK_UART1>;
@@ -229,7 +229,7 @@ 
			};



			uart3: serial@d4018000 {

				compatible = "mrvl,mmp-uart";

				compatible = "mrvl,mmp-uart", "intel,xscale-uart";

				reg = <0xd4018000 0x1000>;

				interrupts = <24>;

				clocks = <&soc_clocks MMP2_CLK_UART2>;
@@ -239,7 +239,7 @@ 
			};



			uart4: serial@d4016000 {

				compatible = "mrvl,mmp-uart";

				compatible = "mrvl,mmp-uart", "intel,xscale-uart";

				reg = <0xd4016000 0x1000>;

				interrupts = <46>;

				clocks = <&soc_clocks MMP2_CLK_UART3>;

arch/arm/boot/dts/mmp3.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ 
			};



			uart1: serial@d4030000 {

				compatible = "mrvl,mmp-uart";

				compatible = "mrvl,mmp-uart", "intel,xscale-uart";

				reg = <0xd4030000 0x1000>;

				interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&soc_clocks MMP2_CLK_UART0>;
@@ -329,7 +329,7 @@ 
			};



			uart2: serial@d4017000 {

				compatible = "mrvl,mmp-uart";

				compatible = "mrvl,mmp-uart", "intel,xscale-uart";

				reg = <0xd4017000 0x1000>;

				interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&soc_clocks MMP2_CLK_UART1>;
@@ -339,7 +339,7 @@ 
			};



			uart3: serial@d4018000 {

				compatible = "mrvl,mmp-uart";

				compatible = "mrvl,mmp-uart", "intel,xscale-uart";

				reg = <0xd4018000 0x1000>;

				interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&soc_clocks MMP2_CLK_UART2>;
@@ -349,7 +349,7 @@ 
			};



			uart4: serial@d4016000 {

				compatible = "mrvl,mmp-uart";

				compatible = "mrvl,mmp-uart", "intel,xscale-uart";

				reg = <0xd4016000 0x1000>;

				interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&soc_clocks MMP2_CLK_UART3>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE