From 6914a2387b2c6d2a995118892ca1552259d69acf Mon Sep 17 00:00:00 2001 From: lintao Date: Mon, 21 Jul 2014 11:13:36 +0800 Subject: [PATCH] mmc: rk_sdmmc: disable force_jtag in dw_mci_resume --- drivers/mmc/host/rk_sdmmc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c index d6ca36abf62d..8f31b95bec2c 100755 --- a/drivers/mmc/host/rk_sdmmc.c +++ b/drivers/mmc/host/rk_sdmmc.c @@ -3939,14 +3939,11 @@ int dw_mci_resume(struct dw_mci *host) /* Disable jtag*/ if(cpu_is_rk3288()) grf_writel(((1 << 12) << 16) | (0 << 12), RK3288_GRF_SOC_CON0); - /* else if(cpu_is_rk3036()) grf_writel(((1 << 11) << 16) | (0 << 11), RK3036_GRF_SOC_CON0); - else if(cpu_is_rk3126()) - TODO; - else if audi-b - TODO; - */ + else if(cpu_is_rk312x()) + /* RK3036_GRF_SOC_CON0 is compatible with rk312x, tmp setting */ + grf_writel(((1 << 8) << 16) | (0 << 8), RK3036_GRF_SOC_CON0); } if(host->vmmc){ ret = regulator_enable(host->vmmc); -- 2.34.1