File tree Expand file tree Collapse file tree 1 file changed +3
-11
lines changed Expand file tree Collapse file tree 1 file changed +3
-11
lines changed Original file line number Diff line number Diff line change @@ -945,12 +945,6 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
945
945
pm_runtime_enable (dev );
946
946
pm_runtime_get_sync (dev );
947
947
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
-
954
948
val = FIELD_PREP (PCIE_VAL_LN0_DOWNSTREAM , 0x47 ) |
955
949
FIELD_PREP (PCIE_VAL_LN1_DOWNSTREAM , 0x47 ) |
956
950
FIELD_PREP (PCIE_VAL_LN0_UPSTREAM , 0x41 ) |
@@ -963,17 +957,15 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
963
957
FIELD_PREP (PCIE_K_FINETUNE_MAX , 0xf );
964
958
writel_relaxed (val , pcie -> base + PCIE_PIPE4_PIE8_REG );
965
959
966
- err = clk_bulk_enable (pcie -> num_clks , pcie -> clks );
960
+ err = clk_bulk_prepare_enable (pcie -> num_clks , pcie -> clks );
967
961
if (err ) {
968
962
dev_err (dev , "failed to prepare clock\n" );
969
- goto err_clk_enable ;
963
+ goto err_clk_prepare_enable ;
970
964
}
971
965
972
966
return 0 ;
973
967
974
- err_clk_enable :
975
- clk_bulk_unprepare (pcie -> num_clks , pcie -> clks );
976
- err_clk_prepare :
968
+ err_clk_prepare_enable :
977
969
pm_runtime_put_sync (dev );
978
970
pm_runtime_disable (dev );
979
971
reset_control_bulk_assert (pcie -> soc -> phy_resets .num_resets , pcie -> phy_resets );
You can’t perform that action at this time.
0 commit comments