Commit 2a55ec4f authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

phy: qcom-qmp-usb: merge driver data 



The USB QMP PHY driver only manages a single PHY so merge the old
qcom_qmp and qmp_phy structures and drop the PHY array.

Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221028160435.26948-6-johan+linaro@kernel.org


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

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

+96 −143
Original line number Diff line number Diff line
@@ -1453,60 +1453,30 @@ struct qmp_phy_cfg { 
	unsigned int pcs_usb_offset;

};



/**

 * struct qmp_phy - per-lane phy descriptor

 *

 * @phy: generic phy

 * @cfg: phy specific configuration

 * @serdes: iomapped memory space for phy's serdes (i.e. PLL)

 * @tx: iomapped memory space for lane's tx

 * @rx: iomapped memory space for lane's rx

 * @pcs: iomapped memory space for lane's pcs

 * @tx2: iomapped memory space for second lane's tx (in dual lane PHYs)

 * @rx2: iomapped memory space for second lane's rx (in dual lane PHYs)

 * @pcs_misc: iomapped memory space for lane's pcs_misc

 * @pcs_usb: iomapped memory space for lane's pcs_usb

 * @pipe_clk: pipe clock

 * @qmp: QMP phy to which this lane belongs

 * @mode: current PHY mode

 */

struct qmp_phy {

	struct phy *phy;

struct qmp_usb {

	struct device *dev;



	const struct qmp_phy_cfg *cfg;



	void __iomem *serdes;

	void __iomem *pcs;

	void __iomem *pcs_misc;

	void __iomem *pcs_usb;

	void __iomem *tx;

	void __iomem *rx;

	void __iomem *pcs;

	void __iomem *tx2;

	void __iomem *rx2;

	void __iomem *pcs_misc;

	void __iomem *pcs_usb;

	struct clk *pipe_clk;

	struct qcom_qmp *qmp;

	enum phy_mode mode;

};



/**

 * struct qcom_qmp - structure holding QMP phy block attributes

 *

 * @dev: device

 * @dp_com: iomapped memory space for phy's dp_com control block

 *

 * @clks: array of clocks required by phy

 * @resets: array of resets required by phy

 * @vregs: regulator supplies bulk data

 *

 * @phys: array of per-lane phy descriptors

 */

struct qcom_qmp {

	struct device *dev;

	void __iomem *dp_com;



	struct clk *pipe_clk;

	struct clk_bulk_data *clks;

	struct reset_control_bulk_data *resets;

	struct regulator_bulk_data *vregs;



	struct qmp_phy **phys;

	enum phy_mode mode;



	struct phy *phy;

};



static inline void qphy_setbits(void __iomem *base, u32 offset, u32 val)
@@ -1976,10 +1946,10 @@ static void qmp_usb_configure(void __iomem *base, 
	qmp_usb_configure_lane(base, tbl, num, 0xff);

}



static int qmp_usb_serdes_init(struct qmp_phy *qphy)

static int qmp_usb_serdes_init(struct qmp_usb *qmp)

{

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *serdes = qphy->serdes;

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	void __iomem *serdes = qmp->serdes;

	const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl;

	int serdes_tbl_num = cfg->serdes_tbl_num;
@@ -1990,10 +1960,9 @@ static int qmp_usb_serdes_init(struct qmp_phy *qphy) 


static int qmp_usb_init(struct phy *phy)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);

	struct qcom_qmp *qmp = qphy->qmp;

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *pcs = qphy->pcs;

	struct qmp_usb *qmp = phy_get_drvdata(phy);

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	void __iomem *pcs = qmp->pcs;

	void __iomem *dp_com = qmp->dp_com;

	int ret;
@@ -2056,9 +2025,8 @@ static int qmp_usb_init(struct phy *phy) 


static int qmp_usb_exit(struct phy *phy)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);

	struct qcom_qmp *qmp = qphy->qmp;

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	struct qmp_usb *qmp = phy_get_drvdata(phy);

	const struct qmp_phy_cfg *cfg = qmp->cfg;



	reset_control_bulk_assert(cfg->num_resets, qmp->resets);
@@ -2071,19 +2039,18 @@ static int qmp_usb_exit(struct phy *phy) 


