* [PATCH] clk: meson-axg: pcie: drop the mpll3 clock parent
@ 2018-08-01 12:16 Yixun Lan
2018-08-27 13:21 ` Jerome Brunet
0 siblings, 1 reply; 2+ messages in thread
From: Yixun Lan @ 2018-08-01 12:16 UTC (permalink / raw)
To: Jerome Brunet, Neil Armstrong
Cc: Yixun Lan, Kevin Hilman, Michael Turquette, Stephen Boyd,
Qiufang Dai, Jianxin Qin, Jian Hu, linux-amlogic, linux-clk,
linux-arm-kernel, linux-kernel
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>
---
hi Jerome:
I'm sorry we found this during latest PCIe driver test.
I'm fine with either pull this as a fixup for 4.18 or
queued for next 4.19, since the PCIe driver is not merged yet,
just do as you feel what's fit best, thanks.
Yixun
---
drivers/clk/meson/axg.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 2d458092884a..246c23df64a8 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -700,12 +700,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,
},
};
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] clk: meson-axg: pcie: drop the mpll3 clock parent
2018-08-01 12:16 [PATCH] clk: meson-axg: pcie: drop the mpll3 clock parent Yixun Lan
@ 2018-08-27 13:21 ` Jerome Brunet
0 siblings, 0 replies; 2+ messages in thread
From: Jerome Brunet @ 2018-08-27 13:21 UTC (permalink / raw)
To: Yixun Lan, Neil Armstrong
Cc: Kevin Hilman, Michael Turquette, Stephen Boyd, Qiufang Dai,
Jianxin Qin, Jian Hu, linux-amlogic, linux-clk, linux-arm-kernel,
linux-kernel
On Wed, 2018-08-01 at 12:16 +0000, Yixun Lan wrote:
> 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>
>
> ---
Applied, Thx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-27 13:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-01 12:16 [PATCH] clk: meson-axg: pcie: drop the mpll3 clock parent Yixun Lan
2018-08-27 13:21 ` Jerome Brunet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).