diff options
author | Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com> | 2016-06-16 09:53:32 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-06-16 16:24:55 -0400 |
commit | eba68f829794a1c3eb7a78d53c652daa303580ed (patch) | |
tree | d45312aede8692697efef404bf114a0a8b42a077 | |
parent | a55448d1c01ca4b4e94e1d51249feee4aa315d6d (diff) |
ata: ahci_brcmstb: rename to support across Broadcom SoC's
Rename the existing Broadcom STB ahci driver to common
Broadcom SATA3 driver to share this across Broadcom SoCs.
Signed-off-by: Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r-- | drivers/ata/Kconfig | 6 | ||||
-rw-r--r-- | drivers/ata/Makefile | 2 | ||||
-rw-r--r-- | drivers/ata/ahci_brcm.c (renamed from drivers/ata/ahci_brcmstb.c) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index e2dc4c045146..8fe06e6a9a0b 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -98,12 +98,12 @@ config SATA_AHCI_PLATFORM | |||
98 | 98 | ||
99 | If unsure, say N. | 99 | If unsure, say N. |
100 | 100 | ||
101 | config AHCI_BRCMSTB | 101 | config AHCI_BRCM |
102 | tristate "Broadcom STB AHCI SATA support" | 102 | tristate "Broadcom AHCI SATA support" |
103 | depends on ARCH_BRCMSTB || BMIPS_GENERIC | 103 | depends on ARCH_BRCMSTB || BMIPS_GENERIC |
104 | help | 104 | help |
105 | This option enables support for the AHCI SATA3 controller found on | 105 | This option enables support for the AHCI SATA3 controller found on |
106 | STB SoC's. | 106 | Broadcom SoC's. |
107 | 107 | ||
108 | If unsure, say N. | 108 | If unsure, say N. |
109 | 109 | ||
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 0b2afb7e5f35..a46e6b784bda 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile | |||
@@ -11,7 +11,7 @@ obj-$(CONFIG_SATA_INIC162X) += sata_inic162x.o | |||
11 | obj-$(CONFIG_SATA_SIL24) += sata_sil24.o | 11 | obj-$(CONFIG_SATA_SIL24) += sata_sil24.o |
12 | obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o | 12 | obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o |
13 | obj-$(CONFIG_SATA_HIGHBANK) += sata_highbank.o libahci.o | 13 | obj-$(CONFIG_SATA_HIGHBANK) += sata_highbank.o libahci.o |
14 | obj-$(CONFIG_AHCI_BRCMSTB) += ahci_brcmstb.o libahci.o libahci_platform.o | 14 | obj-$(CONFIG_AHCI_BRCM) += ahci_brcm.o libahci.o libahci_platform.o |
15 | obj-$(CONFIG_AHCI_CEVA) += ahci_ceva.o libahci.o libahci_platform.o | 15 | obj-$(CONFIG_AHCI_CEVA) += ahci_ceva.o libahci.o libahci_platform.o |
16 | obj-$(CONFIG_AHCI_DA850) += ahci_da850.o libahci.o libahci_platform.o | 16 | obj-$(CONFIG_AHCI_DA850) += ahci_da850.o libahci.o libahci_platform.o |
17 | obj-$(CONFIG_AHCI_IMX) += ahci_imx.o libahci.o libahci_platform.o | 17 | obj-$(CONFIG_AHCI_IMX) += ahci_imx.o libahci.o libahci_platform.o |
diff --git a/drivers/ata/ahci_brcmstb.c b/drivers/ata/ahci_brcm.c index e87bcec0fd7c..e87bcec0fd7c 100644 --- a/drivers/ata/ahci_brcmstb.c +++ b/drivers/ata/ahci_brcm.c | |||