phy: Rename phy-brcmstb-sata driver to phy-brcm-sata driver

Currently, we have a common SATA3 PHY driver for all Broadcom
STB SoCs. This driver can be extended and re-used for Broadcom
iProc SoCs having same SATA3 PHY.

This patch renames existing Broadcom STB SATA3 PHY driver to
common Broadcom SATA3 PHY driver to share this PHY driver across
Broadcom SoCs.

Signed-off-by: Anup Patel <anup.patel@broadcom.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 08f790a0af0070290a47eea864952e08afa1c272..46bb2c2075d816525b5f8771fd28e508513e49d3 100644 (file)
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -403,15 +403,6 @@ config PHY_TUSB1210
        help
          Support for TI TUSB1210 USB ULPI PHY.
 
-config PHY_BRCMSTB_SATA
-       tristate "Broadcom STB SATA PHY driver"
-       depends on ARCH_BRCMSTB || BMIPS_GENERIC
-       depends on OF
-       select GENERIC_PHY
-       help
-         Enable this to support the SATA3 PHY on 28nm or 40nm Broadcom STB SoCs.
-         Likely useful only with CONFIG_SATA_BRCMSTB enabled.
-
 config PHY_CYGNUS_PCIE
        tristate "Broadcom Cygnus PCIe PHY driver"
        depends on OF && (ARCH_BCM_CYGNUS || COMPILE_TEST)
@@ -421,4 +412,13 @@ config PHY_CYGNUS_PCIE
          Enable this to support the Broadcom Cygnus PCIe PHY.
          If unsure, say N.
 
+config PHY_BRCM_SATA
+       tristate "Broadcom SATA PHY driver"
+       depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || COMPILE_TEST
+       depends on OF
+       select GENERIC_PHY
+       default ARCH_BCM_IPROC
+       help
+         Enable this to support the Broadcom SATA PHY.
+         If unsure, say N.
 endmenu

diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 24596a96a8876faa14ddf7a94175c55e1603628a..596fae9b95d0c6351b89a5ba049243f739ae7726 100644 (file)
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -49,6 +49,6 @@ obj-$(CONFIG_PHY_QCOM_UFS)    += phy-qcom-ufs.o
 obj-$(CONFIG_PHY_QCOM_UFS)     += phy-qcom-ufs-qmp-20nm.o
 obj-$(CONFIG_PHY_QCOM_UFS)     += phy-qcom-ufs-qmp-14nm.o
 obj-$(CONFIG_PHY_TUSB1210)             += phy-tusb1210.o
-obj-$(CONFIG_PHY_BRCMSTB_SATA)         += phy-brcmstb-sata.o
 obj-$(CONFIG_PHY_PISTACHIO_USB)                += phy-pistachio-usb.o
 obj-$(CONFIG_PHY_CYGNUS_PCIE)          += phy-bcm-cygnus-pcie.o
+obj-$(CONFIG_PHY_BRCM_SATA)            += phy-brcm-sata.o

diff --git a/drivers/phy/phy-brcmstb-sata.c b/drivers/phy/phy-brcm-sata.c
similarity index 97%
rename from drivers/phy/phy-brcmstb-sata.c
rename to drivers/phy/phy-brcm-sata.c
index a23172ff40e318aeaf21ed55389f1893290867a0..c97b9d6ff3e8bf03da7be60c834b4d011de237db 100644 (file)
--- a/drivers/phy/phy-brcmstb-sata.c
+++ b/drivers/phy/phy-brcm-sata.c
@@ -1,7 +1,7 @@
 /*
  * Broadcom SATA3 AHCI Controller PHY Driver
  *
- * Copyright © 2009-2015 Broadcom Corporation
+ * Copyright (C) 2016 Broadcom
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -238,13 +238,13 @@ static struct platform_driver brcm_sata_phy_driver = {
        .probe  = brcm_sata_phy_probe,
        .driver = {
                .of_match_table = brcm_sata_phy_of_match,
-               .name           = "brcmstb-sata-phy",
+               .name           = "brcm-sata-phy",
        }
 };
 module_platform_driver(brcm_sata_phy_driver);
 
-MODULE_DESCRIPTION("Broadcom STB SATA PHY driver");
+MODULE_DESCRIPTION("Broadcom SATA PHY driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Marc Carino");
 MODULE_AUTHOR("Brian Norris");
-MODULE_ALIAS("platform:phy-brcmstb-sata");
+MODULE_ALIAS("platform:phy-brcm-sata");