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>
This commit is contained in:
Родитель
4c58063d42
Коммит
19f0f3021e
|
@ -29,13 +29,11 @@
|
||||||
#include "core.h"
|
#include "core.h"
|
||||||
#include "pm.h"
|
#include "pm.h"
|
||||||
|
|
||||||
#define RK3288_GRF_SOC_CON0 0x244
|
|
||||||
#define RK3288_TIMER6_7_PHYS 0xff810000
|
#define RK3288_TIMER6_7_PHYS 0xff810000
|
||||||
|
|
||||||
static void __init rockchip_timer_init(void)
|
static void __init rockchip_timer_init(void)
|
||||||
{
|
{
|
||||||
if (of_machine_is_compatible("rockchip,rk3288")) {
|
if (of_machine_is_compatible("rockchip,rk3288")) {
|
||||||
struct regmap *grf;
|
|
||||||
void __iomem *reg_base;
|
void __iomem *reg_base;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -54,16 +52,6 @@ static void __init rockchip_timer_init(void)
|
||||||
} else {
|
} else {
|
||||||
pr_err("rockchip: could not map timer7 registers\n");
|
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);
|
of_clk_init(NULL);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче