Skip to contentSkip to conversation

Patch "clk: rockchip: fix wrong mmc phase shift for rk3228" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 6, 2016

Subsystems (3)
Stable branch Common clk Arm Rockchip
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

clk: rockchip: fix wrong mmc phase shift for rk3228

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-rockchip-fix-wrong-mmc-phase-shift-for-rk3228.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From bb07698fc8d13ec74f4f5bd87b04953777ee6982 Mon Sep 17 00:00:00 2001

From: Shawn Lin <[email protected]>
Date: Tue, 26 Jan 2016 11:30:18 +0800
Subject: clk: rockchip: fix wrong mmc phase shift for rk3228

From: Shawn Lin <[email protected]>

commit bb07698fc8d13ec74f4f5bd87b04953777ee6982 upstream.

mmc sample shift is 0 for rk3228 refer to user manaul. So it's broken if we enable mmc tuning for rk3228.

Fixes 307a2e9ac ("clk: rockchip: add clock controller for rk3228")
Signed-off-by Shawn Lin <[email protected]>
Reviewed-by Xing Zheng <[email protected]>
Signed-off-by Heiko Stuebner <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/clk/rockchip/clk-rk3228.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/rockchip/clk-rk3228.c +3 -3
@@ -605,13 +605,13 @@ static struct rockchip_clk_branch rk3228
 
 	/* PD_MMC */
 	MMC(SCLK_SDMMC_DRV,    "sdmmc_drv",    "sclk_sdmmc", RK3228_SDMMC_CON0, 1),
-	MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc", RK3228_SDMMC_CON1, 1),
+	MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc", RK3228_SDMMC_CON1, 0),
 
 	MMC(SCLK_SDIO_DRV,     "sdio_drv",     "sclk_sdio",  RK3228_SDIO_CON0,  1),
-	MMC(SCLK_SDIO_SAMPLE,  "sdio_sample",  "sclk_sdio",  RK3228_SDIO_CON1,  1),
+	MMC(SCLK_SDIO_SAMPLE,  "sdio_sample",  "sclk_sdio",  RK3228_SDIO_CON1,  0),
 
 	MMC(SCLK_EMMC_DRV,     "emmc_drv",     "sclk_emmc",  RK3228_EMMC_CON0,  1),
-	MMC(SCLK_EMMC_SAMPLE,  "emmc_sample",  "sclk_emmc",  RK3228_EMMC_CON1,  1),
+	MMC(SCLK_EMMC_SAMPLE,  "emmc_sample",  "sclk_emmc",  RK3228_EMMC_CON1,  0),
 };
 
 static const char *const rk3228_critical_clocks[] __initconst = {

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/clk-rockchip-fix-wrong-mmc-phase-shift-for-rk3228.patch queue-4.5/clk-rockchip-free-memory-in-error-cases-when-registering-clock-branches.patch queue-4.5/soc-rockchip-power-domain-fix-err-handle-while-probing.patch