Skip to content

Commit 465931e

Browse files
rmurphy-armmmind
authored andcommitted
clk: rockchip: Revert "fix wrong mmc sample phase shift for rk3328"
This reverts commit 82f4b67. According to a subsequent revert in the vendor kernel, the original change was based on unclear documentation and was in fact incorrect. Emprically, my board's HS200 eMMC at 200MHZ apparently gets lucky with a phase where this had no impact, but limiting max-frequency to 150MHz to match the nominal capability of the I/O pins made it virtually unusable, constantly throwing errors and retuning. With this revert, it starts behaving perfectly at 150MHz too. Fixes: 82f4b67 ("clk: rockchip: fix wrong mmc sample phase shift for rk3328") Signed-off-by: Robin Murphy <[email protected]> Reviewed-by: Shawn Lin <[email protected]> Link: https://lore.kernel.org/r/c80eb52e34c03f817586b6b7912fbd4e31be9079.1589475794.git.robin.murphy@arm.com Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 0a7f99a commit 465931e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/clk/rockchip/clk-rk3328.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -808,22 +808,22 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = {
808808
MMC(SCLK_SDMMC_DRV, "sdmmc_drv", "clk_sdmmc",
809809
RK3328_SDMMC_CON0, 1),
810810
MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "clk_sdmmc",
811-
RK3328_SDMMC_CON1, 0),
811+
RK3328_SDMMC_CON1, 1),
812812

813813
MMC(SCLK_SDIO_DRV, "sdio_drv", "clk_sdio",
814814
RK3328_SDIO_CON0, 1),
815815
MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "clk_sdio",
816-
RK3328_SDIO_CON1, 0),
816+
RK3328_SDIO_CON1, 1),
817817

818818
MMC(SCLK_EMMC_DRV, "emmc_drv", "clk_emmc",
819819
RK3328_EMMC_CON0, 1),
820820
MMC(SCLK_EMMC_SAMPLE, "emmc_sample", "clk_emmc",
821-
RK3328_EMMC_CON1, 0),
821+
RK3328_EMMC_CON1, 1),
822822

823823
MMC(SCLK_SDMMC_EXT_DRV, "sdmmc_ext_drv", "clk_sdmmc_ext",
824824
RK3328_SDMMC_EXT_CON0, 1),
825825
MMC(SCLK_SDMMC_EXT_SAMPLE, "sdmmc_ext_sample", "clk_sdmmc_ext",
826-
RK3328_SDMMC_EXT_CON1, 0),
826+
RK3328_SDMMC_EXT_CON1, 1),
827827
};
828828

829829
static const char *const rk3328_critical_clocks[] __initconst = {

0 commit comments

Comments
 (0)