aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYixun Lan <yixun.lan@amlogic.com>2018-08-01 12:16:24 +0000
committerJerome Brunet <jbrunet@baylibre.com>2018-09-26 12:02:00 +0200
commit69b93104c7ec5668019caf5d2dbfd0e182df06db (patch)
tree3c94196312ed31cefa15e75f33475553fb9ab5d6
parentclk: meson: axg: round audio system master clocks down (diff)
clk: meson-axg: pcie: drop the mpll3 clock parent
We found the PCIe driver doesn't really work with the mpll3 clock which is actually reserved for debug, So drop it from the mux list. Fixes: 33b89db68236 ("clk: meson-axg: add clocks required by pcie driver") Tested-by: Jianxin Qin <jianxin.qin@amlogic.com> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-rw-r--r--drivers/clk/meson/axg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 7511b3e26d40..c981159b02c0 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -730,12 +730,14 @@ static struct clk_regmap axg_pcie_mux = {
.offset = HHI_PCIE_PLL_CNTL6,
.mask = 0x1,
.shift = 2,
+ /* skip the parent mpll3, reserved for debug */
+ .table = (u32[]){ 1 },
},
.hw.init = &(struct clk_init_data){
.name = "pcie_mux",
.ops = &clk_regmap_mux_ops,
- .parent_names = (const char *[]){ "mpll3", "pcie_pll" },
- .num_parents = 2,
+ .parent_names = (const char *[]){ "pcie_pll" },
+ .num_parents = 1,
.flags = CLK_SET_RATE_PARENT,
},
};