Commit 79a03925 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

phy: qcom-qmp-pcie-msm8996: drop unused pcs_misc handling 



The MSM8996 QMP PHY driver does not use the PCS_MISC IO region (and
neither do the DT binding specify it) so remove the corresponding code
from the driver.

Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220916102340.11520-8-johan+linaro@kernel.org


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

drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c

+0 −14
Original line number Diff line number Diff line
@@ -202,8 +202,6 @@ struct qmp_phy_cfg { 
	int rx_tbl_num;

	const struct qmp_phy_init_tbl *pcs_tbl;

	int pcs_tbl_num;

	const struct qmp_phy_init_tbl *pcs_misc_tbl;

	int pcs_misc_tbl_num;



	/* clock ids to be requested */

	const char * const *clk_list;
@@ -240,7 +238,6 @@ struct qmp_phy_cfg { 
 * @tx: iomapped memory space for lane's tx

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

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

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

 * @pipe_clk: pipe clock

 * @index: lane index

 * @qmp: QMP phy to which this lane belongs
@@ -254,7 +251,6 @@ struct qmp_phy { 
	void __iomem *tx;

	void __iomem *rx;

	void __iomem *pcs;

	void __iomem *pcs_misc;

	struct clk *pipe_clk;

	unsigned int index;

	struct qcom_qmp *qmp;
@@ -523,7 +519,6 @@ static int qmp_pcie_msm8996_power_on(struct phy *phy) 
	void __iomem *tx = qphy->tx;

	void __iomem *rx = qphy->rx;

	void __iomem *pcs = qphy->pcs;

	void __iomem *pcs_misc = qphy->pcs_misc;

	void __iomem *status;

	unsigned int mask, val, ready;

	int ret;
@@ -552,9 +547,6 @@ static int qmp_pcie_msm8996_power_on(struct phy *phy) 


	qmp_pcie_msm8996_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num);



	qmp_pcie_msm8996_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,

			       cfg->pcs_misc_tbl_num);



	/*

	 * Pull out PHY from POWER DOWN state.

	 * This is active low enable signal to power-down PHY.
@@ -793,8 +785,6 @@ static int qmp_pcie_msm8996_create(struct device *dev, struct device_node *np, i 
	/*

	 * Get memory resources for each phy lane:

	 * 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))
@@ -808,10 +798,6 @@ static int qmp_pcie_msm8996_create(struct device *dev, struct device_node *np, i 
	if (IS_ERR(qphy->pcs))

		return PTR_ERR(qphy->pcs);



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

	if (IS_ERR(qphy->pcs_misc))

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



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