Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99222c9e authored by Xing Zheng's avatar Xing Zheng Committed by Heiko Stuebner
Browse files

clk: rockchip: rk3036: fix the FLAGs for clock mux 



The DFLAGS are used for the clock dividers, the CLKSEL_CON flags
of COMPOSITE_NODIV type should be MFLAGS.

Signed-off-by: default avatarXing Zheng <zhengxing@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 3da834e3

drivers/clk/rockchip/clk-rk3036.c

+6 −6
Original line number Diff line number Diff line
@@ -224,16 +224,16 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { 
			RK2928_CLKGATE_CON(2), 2, GFLAGS),



	COMPOSITE_NODIV(SCLK_TIMER0, "sclk_timer0", mux_timer_p, CLK_IGNORE_UNUSED,

			RK2928_CLKSEL_CON(2), 4, 1, DFLAGS,

			RK2928_CLKSEL_CON(2), 4, 1, MFLAGS,

			RK2928_CLKGATE_CON(1), 0, GFLAGS),

	COMPOSITE_NODIV(SCLK_TIMER1, "sclk_timer1", mux_timer_p, CLK_IGNORE_UNUSED,

			RK2928_CLKSEL_CON(2), 5, 1, DFLAGS,

			RK2928_CLKSEL_CON(2), 5, 1, MFLAGS,

			RK2928_CLKGATE_CON(1), 1, GFLAGS),

	COMPOSITE_NODIV(SCLK_TIMER2, "sclk_timer2", mux_timer_p, CLK_IGNORE_UNUSED,

			RK2928_CLKSEL_CON(2), 6, 1, DFLAGS,

			RK2928_CLKSEL_CON(2), 6, 1, MFLAGS,

			RK2928_CLKGATE_CON(2), 4, GFLAGS),

	COMPOSITE_NODIV(SCLK_TIMER3, "sclk_timer3", mux_timer_p, CLK_IGNORE_UNUSED,

			RK2928_CLKSEL_CON(2), 7, 1, DFLAGS,

			RK2928_CLKSEL_CON(2), 7, 1, MFLAGS,

			RK2928_CLKGATE_CON(2), 5, GFLAGS),



	MUX(0, "uart_pll_clk", mux_pll_src_apll_dpll_gpll_usb480m_p, 0,
@@ -279,13 +279,13 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { 
			RK2928_CLKGATE_CON(3), 2, GFLAGS),



	COMPOSITE_NODIV(0, "sclk_sdmmc_src", mux_mmc_src_p, 0,

			RK2928_CLKSEL_CON(12), 8, 2, DFLAGS,

			RK2928_CLKSEL_CON(12), 8, 2, MFLAGS,

			RK2928_CLKGATE_CON(2), 11, GFLAGS),

	DIV(SCLK_SDMMC, "sclk_sdmmc", "sclk_sdmmc_src", 0,

			RK2928_CLKSEL_CON(11), 0, 7, DFLAGS),



	COMPOSITE_NODIV(0, "sclk_sdio_src", mux_mmc_src_p, 0,

			RK2928_CLKSEL_CON(12), 10, 2, DFLAGS,

			RK2928_CLKSEL_CON(12), 10, 2, MFLAGS,

			RK2928_CLKGATE_CON(2), 13, GFLAGS),

	DIV(SCLK_SDIO, "sclk_sdio", "sclk_sdio_src", 0,

			RK2928_CLKSEL_CON(11), 8, 7, DFLAGS),