Message ID | 20181130053328.24183-1-wens@csie.org (mailing list archive) |
---|---|
State | Mainlined, archived |
Headers | show |
Series | clk: sunxi-ng: h3/h5: Fix CSI_MCLK parent | expand |
Quoting Chen-Yu Tsai (2018-11-29 21:33:28) > The third parent of CSI_MCLK is PLL_PERIPH1, not PLL_PERIPH0. > Fix it. > > Fixes: 0577e4853bfb ("clk: sunxi-ng: Add H3 clocks") > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > --- Acked-by: Stephen Boyd <sboyd@kernel.org>
On Fri, Nov 30, 2018 at 3:08 PM Stephen Boyd <sboyd@kernel.org> wrote: > > Quoting Chen-Yu Tsai (2018-11-29 21:33:28) > > The third parent of CSI_MCLK is PLL_PERIPH1, not PLL_PERIPH0. > > Fix it. > > > > Fixes: 0577e4853bfb ("clk: sunxi-ng: Add H3 clocks") > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > --- > > Acked-by: Stephen Boyd <sboyd@kernel.org> Merged for 4.21. Thanks.
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c index eb5c608428fa..9341ca77c6cd 100644 --- a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c +++ b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c @@ -476,7 +476,7 @@ static const char * const csi_sclk_parents[] = { "pll-periph0", "pll-periph1" }; static SUNXI_CCU_M_WITH_MUX_GATE(csi_sclk_clk, "csi-sclk", csi_sclk_parents, 0x134, 16, 4, 24, 3, BIT(31), 0); -static const char * const csi_mclk_parents[] = { "osc24M", "pll-video", "pll-periph0" }; +static const char * const csi_mclk_parents[] = { "osc24M", "pll-video", "pll-periph1" }; static SUNXI_CCU_M_WITH_MUX_GATE(csi_mclk_clk, "csi-mclk", csi_mclk_parents, 0x134, 0, 5, 8, 3, BIT(15), 0);
The third parent of CSI_MCLK is PLL_PERIPH1, not PLL_PERIPH0. Fix it. Fixes: 0577e4853bfb ("clk: sunxi-ng: Add H3 clocks") Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)