summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorJaedon Shin <jaedon.shin@gmail.com>2015-11-26 11:56:29 +0900
committerTejun Heo <tj@kernel.org>2015-12-31 21:19:35 -0500
commit1980eb9bd7d733ce089f9b154c08c2c71fb1f2a7 (patch)
tree0556ec1ad5942cfbb291af17727f987e1abfb85d /drivers/ata
parentdfcdc5fe0379d5650c9306ecc6fcc5cb6cb8982a (diff)
downloadlinux-stable-1980eb9bd7d733ce089f9b154c08c2c71fb1f2a7.tar.gz
linux-stable-1980eb9bd7d733ce089f9b154c08c2c71fb1f2a7.tar.bz2
linux-stable-1980eb9bd7d733ce089f9b154c08c2c71fb1f2a7.zip
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>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/Kconfig2
-rw-r--r--drivers/ata/ahci_brcmstb.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 6aaa3f81755b..861643ea91b5 100644
--- 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 93e070348f06..a4a0940307bc 100644
--- 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"},
{},
};