From patchwork Fri Apr 20 14:38:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/5] ata: ahci_platform: Add synopsys ahci controller in DT's compatible list Date: Fri, 20 Apr 2012 04:38:22 -0000 From: viresh kumar X-Patchwork-Id: 154051 Message-Id: <16516ae5fb3d4454124e0f30f0943e52434d4908.1334932338.git.viresh.kumar@st.com> To: jgarzik@redhat.com Cc: spear-devel@list.st.com, viresh.linux@gmail.com, linux-ide@vger.kernel.org, Viresh Kumar , Rob Herring SPEAr13xx series of SoCs contain Synopsys AHCI SATA Controller which shares ahci_platform driver with other controller versions. This patch updates DT compatible list for ahci_platform. It also updates and renames binding documentation to more generic name. Signed-off-by: Viresh Kumar Cc: Rob Herring --- .../ata/{calxeda-sata.txt => ahci-platform.txt} | 5 ++--- drivers/ata/ahci_platform.c | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) rename Documentation/devicetree/bindings/ata/{calxeda-sata.txt => ahci-platform.txt} (90%) diff --git a/Documentation/devicetree/bindings/ata/calxeda-sata.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt similarity index 90% rename from Documentation/devicetree/bindings/ata/calxeda-sata.txt rename to Documentation/devicetree/bindings/ata/ahci-platform.txt index 79caa56..8bb8a76 100644 --- a/Documentation/devicetree/bindings/ata/calxeda-sata.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -1,10 +1,10 @@ -* Calxeda SATA Controller +* AHCI SATA Controller SATA nodes are defined to describe on-chip Serial ATA controllers. Each SATA controller should have its own node. Required properties: -- compatible : compatible list, contains "calxeda,hb-ahci" +- compatible : compatible list, contains "calxeda,hb-ahci" or "snps,spear-ahci" - interrupts : - reg : @@ -14,4 +14,3 @@ Example: reg = <0xffe08000 0x1000>; interrupts = <115>; }; - diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 0c86c77..9e419e1 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -280,6 +280,7 @@ static struct dev_pm_ops ahci_pm_ops = { static const struct of_device_id ahci_of_match[] = { { .compatible = "calxeda,hb-ahci", }, + { .compatible = "snps,spear-ahci", }, {}, }; MODULE_DEVICE_TABLE(of, ahci_of_match);