Unverified Commit 705ebd77 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm-dt-for-v6.5' of... 

Merge tag 'amlogic-arm-dt-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt

Amlogic ARM DT changes for v6.5:
- correct uart_B and uart_C clock references for meson8 & meson8b

* tag 'amlogic-arm-dt-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  ARM: dts: meson8: correct uart_B and uart_C clock references
  ARM: dts: meson8b: correct uart_B and uart_C clock references

Link: https://lore.kernel.org/r/21b55df9-3eda-0a0f-cf76-79b1d7735314@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a813efaf 98b503c7

arch/arm/boot/dts/meson8.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -769,13 +769,13 @@ &uart_A { 


&uart_B {

	compatible = "amlogic,meson8-uart";

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

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

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

};



&uart_C {

	compatible = "amlogic,meson8-uart";

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

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

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

};

arch/arm/boot/dts/meson8b.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -740,13 +740,13 @@ &uart_A { 


&uart_B {

	compatible = "amlogic,meson8b-uart";

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

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

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

};



&uart_C {

	compatible = "amlogic,meson8b-uart";

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

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

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

};