static int qmp_usb_power_on(struct phy *phy)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);

	struct qcom_qmp *qmp = qphy->qmp;

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *tx = qphy->tx;

	void __iomem *rx = qphy->rx;

	void __iomem *pcs = qphy->pcs;

	struct qmp_usb *qmp = phy_get_drvdata(phy);

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	void __iomem *tx = qmp->tx;

	void __iomem *rx = qmp->rx;

	void __iomem *pcs = qmp->pcs;

	void __iomem *status;

	unsigned int val;

	int ret;



	qmp_usb_serdes_init(qphy);

	qmp_usb_serdes_init(qmp);



	ret = clk_prepare_enable(qphy->pipe_clk);

	ret = clk_prepare_enable(qmp->pipe_clk);

	if (ret) {

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

		return ret;
@@ -2093,12 +2060,12 @@ static int qmp_usb_power_on(struct phy *phy) 
	qmp_usb_configure_lane(tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);



	if (cfg->lanes >= 2)

		qmp_usb_configure_lane(qphy->tx2, cfg->tx_tbl, cfg->tx_tbl_num, 2);

		qmp_usb_configure_lane(qmp->tx2, cfg->tx_tbl, cfg->tx_tbl_num, 2);



	qmp_usb_configure_lane(rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);



	if (cfg->lanes >= 2)

		qmp_usb_configure_lane(qphy->rx2, cfg->rx_tbl, cfg->rx_tbl_num, 2);

		qmp_usb_configure_lane(qmp->rx2, cfg->rx_tbl, cfg->rx_tbl_num, 2);



	qmp_usb_configure(pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
@@ -2122,27 +2089,27 @@ static int qmp_usb_power_on(struct phy *phy) 
	return 0;



err_disable_pipe_clk:

	clk_disable_unprepare(qphy->pipe_clk);

	clk_disable_unprepare(qmp->pipe_clk);



	return ret;

}



static int qmp_usb_power_off(struct phy *phy)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	struct qmp_usb *qmp = phy_get_drvdata(phy);

	const struct qmp_phy_cfg *cfg = qmp->cfg;



	clk_disable_unprepare(qphy->pipe_clk);

	clk_disable_unprepare(qmp->pipe_clk);



	/* PHY reset */

	qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);

	qphy_setbits(qmp->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);



	/* stop SerDes and Phy-Coding-Sublayer */

	qphy_clrbits(qphy->pcs, cfg->regs[QPHY_START_CTRL],

	qphy_clrbits(qmp->pcs, cfg->regs[QPHY_START_CTRL],

			SERDES_START | PCS_START);



	/* Put PHY into POWER DOWN state: active low */

	qphy_clrbits(qphy->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],

	qphy_clrbits(qmp->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],

			SW_PWRDN);



	return 0;
@@ -2175,22 +2142,22 @@ static int qmp_usb_disable(struct phy *phy) 


static int qmp_usb_set_mode(struct phy *phy, enum phy_mode mode, int submode)

{

	struct qmp_phy *qphy = phy_get_drvdata(phy);

	struct qmp_usb *qmp = phy_get_drvdata(phy);



	qphy->mode = mode;

	qmp->mode = mode;



	return 0;

}



static void qmp_usb_enable_autonomous_mode(struct qmp_phy *qphy)

static void qmp_usb_enable_autonomous_mode(struct qmp_usb *qmp)

{

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs;

	void __iomem *pcs_misc = qphy->pcs_misc;

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	void __iomem *pcs_usb = qmp->pcs_usb ?: qmp->pcs;

	void __iomem *pcs_misc = qmp->pcs_misc;

	u32 intr_mask;



	if (qphy->mode == PHY_MODE_USB_HOST_SS ||

	    qphy->mode == PHY_MODE_USB_DEVICE_SS)

	if (qmp->mode == PHY_MODE_USB_HOST_SS ||

	    qmp->mode == PHY_MODE_USB_DEVICE_SS)

		intr_mask = ARCVR_DTCT_EN | ALFPS_DTCT_EN;

	else

		intr_mask = ARCVR_DTCT_EN | ARCVR_DTCT_EVENT_SEL;
@@ -2211,11 +2178,11 @@ static void qmp_usb_enable_autonomous_mode(struct qmp_phy *qphy) 
		qphy_clrbits(pcs_misc, QPHY_V3_PCS_MISC_CLAMP_ENABLE, CLAMP_EN);

}



static void qmp_usb_disable_autonomous_mode(struct qmp_phy *qphy)

static void qmp_usb_disable_autonomous_mode(struct qmp_usb *qmp)

