Commit 7233090a authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Vinod Koul
Browse files

phy: qcom-qmp-usb: simplify clock handling 



For the existing PHYs for new binding we are going to drop ref_clk_src
clock and always use ref clock. Rather than introducing additional code
to handle legacy vs current bindings (and clock names), use
devm_clk_bulk_get_optional() when new bindings are used and
devm_clk_bulk_get_all() when legacy bindings are in place.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230824211952.1397699-3-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 15c83637

drivers/phy/qualcomm/phy-qcom-qmp-usb.c

+24 −66
Original line number Diff line number Diff line
@@ -1172,9 +1172,6 @@ struct qmp_phy_cfg { 
	const struct qmp_phy_init_tbl *pcs_usb_tbl;

	int pcs_usb_tbl_num;



	/* clock ids to be requested */

	const char * const *clk_list;

	int num_clks;

	/* resets to be requested */

	const char * const *reset_list;

	int num_resets;
@@ -1208,6 +1205,7 @@ struct qmp_usb { 


	struct clk *pipe_clk;

	struct clk_bulk_data *clks;

	int num_clks;

	struct reset_control_bulk_data *resets;

	struct regulator_bulk_data *vregs;
@@ -1243,31 +1241,10 @@ static inline void qphy_clrbits(void __iomem *base, u32 offset, u32 val) 
}



/* list of clocks required by phy */

static const char * const msm8996_phy_clk_l[] = {

	"aux", "cfg_ahb", "ref",

};



static const char * const qmp_v3_phy_clk_l[] = {

static const char * const qmp_usb_phy_clk_l[] = {

	"aux", "cfg_ahb", "ref", "com_aux",

};



static const char * const qmp_v4_phy_clk_l[] = {

	"aux", "ref", "com_aux",

};



static const char * const qmp_v4_ref_phy_clk_l[] = {

	"aux", "ref_clk_src", "ref", "com_aux",

};



/* usb3 phy on sdx55 doesn't have com_aux clock */

static const char * const qmp_v4_sdx55_usbphy_clk_l[] = {

	"aux", "cfg_ahb", "ref"

};



static const char * const qcm2290_usb3phy_clk_l[] = {

	"cfg_ahb", "ref", "com_aux",

};



/* list of resets */

static const char * const msm8996_usb3phy_reset_l[] = {

	"phy", "common",
@@ -1319,8 +1296,6 @@ static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(ipq8074_usb3_rx_tbl),

	.pcs_tbl		= ipq8074_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(ipq8074_usb3_pcs_tbl),

	.clk_list		= msm8996_phy_clk_l,

	.num_clks		= ARRAY_SIZE(msm8996_phy_clk_l),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1341,8 +1316,6 @@ static const struct qmp_phy_cfg ipq9574_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(ipq9574_usb3_rx_tbl),

	.pcs_tbl		= ipq9574_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(ipq9574_usb3_pcs_tbl),

	.clk_list		= msm8996_phy_clk_l,

	.num_clks		= ARRAY_SIZE(msm8996_phy_clk_l),

	.reset_list		= qcm2290_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1361,8 +1334,6 @@ static const struct qmp_phy_cfg msm8996_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(msm8996_usb3_rx_tbl),

	.pcs_tbl		= msm8996_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(msm8996_usb3_pcs_tbl),

	.clk_list		= msm8996_phy_clk_l,

	.num_clks		= ARRAY_SIZE(msm8996_phy_clk_l),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1383,8 +1354,6 @@ static const struct qmp_phy_cfg sa8775p_usb3_uniphy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),

	.pcs_tbl		= sa8775p_usb3_uniphy_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_tbl),

	.clk_list		= qmp_v4_phy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v4_phy_clk_l),

	.reset_list		= qcm2290_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1405,8 +1374,6 @@ static const struct qmp_phy_cfg sc8280xp_usb3_uniphy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),

	.pcs_tbl		= sc8280xp_usb3_uniphy_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_tbl),

	.clk_list		= qmp_v4_phy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v4_phy_clk_l),

	.reset_list		= qcm2290_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1425,8 +1392,6 @@ static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(qmp_v3_usb3_uniphy_rx_tbl),

	.pcs_tbl		= qmp_v3_usb3_uniphy_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(qmp_v3_usb3_uniphy_pcs_tbl),

	.clk_list		= qmp_v3_phy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v3_phy_clk_l),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1447,8 +1412,6 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { 
	.rx_tbl_num             = ARRAY_SIZE(msm8998_usb3_rx_tbl),

	.pcs_tbl                = msm8998_usb3_pcs_tbl,

	.pcs_tbl_num            = ARRAY_SIZE(msm8998_usb3_pcs_tbl),

	.clk_list               = msm8996_phy_clk_l,

	.num_clks               = ARRAY_SIZE(msm8996_phy_clk_l),

	.reset_list             = msm8996_usb3phy_reset_l,

	.num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list              = qmp_phy_vreg_l,
@@ -1469,8 +1432,6 @@ static const struct qmp_phy_cfg sm8150_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8150_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8150_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8150_usb3_uniphy_pcs_usb_tbl),

	.clk_list		= qmp_v4_ref_phy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v4_ref_phy_clk_l),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1494,8 +1455,6 @@ static const struct qmp_phy_cfg sm8250_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8250_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8250_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8250_usb3_uniphy_pcs_usb_tbl),

	.clk_list		= qmp_v4_ref_phy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v4_ref_phy_clk_l),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1519,8 +1478,6 @@ static const struct qmp_phy_cfg sdx55_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8250_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8250_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8250_usb3_uniphy_pcs_usb_tbl),

	.clk_list		= qmp_v4_sdx55_usbphy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v4_sdx55_usbphy_clk_l),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1544,8 +1501,6 @@ static const struct qmp_phy_cfg sdx65_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8350_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8350_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8350_usb3_uniphy_pcs_usb_tbl),

	.clk_list		= qmp_v4_sdx55_usbphy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v4_sdx55_usbphy_clk_l),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1569,8 +1524,6 @@ static const struct qmp_phy_cfg sm8350_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8350_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8350_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8350_usb3_uniphy_pcs_usb_tbl),

	.clk_list		= qmp_v4_ref_phy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v4_ref_phy_clk_l),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1594,8 +1547,6 @@ static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(qcm2290_usb3_rx_tbl),

	.pcs_tbl		= qcm2290_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(qcm2290_usb3_pcs_tbl),

	.clk_list		= qcm2290_usb3phy_clk_l,

	.num_clks		= ARRAY_SIZE(qcm2290_usb3phy_clk_l),

	.reset_list		= qcm2290_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,
