Commit 7eb5768c authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Helgaas

PCI: qcom: Drop manual pipe_clk_src handling

Manual reparenting of pipe_clk_src is being replaced with the parking of
the clock with clk_disable()/clk_enable() in the PHY driver. Drop
redundant code switching of the pipe clock between the PHY clock source
and the safe bi_tcxo.

Link: https://lore.kernel.org/r/20220608105238.2973600-6-dmitry.baryshkov@linaro.orgTested-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Acked-by: default avatarStanimir Varbanov <svarbanov@mm-sol.com>
parent affac98a
...@@ -164,9 +164,6 @@ struct qcom_pcie_resources_2_7_0 { ...@@ -164,9 +164,6 @@ struct qcom_pcie_resources_2_7_0 {
int num_clks; int num_clks;
struct regulator_bulk_data supplies[2]; struct regulator_bulk_data supplies[2];
struct reset_control *pci_reset; struct reset_control *pci_reset;
struct clk *pipe_clk_src;
struct clk *phy_pipe_clk;
struct clk *ref_clk_src;
}; };
union qcom_pcie_resources { union qcom_pcie_resources {
...@@ -192,7 +189,6 @@ struct qcom_pcie_ops { ...@@ -192,7 +189,6 @@ struct qcom_pcie_ops {
struct qcom_pcie_cfg { struct qcom_pcie_cfg {
const struct qcom_pcie_ops *ops; const struct qcom_pcie_ops *ops;
unsigned int pipe_clk_need_muxing:1;
unsigned int has_tbu_clk:1; unsigned int has_tbu_clk:1;
unsigned int has_ddrss_sf_tbu_clk:1; unsigned int has_ddrss_sf_tbu_clk:1;
unsigned int has_aggre0_clk:1; unsigned int has_aggre0_clk:1;
...@@ -1188,20 +1184,6 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie) ...@@ -1188,20 +1184,6 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (pcie->cfg->pipe_clk_need_muxing) {
res->pipe_clk_src = devm_clk_get(dev, "pipe_mux");
if (IS_ERR(res->pipe_clk_src))
return PTR_ERR(res->pipe_clk_src);
res->phy_pipe_clk = devm_clk_get(dev, "phy_pipe");
if (IS_ERR(res->phy_pipe_clk))
return PTR_ERR(res->phy_pipe_clk);
res->ref_clk_src = devm_clk_get(dev, "ref");
if (IS_ERR(res->ref_clk_src))
return PTR_ERR(res->ref_clk_src);
}
return 0; return 0;
} }
...@@ -1219,10 +1201,6 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) ...@@ -1219,10 +1201,6 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie)
return ret; return ret;
} }
/* Set TCXO as clock source for pcie_pipe_clk_src */
if (pcie->cfg->pipe_clk_need_muxing)
clk_set_parent(res->pipe_clk_src, res->ref_clk_src);
ret = clk_bulk_prepare_enable(res->num_clks, res->clks); ret = clk_bulk_prepare_enable(res->num_clks, res->clks);
if (ret < 0) if (ret < 0)
goto err_disable_regulators; goto err_disable_regulators;
...@@ -1284,18 +1262,8 @@ static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie) ...@@ -1284,18 +1262,8 @@ static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie)
struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0; struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;
clk_bulk_disable_unprepare(res->num_clks, res->clks); clk_bulk_disable_unprepare(res->num_clks, res->clks);
regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
}
static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie) regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
{
struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;
/* Set pipe clock as clock source for pcie_pipe_clk_src */
if (pcie->cfg->pipe_clk_need_muxing)
clk_set_parent(res->pipe_clk_src, res->phy_pipe_clk);
return 0;
} }
static int qcom_pcie_link_up(struct dw_pcie *pci) static int qcom_pcie_link_up(struct dw_pcie *pci)
...@@ -1476,7 +1444,6 @@ static const struct qcom_pcie_ops ops_2_7_0 = { ...@@ -1476,7 +1444,6 @@ static const struct qcom_pcie_ops ops_2_7_0 = {
.init = qcom_pcie_init_2_7_0, .init = qcom_pcie_init_2_7_0,
.deinit = qcom_pcie_deinit_2_7_0, .deinit = qcom_pcie_deinit_2_7_0,
.ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
.post_init = qcom_pcie_post_init_2_7_0,
}; };
/* Qcom IP rev.: 1.9.0 */ /* Qcom IP rev.: 1.9.0 */
...@@ -1485,7 +1452,6 @@ static const struct qcom_pcie_ops ops_1_9_0 = { ...@@ -1485,7 +1452,6 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
.init = qcom_pcie_init_2_7_0, .init = qcom_pcie_init_2_7_0,
.deinit = qcom_pcie_deinit_2_7_0, .deinit = qcom_pcie_deinit_2_7_0,
.ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
.post_init = qcom_pcie_post_init_2_7_0,
.config_sid = qcom_pcie_config_sid_sm8250, .config_sid = qcom_pcie_config_sid_sm8250,
}; };
...@@ -1530,7 +1496,6 @@ static const struct qcom_pcie_cfg sm8250_cfg = { ...@@ -1530,7 +1496,6 @@ static const struct qcom_pcie_cfg sm8250_cfg = {
static const struct qcom_pcie_cfg sm8450_pcie0_cfg = { static const struct qcom_pcie_cfg sm8450_pcie0_cfg = {
.ops = &ops_1_9_0, .ops = &ops_1_9_0,
.has_ddrss_sf_tbu_clk = true, .has_ddrss_sf_tbu_clk = true,
.pipe_clk_need_muxing = true,
.has_aggre0_clk = true, .has_aggre0_clk = true,
.has_aggre1_clk = true, .has_aggre1_clk = true,
}; };
...@@ -1538,14 +1503,12 @@ static const struct qcom_pcie_cfg sm8450_pcie0_cfg = { ...@@ -1538,14 +1503,12 @@ static const struct qcom_pcie_cfg sm8450_pcie0_cfg = {
static const struct qcom_pcie_cfg sm8450_pcie1_cfg = { static const struct qcom_pcie_cfg sm8450_pcie1_cfg = {
.ops = &ops_1_9_0, .ops = &ops_1_9_0,
.has_ddrss_sf_tbu_clk = true, .has_ddrss_sf_tbu_clk = true,
.pipe_clk_need_muxing = true,
.has_aggre1_clk = true, .has_aggre1_clk = true,
}; };
static const struct qcom_pcie_cfg sc7280_cfg = { static const struct qcom_pcie_cfg sc7280_cfg = {
.ops = &ops_1_9_0, .ops = &ops_1_9_0,
.has_tbu_clk = true, .has_tbu_clk = true,
.pipe_clk_need_muxing = true,
}; };
static const struct qcom_pcie_cfg sc8180x_cfg = { static const struct qcom_pcie_cfg sc8180x_cfg = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment