Commit f19681df authored Mar 21, 2018 by Shawn Lin Committed by Greg Kroah-Hartman May 25, 2018

clk: rockchip: Fix wrong parent for SDMMC phase clock for rk3228



[ Upstream commit 4b0556a441dd37e598887215bc89b49a6ef525b3 ]

commit c420c1e4db22 ("clk: rockchip: Prevent calculating mmc phase
if clock rate is zero") catches one gremlin again for clk-rk3228.c
that the parent of SDMMC phase clock should be sclk_sdmmc0, but not
sclk_sdmmc. However, the naming of the sdmmc clocks varies in the
manual with the card clock having the 0 while the hclk is named
without appended 0. So standardize one one format to prevent
confusion, as there also is only one (non-sdio) mmc controller on
the soc.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 608ae386

drivers/clk/rockchip/clk-rk3228.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -369,7 +369,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
		RK2928_CLKSEL_CON(23), 5, 2, MFLAGS, 0, 6, DFLAGS,
		RK2928_CLKGATE_CON(2), 15, GFLAGS),

		COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0,
		COMPOSITE(SCLK_SDMMC, "sclk_sdmmc", mux_mmc_src_p, 0,
		RK2928_CLKSEL_CON(11), 8, 2, MFLAGS, 0, 8, DFLAGS,
		RK2928_CLKGATE_CON(2), 11, GFLAGS),