diff options
author | Heiko Stuebner <heiko@sntech.de> | 2016-11-16 18:03:04 -0500 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2017-01-06 04:29:16 -0500 |
commit | 19f0f3021e7532a1056886e3ddf524f9847e4f15 (patch) | |
tree | 575f49838b3313f585cbc909957f5a7ceba5dbdf | |
parent | 4c58063d4258f6beb4fd5647db6b58f49e337c8f (diff) |
ARM: rockchip: drop rk3288 jtag/mmc switch handling
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>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
-rw-r--r-- | arch/arm/mach-rockchip/rockchip.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index a7ab9ec141f8..ef0500a4c8ad 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c | |||
@@ -29,13 +29,11 @@ | |||
29 | #include "core.h" | 29 | #include "core.h" |
30 | #include "pm.h" | 30 | #include "pm.h" |
31 | 31 | ||
32 | #define RK3288_GRF_SOC_CON0 0x244 | ||
33 | #define RK3288_TIMER6_7_PHYS 0xff810000 | 32 | #define RK3288_TIMER6_7_PHYS 0xff810000 |
34 | 33 | ||
35 | static void __init rockchip_timer_init(void) | 34 | static void __init rockchip_timer_init(void) |
36 | { | 35 | { |
37 | if (of_machine_is_compatible("rockchip,rk3288")) { | 36 | if (of_machine_is_compatible("rockchip,rk3288")) { |
38 | struct regmap *grf; | ||
39 | void __iomem *reg_base; | 37 | void __iomem *reg_base; |
40 | 38 | ||
41 | /* | 39 | /* |
@@ -54,16 +52,6 @@ static void __init rockchip_timer_init(void) | |||
54 | } else { | 52 | } else { |
55 | pr_err("rockchip: could not map timer7 registers\n"); | 53 | pr_err("rockchip: could not map timer7 registers\n"); |
56 | } | 54 | } |
57 | |||
58 | /* | ||
59 | * Disable auto jtag/sdmmc switching that causes issues | ||
60 | * with the mmc controllers making them unreliable | ||
61 | */ | ||
62 | grf = syscon_regmap_lookup_by_compatible("rockchip,rk3288-grf"); | ||
63 | if (!IS_ERR(grf)) | ||
64 | regmap_write(grf, RK3288_GRF_SOC_CON0, 0x10000000); | ||
65 | else | ||
66 | pr_err("rockchip: could not get grf syscon\n"); | ||
67 | } | 55 | } |
68 | 56 | ||
69 | of_clk_init(NULL); | 57 | of_clk_init(NULL); |