Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: rockchip: Fix wrong parents for MMC phase clock for rk3328

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>

authored by

Shawn Lin and committed by
Heiko Stuebner
ce84eca9 4b0556a4

+8 -8
+8 -8
drivers/clk/rockchip/clk-rk3328.c
··· 810 810 GATE(0, "pclk_phy_niu", "pclk_phy_pre", 0, RK3328_CLKGATE_CON(15), 15, GFLAGS), 811 811 812 812 /* PD_MMC */ 813 - MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "sclk_sdmmc", 813 + MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "clk_sdmmc", 814 814 RK3328_SDMMC_CON0, 1), 815 - MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc", 815 + MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "clk_sdmmc", 816 816 RK3328_SDMMC_CON1, 1), 817 817 818 - MMC(SCLK_SDIO_DRV, "sdio_drv", "sclk_sdio", 818 + MMC(SCLK_SDIO_DRV, "sdio_drv", "clk_sdio", 819 819 RK3328_SDIO_CON0, 1), 820 - MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "sclk_sdio", 820 + MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "clk_sdio", 821 821 RK3328_SDIO_CON1, 1), 822 822 823 - MMC(SCLK_EMMC_DRV, "emmc_drv", "sclk_emmc", 823 + MMC(SCLK_EMMC_DRV, "emmc_drv", "clk_emmc", 824 824 RK3328_EMMC_CON0, 1), 825 - MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "sclk_emmc", 825 + MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "clk_emmc", 826 826 RK3328_EMMC_CON1, 1), 827 827 828 - MMC(SCLK_SDMMC_EXT_DRV, "sdmmc_ext_drv", "sclk_sdmmc_ext", 828 + MMC(SCLK_SDMMC_EXT_DRV, "sdmmc_ext_drv", "clk_sdmmc_ext", 829 829 RK3328_SDMMC_EXT_CON0, 1), 830 - MMC(SCLK_SDMMC_EXT_SAMPLE, "sdmmc_ext_sample", "sclk_sdmmc_ext", 830 + MMC(SCLK_SDMMC_EXT_SAMPLE, "sdmmc_ext_sample", "clk_sdmmc_ext", 831 831 RK3328_SDMMC_EXT_CON1, 1), 832 832 }; 833 833