{

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs;

	void __iomem *pcs_misc = qphy->pcs_misc;

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	void __iomem *pcs_usb = qmp->pcs_usb ?: qmp->pcs;

	void __iomem *pcs_misc = qmp->pcs_misc;



	/* Disable i/o clamp_n on resume for normal mode */

	if (pcs_misc)
@@ -2231,20 +2198,19 @@ static void qmp_usb_disable_autonomous_mode(struct qmp_phy *qphy) 


static int __maybe_unused qmp_usb_runtime_suspend(struct device *dev)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	struct qmp_phy *qphy = qmp->phys[0];

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	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", qphy->mode);

	dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", qmp->mode);



	if (!qphy->phy->init_count) {

	if (!qmp->phy->init_count) {

		dev_vdbg(dev, "PHY not initialized, bailing out\n");

		return 0;

	}



	qmp_usb_enable_autonomous_mode(qphy);

	qmp_usb_enable_autonomous_mode(qmp);



	clk_disable_unprepare(qphy->pipe_clk);

	clk_disable_unprepare(qmp->pipe_clk);

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



	return 0;
@@ -2252,14 +2218,13 @@ static int __maybe_unused qmp_usb_runtime_suspend(struct device *dev) 


static int __maybe_unused qmp_usb_runtime_resume(struct device *dev)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	struct qmp_phy *qphy = qmp->phys[0];

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	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", qphy->mode);

	dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", qmp->mode);



	if (!qphy->phy->init_count) {

	if (!qmp->phy->init_count) {

		dev_vdbg(dev, "PHY not initialized, bailing out\n");

		return 0;

	}
@@ -2268,14 +2233,14 @@ static int __maybe_unused qmp_usb_runtime_resume(struct device *dev) 
	if (ret)

		return ret;



	ret = clk_prepare_enable(qphy->pipe_clk);

	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);

		return ret;

	}



	qmp_usb_disable_autonomous_mode(qphy);

	qmp_usb_disable_autonomous_mode(qmp);



	return 0;

}
@@ -2287,7 +2252,7 @@ static const struct dev_pm_ops qmp_usb_pm_ops = { 


static int qmp_usb_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	struct qmp_usb *qmp = dev_get_drvdata(dev);

	int num = cfg->num_vregs;

	int i;
@@ -2303,7 +2268,7 @@ static int qmp_usb_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg) 


static int qmp_usb_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	struct qmp_usb *qmp = dev_get_drvdata(dev);

	int i;

	int ret;
@@ -2324,7 +2289,7 @@ static int qmp_usb_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg) 


static int qmp_usb_clk_init(struct device *dev, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	struct qmp_usb *qmp = dev_get_drvdata(dev);

	int num = cfg->num_clks;

	int i;
@@ -2361,7 +2326,7 @@ static void phy_clk_release_provider(void *res) 
 *    clk  |   +-------+   |                   +-----+

 *         +---------------+

 */

static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)

static int phy_pipe_clk_register(struct qmp_usb *qmp, struct device_node *np)

