Skip to content

Commit 0e7a622

Browse files
LorenzoBianconikwilczynski
authored andcommitted
PCI: mediatek-gen3: Rely on clk_bulk_prepare_enable() in mtk_pcie_en7581_power_up()
Replace clk_bulk_prepare() and clk_bulk_enable() with clk_bulk_prepare_enable() in mtk_pcie_en7581_power_up() routine. Link: https://lore.kernel.org/r/20250108-pcie-en7581-fixes-v6-1-21ac939a3b9b@kernel.org Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
1 parent 40384c8 commit 0e7a622

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

drivers/pci/controller/pcie-mediatek-gen3.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,12 +945,6 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
945945
pm_runtime_enable(dev);
946946
pm_runtime_get_sync(dev);
947947

948-
err = clk_bulk_prepare(pcie->num_clks, pcie->clks);
949-
if (err) {
950-
dev_err(dev, "failed to prepare clock\n");
951-
goto err_clk_prepare;
952-
}
953-
954948
val = FIELD_PREP(PCIE_VAL_LN0_DOWNSTREAM, 0x47) |
955949
FIELD_PREP(PCIE_VAL_LN1_DOWNSTREAM, 0x47) |
956950
FIELD_PREP(PCIE_VAL_LN0_UPSTREAM, 0x41) |
@@ -963,17 +957,15 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
963957
FIELD_PREP(PCIE_K_FINETUNE_MAX, 0xf);
964958
writel_relaxed(val, pcie->base + PCIE_PIPE4_PIE8_REG);
965959

966-
err = clk_bulk_enable(pcie->num_clks, pcie->clks);
960+
err = clk_bulk_prepare_enable(pcie->num_clks, pcie->clks);
967961
if (err) {
968962
dev_err(dev, "failed to prepare clock\n");
969-
goto err_clk_enable;
963+
goto err_clk_prepare_enable;
970964
}
971965

972966
return 0;
973967

974-
err_clk_enable:
975-
clk_bulk_unprepare(pcie->num_clks, pcie->clks);
976-
err_clk_prepare:
968+
err_clk_prepare_enable:
977969
pm_runtime_put_sync(dev);
978970
pm_runtime_disable(dev);
979971
reset_control_bulk_assert(pcie->soc->phy_resets.num_resets, pcie->phy_resets);

0 commit comments

Comments
 (0)