Skip to content

Commit aa9c0df

Browse files
Prasad Malisettybjorn-helgaas
authored andcommitted
PCI: qcom: Switch pcie_1_pipe_clk_src after PHY init in SC7280
On the SC7280, the clock source for gcc_pcie_1_pipe_clk_src must be the TCXO while gdsc is enabled. After PHY init successful clock source should switch to pipe clock for gcc_pcie_1_pipe_clk_src. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Prasad Malisetty <[email protected]> Signed-off-by: Lorenzo Pieralisi <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Stephen Boyd <[email protected]>
1 parent b89ff41 commit aa9c0df

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ struct qcom_pcie_resources_2_7_0 {
166166
struct regulator_bulk_data supplies[2];
167167
struct reset_control *pci_reset;
168168
struct clk *pipe_clk;
169+
struct clk *pipe_clk_src;
170+
struct clk *phy_pipe_clk;
171+
struct clk *ref_clk_src;
169172
};
170173

171174
union qcom_pcie_resources {
@@ -191,6 +194,7 @@ struct qcom_pcie_ops {
191194

192195
struct qcom_pcie_cfg {
193196
const struct qcom_pcie_ops *ops;
197+
unsigned int pipe_clk_need_muxing:1;
194198
};
195199

196200
struct qcom_pcie {
@@ -201,6 +205,7 @@ struct qcom_pcie {
201205
struct phy *phy;
202206
struct gpio_desc *reset;
203207
const struct qcom_pcie_ops *ops;
208+
unsigned int pipe_clk_need_muxing:1;
204209
};
205210

206211
#define to_qcom_pcie(x) dev_get_drvdata((x)->dev)
@@ -1171,6 +1176,20 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie)
11711176
if (ret < 0)
11721177
return ret;
11731178

1179+
if (pcie->pipe_clk_need_muxing) {
1180+
res->pipe_clk_src = devm_clk_get(dev, "pipe_mux");
1181+
if (IS_ERR(res->pipe_clk_src))
1182+
return PTR_ERR(res->pipe_clk_src);
1183+
1184+
res->phy_pipe_clk = devm_clk_get(dev, "phy_pipe");
1185+
if (IS_ERR(res->phy_pipe_clk))
1186+
return PTR_ERR(res->phy_pipe_clk);
1187+
1188+
res->ref_clk_src = devm_clk_get(dev, "ref");
1189+
if (IS_ERR(res->ref_clk_src))
1190+
return PTR_ERR(res->ref_clk_src);
1191+
}
1192+
11741193
res->pipe_clk = devm_clk_get(dev, "pipe");
11751194
return PTR_ERR_OR_ZERO(res->pipe_clk);
11761195
}
@@ -1189,6 +1208,10 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie)
11891208
return ret;
11901209
}
11911210

1211+
/* Set TCXO as clock source for pcie_pipe_clk_src */
1212+
if (pcie->pipe_clk_need_muxing)
1213+
clk_set_parent(res->pipe_clk_src, res->ref_clk_src);
1214+
11921215
ret = clk_bulk_prepare_enable(res->num_clks, res->clks);
11931216
if (ret < 0)
11941217
goto err_disable_regulators;
@@ -1260,6 +1283,10 @@ static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie)
12601283
{
12611284
struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;
12621285

1286+
/* Set pipe clock as clock source for pcie_pipe_clk_src */
1287+
if (pcie->pipe_clk_need_muxing)
1288+
clk_set_parent(res->pipe_clk_src, res->phy_pipe_clk);
1289+
12631290
return clk_prepare_enable(res->pipe_clk);
12641291
}
12651292

@@ -1490,6 +1517,7 @@ static const struct qcom_pcie_cfg sm8250_cfg = {
14901517

14911518
static const struct qcom_pcie_cfg sc7280_cfg = {
14921519
.ops = &ops_1_9_0,
1520+
.pipe_clk_need_muxing = true,
14931521
};
14941522

14951523
static const struct dw_pcie_ops dw_pcie_ops = {
@@ -1532,6 +1560,7 @@ static int qcom_pcie_probe(struct platform_device *pdev)
15321560
}
15331561

15341562
pcie->ops = pcie_cfg->ops;
1563+
pcie->pipe_clk_need_muxing = pcie_cfg->pipe_clk_need_muxing;
15351564

15361565
pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_HIGH);
15371566
if (IS_ERR(pcie->reset)) {

0 commit comments

Comments
 (0)