Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
index 9dcf16b..994a2fc 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
@@ -275,7 +275,7 @@
                        };
                };
 
-               CP11X_LABEL(usb3_0): usb3@500000 {
+               CP11X_LABEL(usb3_0): usb@500000 {
                        compatible = "marvell,armada-8k-xhci",
                        "generic-xhci";
                        reg = <0x500000 0x4000>;
@@ -287,7 +287,7 @@
                        status = "disabled";
                };
 
-               CP11X_LABEL(usb3_1): usb3@510000 {
+               CP11X_LABEL(usb3_1): usb@510000 {
                        compatible = "marvell,armada-8k-xhci",
                        "generic-xhci";
                        reg = <0x510000 0x4000>;
@@ -300,11 +300,9 @@
                };
 
                CP11X_LABEL(sata0): sata@540000 {
-                       compatible = "marvell,armada-8k-ahci",
-                       "generic-ahci";
+                       compatible = "marvell,armada-8k-ahci";
                        reg = <0x540000 0x30000>;
                        dma-coherent;
-                       interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&CP11X_LABEL(clk) 1 15>,
                                 <&CP11X_LABEL(clk) 1 16>;
                        #address-cells = <1>;
@@ -312,10 +310,12 @@
                        status = "disabled";
 
                        sata-port@0 {
+                               interrupts = <109 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0>;
                        };
 
                        sata-port@1 {
+                               interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <1>;
                        };
                };