diff options
| author | Yaniv Gardi <ygardi@codeaurora.org> | 2015-08-24 17:08:51 +0300 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:01:25 -0700 |
| commit | 9d7a69705635059cd903dd84e0810984ee5cf429 (patch) | |
| tree | a319cf3ff1b9ea892304458097cc47839e66ee5b | |
| parent | 6d3b062f314e81fc2d7d25c4e6c38c956d065b7b (diff) | |
Revert "phy: qcom-ufs: add ufs phy type selection"
This reverts commit 6ed4bd3af2c153ae3246d89c2d62cfe7919d0320
("phy: qcom-ufs: add ufs phy type selection")
Since a single boot.img should support all phy-qcom-ufs configurations,
all phy-qcom-ufs files should be compiled all together.
Change-Id: I81b3891fb44d927046f39bbe72b5ed24dd9d99d2
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
[venkatg@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
| -rw-r--r-- | drivers/phy/Kconfig | 29 | ||||
| -rw-r--r-- | drivers/phy/Makefile | 7 |
2 files changed, 1 insertions, 35 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 17116411d417..03cb3ea2d2c0 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -365,35 +365,6 @@ 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_QRBTC_V2 - bool "UFS QCOM QRBTC V2 PHY" - help - Select this if your platform has a QRBTC-V2 UFS PHY. - - config PHY_QCOM_UFS_V3 - bool "UFS QCOM v3 PHY" - help - Select this if your platform has a v3 UFS PHY. - - 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 fd15c3452af7..b7cd26ee154e 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -36,12 +36,6 @@ 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 -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 -phy_qcom_ufs_mod-$(CONFIG_PHY_QCOM_UFS_V3) += phy-qcom-ufs-qmp-v3.o -phy_qcom_ufs_mod-$(CONFIG_PHY_QCOM_UFS_QRBTC_V2) += phy-qcom-ufs-qrbtc-v2.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 @@ -50,6 +44,7 @@ obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o 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_QCOM_UFS) += phy-qcom-ufs-qmp-v3.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 |