{

	struct clk_fixed_rate *fixed;

	struct clk_init_data init = { };
@@ -2420,13 +2385,11 @@ static void __iomem *qmp_usb_iomap(struct device *dev, struct device_node *np, 
	return devm_of_iomap(dev, np, index, NULL);

}



static

int qmp_usb_create(struct device *dev, struct device_node *np, int id,

static int qmp_usb_create(struct device *dev, struct device_node *np,

			void __iomem *serdes, const struct qmp_phy_cfg *cfg)

{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	struct qmp_usb *qmp = dev_get_drvdata(dev);

	struct phy *generic_phy;

	struct qmp_phy *qphy;

	bool exclusive = true;

	int ret;
@@ -2439,81 +2402,75 @@ int qmp_usb_create(struct device *dev, struct device_node *np, int id, 
	if (of_device_is_compatible(dev->of_node, "qcom,sm8350-qmp-usb3-uni-phy"))

		exclusive = false;



	qphy = devm_kzalloc(dev, sizeof(*qphy), GFP_KERNEL);

	if (!qphy)

		return -ENOMEM;



	qphy->cfg = cfg;

	qphy->serdes = serdes;

	qmp->cfg = cfg;

	qmp->serdes = serdes;

	/*

	 * Get memory resources for the PHY:

	 * Resources are indexed as: tx -> 0; rx -> 1; pcs -> 2.

	 * For dual lane PHYs: tx2 -> 3, rx2 -> 4, pcs_misc (optional) -> 5

	 * For single lane PHYs: pcs_misc (optional) -> 3.

	 */

	qphy->tx = devm_of_iomap(dev, np, 0, NULL);

	if (IS_ERR(qphy->tx))

		return PTR_ERR(qphy->tx);

	qmp->tx = devm_of_iomap(dev, np, 0, NULL);

	if (IS_ERR(qmp->tx))

		return PTR_ERR(qmp->tx);



	qphy->rx = devm_of_iomap(dev, np, 1, NULL);

	if (IS_ERR(qphy->rx))

		return PTR_ERR(qphy->rx);

	qmp->rx = devm_of_iomap(dev, np, 1, NULL);

	if (IS_ERR(qmp->rx))

		return PTR_ERR(qmp->rx);



	qphy->pcs = qmp_usb_iomap(dev, np, 2, exclusive);

	if (IS_ERR(qphy->pcs))

		return PTR_ERR(qphy->pcs);

	qmp->pcs = qmp_usb_iomap(dev, np, 2, exclusive);

	if (IS_ERR(qmp->pcs))

		return PTR_ERR(qmp->pcs);



	if (cfg->pcs_usb_offset)

		qphy->pcs_usb = qphy->pcs + cfg->pcs_usb_offset;

		qmp->pcs_usb = qmp->pcs + cfg->pcs_usb_offset;



	if (cfg->lanes >= 2) {

		qphy->tx2 = devm_of_iomap(dev, np, 3, NULL);

		if (IS_ERR(qphy->tx2))

			return PTR_ERR(qphy->tx2);

		qmp->tx2 = devm_of_iomap(dev, np, 3, NULL);

		if (IS_ERR(qmp->tx2))

			return PTR_ERR(qmp->tx2);



		qphy->rx2 = devm_of_iomap(dev, np, 4, NULL);

		if (IS_ERR(qphy->rx2))

			return PTR_ERR(qphy->rx2);

		qmp->rx2 = devm_of_iomap(dev, np, 4, NULL);

		if (IS_ERR(qmp->rx2))

			return PTR_ERR(qmp->rx2);



		qphy->pcs_misc = devm_of_iomap(dev, np, 5, NULL);

		qmp->pcs_misc = devm_of_iomap(dev, np, 5, NULL);

	} else {

		qphy->pcs_misc = devm_of_iomap(dev, np, 3, NULL);

		qmp->pcs_misc = devm_of_iomap(dev, np, 3, NULL);

	}



	if (IS_ERR(qphy->pcs_misc)) {

	if (IS_ERR(qmp->pcs_misc)) {

		dev_vdbg(dev, "PHY pcs_misc-reg not used\n");

		qphy->pcs_misc = NULL;

		qmp->pcs_misc = NULL;

	}



	qphy->pipe_clk = devm_get_clk_from_child(dev, np, NULL);

	if (IS_ERR(qphy->pipe_clk)) {

		return dev_err_probe(dev, PTR_ERR(qphy->pipe_clk),

				     "failed to get lane%d pipe clock\n", id);

	qmp->pipe_clk = devm_get_clk_from_child(dev, np, NULL);

	if (IS_ERR(qmp->pipe_clk)) {

		return dev_err_probe(dev, PTR_ERR(qmp->pipe_clk),

				     "failed to get pipe clock\n");

	}



	generic_phy = devm_phy_create(dev, np, &qmp_usb_ops);

	if (IS_ERR(generic_phy)) {

		ret = PTR_ERR(generic_phy);

		dev_err(dev, "failed to create qphy %d\n", ret);

		dev_err(dev, "failed to create PHY: %d\n", ret);

		return ret;

	}



	qphy->phy = generic_phy;

	qphy->qmp = qmp;

	qmp->phys[id] = qphy;

	phy_set_drvdata(generic_phy, qphy);

	qmp->phy = generic_phy;

	phy_set_drvdata(generic_phy, qmp);



	return 0;

}



static int qmp_usb_probe(struct platform_device *pdev)

{

	struct qcom_qmp *qmp;

	struct device *dev = &pdev->dev;

	struct device_node *child;

	struct phy_provider *phy_provider;

	void __iomem *serdes;

	const struct qmp_phy_cfg *cfg = NULL;

	struct qmp_usb *qmp;

	int num, id;

	int ret;
@@ -2555,10 +2512,6 @@ static int qmp_usb_probe(struct platform_device *pdev) 
	if (num > 1)

		return -EINVAL;



	qmp->phys = devm_kcalloc(dev, num, sizeof(*qmp->phys), GFP_KERNEL);

	if (!qmp->phys)

		return -ENOMEM;



	pm_runtime_set_active(dev);

	ret = devm_pm_runtime_enable(dev);

	if (ret)
@@ -2572,7 +2525,7 @@ static int qmp_usb_probe(struct platform_device *pdev) 
	id = 0;

	for_each_available_child_of_node(dev->of_node, child) {

		/* Create per-lane phy */

		ret = qmp_usb_create(dev, child, id, serdes, cfg);

		ret = qmp_usb_create(dev, child, serdes, cfg);

		if (ret) {

			dev_err(dev, "failed to create lane%d phy, %d\n",

				id, ret);