summaryrefslogtreecommitdiff
path: root/drivers/phy
diff options
context:
space:
mode:
authorGilad Broner <gbroner@codeaurora.org>2015-04-06 17:17:03 +0300
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:01:19 -0700
commit08eef6c05cf5ffd045d35c0df5a623ba9dd4efd1 (patch)
tree6cb884369cd349bfb48e9fd12dcccfe0e2cda2da /drivers/phy
parentb4b16fc7d940b4c767705fe5d2c19388527849ba (diff)
phy: qcom-ufs: add ufs phy type selection
Currently both 14nm phy and 20nm phy are compiled and built into the kernel, while only one type is actually present and used. Add a choice selection to the kernel configuration to specify which phy type shall be used. Change-Id: I5608d32fb4815db15e91a970e53099762eabbddd Signed-off-by: Gilad Broner <gbroner@codeaurora.org> [venkatg@codeaurora.org: resolved trivial merge conflicts] Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/Kconfig19
-rw-r--r--drivers/phy/Makefile6
2 files changed, 23 insertions, 2 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 03cb3ea2d2c0..d7641a31d34c 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -365,6 +365,25 @@ config PHY_QCOM_UFS
help
Support for UFS PHY on QCOM chipsets.
+choice
+ prompt "Qualcomm UFS PHY type"
+ depends on PHY_QCOM_UFS
+ default PHY_QCOM_UFS_14NM
+ ---help---
+ This select the type of UFS PHY to be used.
+ It must match the actual hardware found on your platform.
+
+ config PHY_QCOM_UFS_14NM
+ bool "UFS QCOM 14nm PHY"
+ help
+ Select this if your platform has a 14nm UFS PHY.
+
+ config PHY_QCOM_UFS_20NM
+ bool "UFS QCOM 20nm PHY"
+ help
+ Select this if your platform has a 20nm UFS PHY.
+endchoice
+
config PHY_TUSB1210
tristate "TI TUSB1210 ULPI PHY module"
depends on USB_ULPI_BUS
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 7160f8c5c94c..9abf08d1c12b 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -36,8 +36,10 @@ obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o
obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o
obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o
obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o
-obj-$(CONFIG_SCSI_UFS_QCOM) += phy-qcom-ufs.o
-obj-$(CONFIG_SCSI_UFS_QCOM) += phy-qcom-ufs-qmp-20nm.o
+phy_qcom_ufs_mod-y += phy-qcom-ufs.o
+phy_qcom_ufs_mod-$(CONFIG_PHY_QCOM_UFS_20NM) += phy-qcom-ufs-qmp-20nm.o
+phy_qcom_ufs_mod-$(CONFIG_PHY_QCOM_UFS_14NM) += phy-qcom-ufs-qmp-14nm.o
+obj-$(CONFIG_PHY_QCOM_UFS) += phy_qcom_ufs_mod.o
obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
obj-$(CONFIG_PHY_XGENE) += phy-xgene.o