From b6ed27a1987dbd68ac6f66712aabd20ce5ac42b2 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Sat, 21 Apr 2012 17:40:12 +0530 Subject: [PATCH] --- yaml --- r: 300024 b: refs/heads/master c: 5f098a3ea72e73ad3733c3280fd5ee04816dc999 h: refs/heads/master v: v3 --- [refs] | 2 +- .../bindings/ata/{calxeda-sata.txt => ahci-platform.txt} | 5 ++--- trunk/drivers/ata/ahci_platform.c | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) rename trunk/Documentation/devicetree/bindings/ata/{calxeda-sata.txt => ahci-platform.txt} (90%) diff --git a/[refs] b/[refs] index 0e141491d104..a6042ab70c44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb9751d471977be402efa1ee5885a17af78cbc55 +refs/heads/master: 5f098a3ea72e73ad3733c3280fd5ee04816dc999 diff --git a/trunk/Documentation/devicetree/bindings/ata/calxeda-sata.txt b/trunk/Documentation/devicetree/bindings/ata/ahci-platform.txt similarity index 90% rename from trunk/Documentation/devicetree/bindings/ata/calxeda-sata.txt rename to trunk/Documentation/devicetree/bindings/ata/ahci-platform.txt index 79caa5651f53..8bb8a76d42e8 100644 --- a/trunk/Documentation/devicetree/bindings/ata/calxeda-sata.txt +++ b/trunk/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/trunk/drivers/ata/ahci_platform.c b/trunk/drivers/ata/ahci_platform.c index 0c86c77764bc..9e419e1c2006 100644 --- a/trunk/drivers/ata/ahci_platform.c +++ b/trunk/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);