aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnup Patel <anup.patel@broadcom.com>2016-03-28 00:48:26 -0400
committerKishon Vijay Abraham I <kishon@ti.com>2016-04-29 05:10:07 -0400
commit037c418945edb9eb2006abe273910212af85629e (patch)
tree4d8458f31b35f635383a5bf8e7cabaa1c76e03f9
parentec9e80527621f8944aefbe870958c168bf47d09d (diff)
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>
-rw-r--r--drivers/phy/Kconfig18
-rw-r--r--drivers/phy/Makefile2
-rw-r--r--drivers/phy/phy-brcm-sata.c (renamed from drivers/phy/phy-brcmstb-sata.c)8
3 files changed, 14 insertions, 14 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 08f790a0af00..46bb2c2075d8 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -403,15 +403,6 @@ config PHY_TUSB1210
403 help 403 help
404 Support for TI TUSB1210 USB ULPI PHY. 404 Support for TI TUSB1210 USB ULPI PHY.
405 405
406config PHY_BRCMSTB_SATA
407 tristate "Broadcom STB SATA PHY driver"
408 depends on ARCH_BRCMSTB || BMIPS_GENERIC
409 depends on OF
410 select GENERIC_PHY
411 help
412 Enable this to support the SATA3 PHY on 28nm or 40nm Broadcom STB SoCs.
413 Likely useful only with CONFIG_SATA_BRCMSTB enabled.
414
415config PHY_CYGNUS_PCIE 406config PHY_CYGNUS_PCIE
416 tristate "Broadcom Cygnus PCIe PHY driver" 407 tristate "Broadcom Cygnus PCIe PHY driver"
417 depends on OF && (ARCH_BCM_CYGNUS || COMPILE_TEST) 408 depends on OF && (ARCH_BCM_CYGNUS || COMPILE_TEST)
@@ -421,4 +412,13 @@ config PHY_CYGNUS_PCIE
421 Enable this to support the Broadcom Cygnus PCIe PHY. 412 Enable this to support the Broadcom Cygnus PCIe PHY.
422 If unsure, say N. 413 If unsure, say N.
423 414
415config PHY_BRCM_SATA
416 tristate "Broadcom SATA PHY driver"
417 depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || COMPILE_TEST
418 depends on OF
419 select GENERIC_PHY
420 default ARCH_BCM_IPROC
421 help
422 Enable this to support the Broadcom SATA PHY.
423 If unsure, say N.
424endmenu 424endmenu
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 24596a96a887..596fae9b95d0 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -49,6 +49,6 @@ obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
49obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o 49obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o
50obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o 50obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
51obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o 51obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o
52obj-$(CONFIG_PHY_BRCMSTB_SATA) += phy-brcmstb-sata.o
53obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o 52obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o
54obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-bcm-cygnus-pcie.o 53obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-bcm-cygnus-pcie.o
54obj-$(CONFIG_PHY_BRCM_SATA) += phy-brcm-sata.o
diff --git a/drivers/phy/phy-brcmstb-sata.c b/drivers/phy/phy-brcm-sata.c
index a23172ff40e3..c97b9d6ff3e8 100644
--- a/drivers/phy/phy-brcmstb-sata.c
+++ b/drivers/phy/phy-brcm-sata.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Broadcom SATA3 AHCI Controller PHY Driver 2 * Broadcom SATA3 AHCI Controller PHY Driver
3 * 3 *
4 * Copyright © 2009-2015 Broadcom Corporation 4 * Copyright (C) 2016 Broadcom
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * 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 = {
238 .probe = brcm_sata_phy_probe, 238 .probe = brcm_sata_phy_probe,
239 .driver = { 239 .driver = {
240 .of_match_table = brcm_sata_phy_of_match, 240 .of_match_table = brcm_sata_phy_of_match,
241 .name = "brcmstb-sata-phy", 241 .name = "brcm-sata-phy",
242 } 242 }
243}; 243};
244module_platform_driver(brcm_sata_phy_driver); 244module_platform_driver(brcm_sata_phy_driver);
245 245
246MODULE_DESCRIPTION("Broadcom STB SATA PHY driver"); 246MODULE_DESCRIPTION("Broadcom SATA PHY driver");
247MODULE_LICENSE("GPL"); 247MODULE_LICENSE("GPL");
248MODULE_AUTHOR("Marc Carino"); 248MODULE_AUTHOR("Marc Carino");
249MODULE_AUTHOR("Brian Norris"); 249MODULE_AUTHOR("Brian Norris");
250MODULE_ALIAS("platform:phy-brcmstb-sata"); 250MODULE_ALIAS("platform:phy-brcm-sata");