[PATCH 3/3] ARM: rockchip: drop rk3288 jtag/mmc switch handling
From: heiko@sntech.de (Heiko Stuebner)
Date: 2016-05-23 14:58:59
Also in:
linux-devicetree, linux-rockchip
Subsystem:
arm port, arm/rockchip soc support, the rest · Maintainers:
Russell King, Heiko Stuebner, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-05-24 · Re: [PATCH 3/3] ARM: rockchip: drop rk3288 jtag/mmc switch handling · Shawn Lin <hidden>
- 2016-05-23 · Re: [PATCH 3/3] ARM: rockchip: drop rk3288 jtag/mmc switch handling · Doug Anderson <hidden>
We moved that functionality to a more generic place where it can also be used for other socs, so drop it from architecture code. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/arm/mach-rockchip/rockchip.c | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c
index beb71da..e7b2aa7 100644
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c@@ -29,13 +29,11 @@ #include "core.h" #include "pm.h" -#define RK3288_GRF_SOC_CON0 0x244 #define RK3288_TIMER6_7_PHYS 0xff810000 static void __init rockchip_timer_init(void) { if (of_machine_is_compatible("rockchip,rk3288")) { - struct regmap *grf; void __iomem *reg_base; /*
@@ -54,16 +52,6 @@ static void __init rockchip_timer_init(void) } else { pr_err("rockchip: could not map timer7 registers\n"); } - - /* - * Disable auto jtag/sdmmc switching that causes issues - * with the mmc controllers making them unreliable - */ - grf = syscon_regmap_lookup_by_compatible("rockchip,rk3288-grf"); - if (!IS_ERR(grf)) - regmap_write(grf, RK3288_GRF_SOC_CON0, 0x10000000); - else - pr_err("rockchip: could not get grf syscon\n"); } of_clk_init(NULL);
--
2.6.4