Skip to content

Commit 7eb5768

Browse files
lumagbjorn-helgaas
authored andcommitted
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.org Tested-by: Johan Hovold <johan+linaro@kernel.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Stephen Boyd <sboyd@kernel.org> Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>
1 parent affac98 commit 7eb5768

1 file changed

Lines changed: 1 addition & 38 deletions

File tree

drivers/pci/controller/dwc/pcie-qcom.c

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ struct qcom_pcie_resources_2_7_0 {
164164
int num_clks;
165165
struct regulator_bulk_data supplies[2];
166166
struct reset_control *pci_reset;
167-
struct clk *pipe_clk_src;
168-
struct clk *phy_pipe_clk;
169-
struct clk *ref_clk_src;
170167
};
171168

172169
union qcom_pcie_resources {
@@ -192,7 +189,6 @@ struct qcom_pcie_ops {
192189

193190
struct qcom_pcie_cfg {
194191
const struct qcom_pcie_ops *ops;
195-
unsigned int pipe_clk_need_muxing:1;
196192
unsigned int has_tbu_clk:1;
197193
unsigned int has_ddrss_sf_tbu_clk:1;
198194
unsigned int has_aggre0_clk:1;
@@ -1188,20 +1184,6 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie)
11881184
if (ret < 0)
11891185
return ret;
11901186

1191-
if (pcie->cfg->pipe_clk_need_muxing) {
1192-
res->pipe_clk_src = devm_clk_get(dev, "pipe_mux");
1193-
if (IS_ERR(res->pipe_clk_src))
1194-
return PTR_ERR(res->pipe_clk_src);
1195-
1196-
res->phy_pipe_clk = devm_clk_get(dev, "phy_pipe");
1197-
if (IS_ERR(res->phy_pipe_clk))
1198-
return PTR_ERR(res->phy_pipe_clk);
1199-
1200-
res->ref_clk_src = devm_clk_get(dev, "ref");
1201-
if (IS_ERR(res->ref_clk_src))
1202-
return PTR_ERR(res->ref_clk_src);
1203-
}
1204-
12051187
return 0;
12061188
}
12071189

@@ -1219,10 +1201,6 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie)
12191201
return ret;
12201202
}
12211203

1222-
/* Set TCXO as clock source for pcie_pipe_clk_src */
1223-
if (pcie->cfg->pipe_clk_need_muxing)
1224-
clk_set_parent(res->pipe_clk_src, res->ref_clk_src);
1225-
12261204
ret = clk_bulk_prepare_enable(res->num_clks, res->clks);
12271205
if (ret < 0)
12281206
goto err_disable_regulators;
@@ -1284,18 +1262,8 @@ static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie)
12841262
struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;
12851263

12861264
clk_bulk_disable_unprepare(res->num_clks, res->clks);
1287-
regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
1288-
}
12891265

1290-
static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie)
1291-
{
1292-
struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;
1293-
1294-
/* Set pipe clock as clock source for pcie_pipe_clk_src */
1295-
if (pcie->cfg->pipe_clk_need_muxing)
1296-
clk_set_parent(res->pipe_clk_src, res->phy_pipe_clk);
1297-
1298-
return 0;
1266+
regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
12991267
}
13001268

13011269
static int qcom_pcie_link_up(struct dw_pcie *pci)
@@ -1476,7 +1444,6 @@ static const struct qcom_pcie_ops ops_2_7_0 = {
14761444
.init = qcom_pcie_init_2_7_0,
14771445
.deinit = qcom_pcie_deinit_2_7_0,
14781446
.ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
1479-
.post_init = qcom_pcie_post_init_2_7_0,
14801447
};
14811448

14821449
/* Qcom IP rev.: 1.9.0 */
@@ -1485,7 +1452,6 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
14851452
.init = qcom_pcie_init_2_7_0,
14861453
.deinit = qcom_pcie_deinit_2_7_0,
14871454
.ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
1488-
.post_init = qcom_pcie_post_init_2_7_0,
14891455
.config_sid = qcom_pcie_config_sid_sm8250,
14901456
};
14911457

@@ -1530,22 +1496,19 @@ static const struct qcom_pcie_cfg sm8250_cfg = {
15301496
static const struct qcom_pcie_cfg sm8450_pcie0_cfg = {
15311497
.ops = &ops_1_9_0,
15321498
.has_ddrss_sf_tbu_clk = true,
1533-
.pipe_clk_need_muxing = true,
15341499
.has_aggre0_clk = true,
15351500
.has_aggre1_clk = true,
15361501
};
15371502

15381503
static const struct qcom_pcie_cfg sm8450_pcie1_cfg = {
15391504
.ops = &ops_1_9_0,
15401505
.has_ddrss_sf_tbu_clk = true,
1541-
.pipe_clk_need_muxing = true,
15421506
.has_aggre1_clk = true,
15431507
};
15441508

15451509
static const struct qcom_pcie_cfg sc7280_cfg = {
15461510
.ops = &ops_1_9_0,
15471511
.has_tbu_clk = true,
1548-
.pipe_clk_need_muxing = true,
15491512
};
15501513

15511514
static const struct qcom_pcie_cfg sc8180x_cfg = {

0 commit comments

Comments
 (0)