clk: rockchip: Fix wrong parents for MMC phase clock for rk3328
authorShawn Lin <shawn.lin@rock-chips.com>
Wed, 21 Mar 2018 02:39:18 +0000 (10:39 +0800)
committerHeiko Stuebner <heiko@sntech.de>
Fri, 23 Mar 2018 07:58:19 +0000 (08:58 +0100)
commit c420c1e4db22 ("clk: rockchip: Prevent calculating mmc phase if
clock rate is zero") catches some gremlins for clk-rk3328.c that the
parents of MMC phase clock should be clk_{sdmmc, sdio, emmc}, but not
sclk_{sdmmc, sdio, emmc}.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
drivers/clk/rockchip/clk-rk3328.c

index f680b42..252366a 100644 (file)
@@ -810,24 +810,24 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = {
        GATE(0, "pclk_phy_niu", "pclk_phy_pre", 0, RK3328_CLKGATE_CON(15), 15, GFLAGS),
 
        /* PD_MMC */
-       MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "sclk_sdmmc",
+       MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "clk_sdmmc",
            RK3328_SDMMC_CON0, 1),
-       MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc",
+       MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "clk_sdmmc",
            RK3328_SDMMC_CON1, 1),
 
-       MMC(SCLK_SDIO_DRV, "sdio_drv", "sclk_sdio",
+       MMC(SCLK_SDIO_DRV, "sdio_drv", "clk_sdio",
            RK3328_SDIO_CON0, 1),
-       MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "sclk_sdio",
+       MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "clk_sdio",
            RK3328_SDIO_CON1, 1),
 
-       MMC(SCLK_EMMC_DRV, "emmc_drv", "sclk_emmc",
+       MMC(SCLK_EMMC_DRV, "emmc_drv", "clk_emmc",
            RK3328_EMMC_CON0, 1),
-       MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "sclk_emmc",
+       MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "clk_emmc",
            RK3328_EMMC_CON1, 1),
 
-       MMC(SCLK_SDMMC_EXT_DRV, "sdmmc_ext_drv", "sclk_sdmmc_ext",
+       MMC(SCLK_SDMMC_EXT_DRV, "sdmmc_ext_drv", "clk_sdmmc_ext",
            RK3328_SDMMC_EXT_CON0, 1),
-       MMC(SCLK_SDMMC_EXT_SAMPLE, "sdmmc_ext_sample", "sclk_sdmmc_ext",
+       MMC(SCLK_SDMMC_EXT_SAMPLE, "sdmmc_ext_sample", "clk_sdmmc_ext",
            RK3328_SDMMC_EXT_CON1, 1),
 };