Merge tag 'tty-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / marvell / armada-37xx.dtsi

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 30233de..8c8bb97 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -132,10 +132,20 @@
                                reg = <0x11500 0x40>;
                        };
 
+                       uartclk: clock-controller@12010 {
+                               compatible = "marvell,armada-3700-uart-clock";
+                               reg = <0x12010 0x4>, <0x12210 0x4>;
+                               clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
+                                        <&tbg 3>, <&xtalclk>;
+                               clock-names = "TBG-A-P", "TBG-B-P", "TBG-A-S",
+                                             "TBG-B-S", "xtal";
+                               #clock-cells = <1>;
+                       };
+
                        uart0: serial@12000 {
                                compatible = "marvell,armada-3700-uart";
                                reg = <0x12000 0x18>;
-                               clocks = <&xtalclk>;
+                               clocks = <&uartclk 0>;
                                interrupts =
                                <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
                                <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
@@ -147,7 +157,7 @@
                        uart1: serial@12200 {
                                compatible = "marvell,armada-3700-uart-ext";
                                reg = <0x12200 0x30>;
-                               clocks = <&xtalclk>;
+                               clocks = <&uartclk 1>;
                                interrupts =
                                <GIC_SPI 30 IRQ_TYPE_EDGE_RISING>,
                                <GIC_SPI 31 IRQ_TYPE_EDGE_RISING>;