Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 101dcc5c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "phy: qcom-ufs: add ufs phy type selection""

parents 6ba81bdb 85aa8f49

drivers/phy/Kconfig

+0 −29
Original line number Diff line number Diff line
@@ -263,33 +263,4 @@ 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



endmenu

drivers/phy/Makefile

+4 −6
Original line number Diff line number Diff line
@@ -26,12 +26,10 @@ phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2) += phy-s5pv210-usb2.o 
obj-$(CONFIG_PHY_EXYNOS5_USBDRD)	+= phy-exynos5-usbdrd.o

obj-$(CONFIG_PHY_QCOM_APQ8064_SATA)	+= phy-qcom-apq8064-sata.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_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_ST_SPEAR1310_MIPHY)	+= phy-spear1310-miphy.o

obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY)	+= phy-spear1340-miphy.o

obj-$(CONFIG_PHY_XGENE)			+= phy-xgene.o

drivers/scsi/ufs/ufs-qcom.c

+2 −2
Original line number Diff line number Diff line
@@ -1952,7 +1952,7 @@ static int ufs_qcom_clk_scale_down_post_change(struct ufs_hba *hba) 
}



static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba,

				      bool scale_up, bool status)

		bool scale_up, enum ufs_notify_change_status status)

{

	struct ufs_qcom_host *host = ufshcd_get_variant(hba);

	struct ufs_pa_layer_attr *dev_req_params = &host->dev_req_params;
@@ -2138,7 +2138,7 @@ static bool ufs_qcom_testbus_cfg_is_ok(struct ufs_qcom_host *host) 
	 * mappings of select_minor, since there is no harm in

	 * configuring a non-existent select_minor

	 */

	if (host->testbus.select_major > 0x1F) {

	if (host->testbus.select_minor > 0x1F) {

		dev_err(host->hba->dev,

			"%s: 0x%05X is not a legal testbus option\n",

			__func__, host->testbus.select_minor);

drivers/scsi/ufs/ufshcd.h

+3 −2
Original line number Diff line number Diff line
@@ -312,7 +312,8 @@ struct ufs_hba_variant_ops { 
	int	(*init)(struct ufs_hba *);

	void	(*exit)(struct ufs_hba *);

	u32	(*get_ufs_hci_version)(struct ufs_hba *);

	int	(*clk_scale_notify)(struct ufs_hba *, bool, bool);

	int	(*clk_scale_notify)(struct ufs_hba *, bool,

				    enum ufs_notify_change_status);

	int	(*setup_clocks)(struct ufs_hba *, bool, bool);

	int	(*setup_regulators)(struct ufs_hba *, bool);

	int	(*hce_enable_notify)(struct ufs_hba *,
@@ -1104,7 +1105,7 @@ static inline u32 ufshcd_vops_get_ufs_hci_version(struct ufs_hba *hba) 
}



static inline int ufshcd_vops_clk_scale_notify(struct ufs_hba *hba,

						bool up, bool status)

			bool up, enum ufs_notify_change_status status)

{

	if (hba->var && hba->var->vops && hba->var->vops->clk_scale_notify)

		return hba->var->vops->clk_scale_notify(hba, up, status);