mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

phy: qcom-qmp-usb: drop multi-PHY support

Browse source 
Each USB QMP PHY device provides just a single UFS PHY. Drop support
for handling multiple child PHYs. Use phy->init_count to check if the
PHY was initialized rather than duplicating this count.

Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> # UFS, PCIe and USB on SC8180X
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220607213203.2819885-27-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Dmitry Baryshkov 2022-06-08 00:31:59 +03:00 committed by Vinod Koul
parent 1da7115efa
commit 65753f38f5
1 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/phy/qualcomm/phy-qcom-qmp-usb.c
View file

@ -1440,8 +1440,6 @@ struct qmp_phy {
* @vregs: regulator supplies bulk data * @vregs: regulator supplies bulk data
* *
* @phys: array of per-lane phy descriptors * @phys: array of per-lane phy descriptors
* @phy_mutex: mutex lock for PHY common block initialization
* @init_count: phy common block initialization count
*/ */
struct qcom_qmp { struct qcom_qmp {
struct device *dev; struct device *dev;
@ -1452,9 +1450,6 @@ struct qcom_qmp {
struct regulator_bulk_data *vregs; struct regulator_bulk_data *vregs;
struct qmp_phy **phys; struct qmp_phy **phys;
struct mutex phy_mutex;
int init_count;
}; };
static inline void qphy_setbits(void __iomem *base, u32 offset, u32 val) static inline void qphy_setbits(void __iomem *base, u32 offset, u32 val)
@ -2016,17 +2011,11 @@ static int qcom_qmp_phy_usb_com_init(struct qmp_phy *qphy)
void __iomem *dp_com = qmp->dp_com; void __iomem *dp_com = qmp->dp_com;
int ret, i; int ret, i;
mutex_lock(&qmp->phy_mutex);
if (qmp->init_count++) {
mutex_unlock(&qmp->phy_mutex);
return 0;
}
/* turn on regulator supplies */ /* turn on regulator supplies */
ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs); ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs);
if (ret) { if (ret) {
dev_err(qmp->dev, "failed to enable regulators, err=%d\n", ret); dev_err(qmp->dev, "failed to enable regulators, err=%d\n", ret);
goto err_unlock; return ret;
} }
for (i = 0; i < cfg->num_resets; i++) { for (i = 0; i < cfg->num_resets; i++) {
@ -2082,8 +2071,6 @@ static int qcom_qmp_phy_usb_com_init(struct qmp_phy *qphy)
qphy_setbits(pcs, QPHY_POWER_DOWN_CONTROL, qphy_setbits(pcs, QPHY_POWER_DOWN_CONTROL,
cfg->pwrdn_ctrl); cfg->pwrdn_ctrl);
mutex_unlock(&qmp->phy_mutex);
return 0; return 0;
err_assert_reset: err_assert_reset:
@ -2091,8 +2078,6 @@ static int qcom_qmp_phy_usb_com_init(struct qmp_phy *qphy)
reset_control_assert(qmp->resets[i]); reset_control_assert(qmp->resets[i]);
err_disable_regulators: err_disable_regulators:
regulator_bulk_disable(cfg->num_vregs, qmp->vregs); regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
err_unlock:
mutex_unlock(&qmp->phy_mutex);
return ret; return ret;
} }
@ -2103,12 +2088,6 @@ static int qcom_qmp_phy_usb_com_exit(struct qmp_phy *qphy)
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
int i = cfg->num_resets; int i = cfg->num_resets;
mutex_lock(&qmp->phy_mutex);
if (--qmp->init_count) {
mutex_unlock(&qmp->phy_mutex);
return 0;
}
while (--i >= 0) while (--i >= 0)
reset_control_assert(qmp->resets[i]); reset_control_assert(qmp->resets[i]);
@ -2116,8 +2095,6 @@ static int qcom_qmp_phy_usb_com_exit(struct qmp_phy *qphy)
regulator_bulk_disable(cfg->num_vregs, qmp->vregs); regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
mutex_unlock(&qmp->phy_mutex);
return 0; return 0;
} }
@ -2332,7 +2309,7 @@ static int __maybe_unused qcom_qmp_phy_usb_runtime_suspend(struct device *dev)
if (cfg->type != PHY_TYPE_USB3) if (cfg->type != PHY_TYPE_USB3)
return 0; return 0;
if (!qmp->init_count) { if (!qphy->phy->init_count) {
dev_vdbg(dev, "PHY not initialized, bailing out\n"); dev_vdbg(dev, "PHY not initialized, bailing out\n");
return 0; return 0;
} }
@ -2358,7 +2335,7 @@ static int __maybe_unused qcom_qmp_phy_usb_runtime_resume(struct device *dev)
if (cfg->type != PHY_TYPE_USB3) if (cfg->type != PHY_TYPE_USB3)
return 0; return 0;
if (!qmp->init_count) { if (!qphy->phy->init_count) {
dev_vdbg(dev, "PHY not initialized, bailing out\n"); dev_vdbg(dev, "PHY not initialized, bailing out\n");
return 0; return 0;
} }
@ -2673,7 +2650,7 @@ static int qcom_qmp_phy_usb_probe(struct platform_device *pdev)
struct phy_provider *phy_provider; struct phy_provider *phy_provider;
void __iomem *serdes; void __iomem *serdes;
const struct qmp_phy_cfg *cfg = NULL; const struct qmp_phy_cfg *cfg = NULL;
int num, id, expected_phys; int num, id;
int ret; int ret;
qmp = devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL); qmp = devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL);
@ -2700,10 +2677,6 @@ static int qcom_qmp_phy_usb_probe(struct platform_device *pdev)
return PTR_ERR(qmp->dp_com); return PTR_ERR(qmp->dp_com);
} }
expected_phys = cfg->nlanes;
mutex_init(&qmp->phy_mutex);
ret = qcom_qmp_phy_usb_clk_init(dev, cfg); ret = qcom_qmp_phy_usb_clk_init(dev, cfg);
if (ret) if (ret)
return ret; return ret;
@ -2722,7 +2695,7 @@ static int qcom_qmp_phy_usb_probe(struct platform_device *pdev)
num = of_get_available_child_count(dev->of_node); num = of_get_available_child_count(dev->of_node);
/* do we have a rogue child node ? */ /* do we have a rogue child node ? */
if (num > expected_phys) if (num > 1)
return -EINVAL; return -EINVAL;
qmp->phys = devm_kcalloc(dev, num, sizeof(*qmp->phys), GFP_KERNEL); qmp->phys = devm_kcalloc(dev, num, sizeof(*qmp->phys), GFP_KERNEL);