Merge tag 'xgene-dts-for-v4.7-part1' of https://github.com/AppliedMicro/xgene-next...

Merge "First part of X-Gene DTS changes queued for v4.7" from Duc Dang:

This patch set only includes a single change to
fix the compatible string for SATA controllers on
X-Gene v2 SOC platforms.

* tag 'xgene-dts-for-v4.7-part1' of https://github.com/AppliedMicro/xgene-next:
  arm64: dts: apm: Fix compatible string for X-Gene 2 SATA controller DTS node

diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
index a055a5d443b76b83dde3c5f68739e54f9bb9ac2d..f7a36dbbcb15460b67ecdb727873383e85f00fb2 100644 (file)
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@ -543,7 +543,7 @@
                };
 
                sata1: sata@1a000000 {
-                       compatible = "apm,xgene-ahci";
+                       compatible = "apm,xgene-ahci-v2";
                        reg = <0x0 0x1a000000 0x0 0x1000>,
                              <0x0 0x1f200000 0x0 0x1000>,
                              <0x0 0x1f20d000 0x0 0x1000>,
@@ -553,7 +553,7 @@
                };
 
                sata2: sata@1a200000 {
-                       compatible = "apm,xgene-ahci";
+                       compatible = "apm,xgene-ahci-v2";
                        reg = <0x0 0x1a200000 0x0 0x1000>,
                              <0x0 0x1f210000 0x0 0x1000>,
                              <0x0 0x1f21d000 0x0 0x1000>,
@@ -563,7 +563,7 @@
                };
 
                sata3: sata@1a400000 {
-                       compatible = "apm,xgene-ahci";
+                       compatible = "apm,xgene-ahci-v2";
                        reg = <0x0 0x1a400000 0x0 0x1000>,
                              <0x0 0x1f220000 0x0 0x1000>,
                              <0x0 0x1f22d000 0x0 0x1000>,