@@ -1666,7 +1617,7 @@ static int qmp_usb_init(struct phy *phy) 
		goto err_disable_regulators;

	}



	ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks);

	ret = clk_bulk_prepare_enable(qmp->num_clks, qmp->clks);

	if (ret)

		goto err_assert_reset;
@@ -1689,7 +1640,7 @@ static int qmp_usb_exit(struct phy *phy) 


	reset_control_bulk_assert(cfg->num_resets, qmp->resets);



	clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);

	clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);



	regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
@@ -1863,7 +1814,6 @@ static void qmp_usb_disable_autonomous_mode(struct qmp_usb *qmp) 
static int __maybe_unused qmp_usb_runtime_suspend(struct device *dev)

{

	struct qmp_usb *qmp = dev_get_drvdata(dev);

	const struct qmp_phy_cfg *cfg = qmp->cfg;



	dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", qmp->mode);
@@ -1875,7 +1825,7 @@ static int __maybe_unused qmp_usb_runtime_suspend(struct device *dev) 
	qmp_usb_enable_autonomous_mode(qmp);



	clk_disable_unprepare(qmp->pipe_clk);

	clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);

	clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);



	return 0;

}
@@ -1883,7 +1833,6 @@ static int __maybe_unused qmp_usb_runtime_suspend(struct device *dev) 
static int __maybe_unused qmp_usb_runtime_resume(struct device *dev)

{

	struct qmp_usb *qmp = dev_get_drvdata(dev);

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	int ret = 0;



	dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", qmp->mode);
@@ -1893,14 +1842,14 @@ static int __maybe_unused qmp_usb_runtime_resume(struct device *dev) 
		return 0;

	}



	ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks);

	ret = clk_bulk_prepare_enable(qmp->num_clks, qmp->clks);

	if (ret)

		return ret;



	ret = clk_prepare_enable(qmp->pipe_clk);

	if (ret) {

		dev_err(dev, "pipe_clk enable failed, err=%d\n", ret);

		clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);

		clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);

		return ret;

	}
@@ -1955,9 +1904,8 @@ static int qmp_usb_reset_init(struct qmp_usb *qmp) 


static int qmp_usb_clk_init(struct qmp_usb *qmp)

{

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	struct device *dev = qmp->dev;

	int num = cfg->num_clks;

	int num = ARRAY_SIZE(qmp_usb_phy_clk_l);

	int i;



	qmp->clks = devm_kcalloc(dev, num, sizeof(*qmp->clks), GFP_KERNEL);
@@ -1965,9 +1913,11 @@ static int qmp_usb_clk_init(struct qmp_usb *qmp) 
		return -ENOMEM;



	for (i = 0; i < num; i++)

		qmp->clks[i].id = cfg->clk_list[i];

		qmp->clks[i].id = qmp_usb_phy_clk_l[i];



	return devm_clk_bulk_get(dev, num, qmp->clks);

	qmp->num_clks = num;



	return devm_clk_bulk_get_optional(dev, num, qmp->clks);

}



static void phy_clk_release_provider(void *res)
@@ -2047,6 +1997,7 @@ static int qmp_usb_parse_dt_legacy(struct qmp_usb *qmp, struct device_node *np) 
	const struct qmp_phy_cfg *cfg = qmp->cfg;

	struct device *dev = qmp->dev;

	bool exclusive = true;

	int ret;



	qmp->serdes = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(qmp->serdes))
@@ -2107,6 +2058,12 @@ static int qmp_usb_parse_dt_legacy(struct qmp_usb *qmp, struct device_node *np) 
				     "failed to get pipe clock\n");

	}



	ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks);

	if (ret < 0)

		return ret;



	qmp->num_clks = ret;



	return 0;

}
@@ -2117,6 +2074,7 @@ static int qmp_usb_parse_dt(struct qmp_usb *qmp) 
	const struct qmp_usb_offsets *offs = cfg->offsets;

	struct device *dev = qmp->dev;

	void __iomem *base;

	int ret;



	if (!offs)

		return -EINVAL;
@@ -2137,6 +2095,10 @@ static int qmp_usb_parse_dt(struct qmp_usb *qmp) 
		qmp->rx2 = base + offs->rx2;

	}



	ret = qmp_usb_clk_init(qmp);

	if (ret)

		return ret;



	qmp->pipe_clk = devm_clk_get(dev, "pipe");

	if (IS_ERR(qmp->pipe_clk)) {

		return dev_err_probe(dev, PTR_ERR(qmp->pipe_clk),
@@ -2164,10 +2126,6 @@ static int qmp_usb_probe(struct platform_device *pdev) 
	if (!qmp->cfg)

		return -EINVAL;



	ret = qmp_usb_clk_init(qmp);

	if (ret)

		return ret;



	ret = qmp_usb_reset_init(qmp);

	if (ret)

		return ret;