Unverified Commit 78960206 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-fixes-v5.17-rc-v2' of... 

Merge tag 'amlogic-fixes-v5.17-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes

Amlogic fixes for v5.17-rc
- meson6/meson8/meson8b UART compatible fixup to notably fix earlycon

* tag 'amlogic-fixes-v5.17-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  ARM: dts: meson8b: Fix the UART device-tree schema validation
  ARM: dts: meson8: Fix the UART device-tree schema validation
  ARM: dts: meson: Fix the UART compatible strings

Link: https://lore.kernel.org/r/746a7f25-1c96-9d27-3a08-e86b2af608ef@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4a64f2d3 3375aa77

arch/arm/boot/dts/meson.dtsi

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



			uart_A: serial@84c0 {

				compatible = "amlogic,meson6-uart", "amlogic,meson-uart";

				compatible = "amlogic,meson6-uart";

				reg = <0x84c0 0x18>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				fifo-size = <128>;
@@ -67,7 +67,7 @@ 
			};



			uart_B: serial@84dc {

				compatible = "amlogic,meson6-uart", "amlogic,meson-uart";

				compatible = "amlogic,meson6-uart";

				reg = <0x84dc 0x18>;

				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";
@@ -105,7 +105,7 @@ 
			};



			uart_C: serial@8700 {

				compatible = "amlogic,meson6-uart", "amlogic,meson-uart";

				compatible = "amlogic,meson6-uart";

				reg = <0x8700 0x18>;

				interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";
@@ -228,7 +228,7 @@ 
			};



			uart_AO: serial@4c0 {

				compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";

				compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart";

				reg = <0x4c0 0x18>;

				interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

arch/arm/boot/dts/meson8.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -736,27 +736,27 @@ 
};



&uart_AO {

	compatible = "amlogic,meson8-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8-uart", "amlogic,meson-ao-uart";

	clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_A {

	compatible = "amlogic,meson8-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_B {

	compatible = "amlogic,meson8-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_C {

	compatible = "amlogic,meson8-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&usb0 {

arch/arm/boot/dts/meson8b.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -724,27 +724,27 @@ 
};



&uart_AO {

	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8b-uart", "amlogic,meson-ao-uart";

	clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_A {

	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8b-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_B {

	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8b-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_C {

	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8b-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&usb0 {