Skip to content

Commit

Permalink
Merge tag 'xgene-dts-for-v4.7-part1' of https://github.com/AppliedMic…
Browse files Browse the repository at this point in the history
…ro/xgene-next into next/dt64

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
  • Loading branch information
Arnd Bergmann committed Apr 25, 2016
2 parents 0413630 + 01d1b6e commit 11a138e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand All @@ -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>,
Expand All @@ -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>,
Expand Down

0 comments on commit 11a138e

Please sign in to comment.