ata: ahci_brcmstb: add support for MIPS-based platforms

The BCM7xxx ARM-based and MIPS-based platforms share a similar hardware
block for AHCI SATA3.

This new compatible string, "brcm,bcm7425-ahci", may be used for most
MIPS-based platforms of 40nm process technology.

Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt b/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt
index 20ac9bbfa1fda45e4d59e67ace1a202f98f1ee25..60872838f1adb772d04e0db6b50678d850be2a73 100644 (file)
--- a/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt
+++ b/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt
@@ -4,7 +4,9 @@ SATA nodes are defined to describe on-chip Serial ATA controllers.
 Each SATA controller should have its own node.
 
 Required properties:
-- compatible         : compatible list, may contain "brcm,bcm7445-ahci" and/or
+- compatible         : should be one or more of
+                       "brcm,bcm7425-ahci"
+                       "brcm,bcm7445-ahci"
                        "brcm,sata3-ahci"
 - reg                : register mappings for AHCI and SATA_TOP_CTRL
 - reg-names          : "ahci" and "top-ctrl"

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 6aaa3f81755be2e4917decb14c8f52348efeb0d0..861643ea91b5b5c1d13d4b01a5311e2dcd6171ec 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -100,7 +100,7 @@ config SATA_AHCI_PLATFORM
 
 config AHCI_BRCMSTB
        tristate "Broadcom STB AHCI SATA support"
-       depends on ARCH_BRCMSTB
+       depends on ARCH_BRCMSTB || BMIPS_GENERIC
        help
          This option enables support for the AHCI SATA3 controller found on
          STB SoC's.

diff --git a/drivers/ata/ahci_brcmstb.c b/drivers/ata/ahci_brcmstb.c
index 93e070348f06d7de09938a5e1564224357a52438..a4a0940307bc0400b0b26e1dc4619ecc36518f9b 100644 (file)
--- a/drivers/ata/ahci_brcmstb.c
+++ b/drivers/ata/ahci_brcmstb.c
@@ -318,6 +318,7 @@ static int brcm_ahci_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id ahci_of_match[] = {
+       {.compatible = "brcm,bcm7425-ahci"},
        {.compatible = "brcm,bcm7445-ahci"},
        {},
 };