From: Douglas Anderson Date: Wed, 4 May 2016 23:36:25 +0000 (-0700) Subject: UPSTREAM: clk: rockchip: fix the rk3399 sdmmc sample / drv name X-Git-Tag: firefly_0821_release~2519 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=a799159e249870f126d10b09ebee599a7e519f11 UPSTREAM: clk: rockchip: fix the rk3399 sdmmc sample / drv name The rk3399 clock table had a simple typo in it, calling the SDMMC sample and drive clocks by the wrong name. Fix this minor typo. Change-Id: I154f70bd98b58bf3cc148043b11e4a8d18203816 Signed-off-by: Douglas Anderson Tested-by: Brian Norris Acked-by: Brian Norris Reviewed-by: Brian Norris Signed-off-by: Heiko Stuebner Signed-off-by: Ziyuan Xu (cherry picked from git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next commit 84752e8d8ab6bb72feab96785e9366783b4b9787) --- diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 506c9ec79547..dc7fe86b9fb4 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -899,8 +899,8 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKSEL_CON(16), 8, 3, MFLAGS, 0, 7, DFLAGS, RK3399_CLKGATE_CON(6), 1, GFLAGS), - MMC(SCLK_SDMMC_DRV, "emmc_drv", "clk_sdmmc", RK3399_SDMMC_CON0, 1), - MMC(SCLK_SDMMC_SAMPLE, "emmc_sample", "clk_sdmmc", RK3399_SDMMC_CON1, 1), + MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "clk_sdmmc", RK3399_SDMMC_CON0, 1), + MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "clk_sdmmc", RK3399_SDMMC_CON1, 1), MMC(SCLK_SDIO_DRV, "sdio_drv", "clk_sdio", RK3399_SDIO_CON0, 1), MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "clk_sdio", RK3399_SDIO_CON1, 1),