| Message ID | 1466085215-10246-5-git-send-email-yendapally.reddy@broadcom.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On 06/16/2016 06:53 AM, Yendapally Reddy Dhananjaya Reddy wrote: > 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> There is currently nothing referencing AHCI_BRCMSTB in the in-tree defconfigs, but we should coordinate this change with this patch: https://patchwork.kernel.org/patch/9130007/ which I have queued locally to send for 4.8, if we know this is going to be accepted for 4.8, then I can update the patch above. Other than that: Acked-by: Florian Fainelli <f.fainelli@gmail.com>
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index e2dc4c0..8fe06e6 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -98,12 +98,12 @@ config SATA_AHCI_PLATFORM If unsure, say N. -config AHCI_BRCMSTB - tristate "Broadcom STB AHCI SATA support" +config AHCI_BRCM + tristate "Broadcom AHCI SATA support" depends on ARCH_BRCMSTB || BMIPS_GENERIC help This option enables support for the AHCI SATA3 controller found on - STB SoC's. + Broadcom SoC's. If unsure, say N. diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 0b2afb7..a46e6b7 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_SATA_INIC162X) += sata_inic162x.o obj-$(CONFIG_SATA_SIL24) += sata_sil24.o obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o obj-$(CONFIG_SATA_HIGHBANK) += sata_highbank.o libahci.o -obj-$(CONFIG_AHCI_BRCMSTB) += ahci_brcmstb.o libahci.o libahci_platform.o +obj-$(CONFIG_AHCI_BRCM) += ahci_brcm.o libahci.o libahci_platform.o obj-$(CONFIG_AHCI_CEVA) += ahci_ceva.o libahci.o libahci_platform.o obj-$(CONFIG_AHCI_DA850) += ahci_da850.o libahci.o libahci_platform.o 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 similarity index 100% rename from drivers/ata/ahci_brcmstb.c rename to drivers/ata/ahci_brcm.c
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> --- drivers/ata/Kconfig | 6 +++--- drivers/ata/Makefile | 2 +- drivers/ata/{ahci_brcmstb.c => ahci_brcm.c} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename drivers/ata/{ahci_brcmstb.c => ahci_brcm.c} (100%)