diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-20 22:35:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-20 22:35:49 -0400 |
| commit | 83853366e3f9eb76426a6b1bda810e470bce04f0 (patch) | |
| tree | 4e99633bca0ae2479b46f0e2885775aea5995e2d /arch/arm/mach-rockchip/rk3288-board.c | |
| parent | e0ed8332fa2fe684b4c8ba1caab991663730cbf0 (diff) | |
| parent | a2a5053a15e4059c7445737d60f7b8425ca863f8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'arch/arm/mach-rockchip/rk3288-board.c')
| -rw-r--r-- | arch/arm/mach-rockchip/rk3288-board.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c index 8c128d4f94..9c4f7f219f 100644 --- a/arch/arm/mach-rockchip/rk3288-board.c +++ b/arch/arm/mach-rockchip/rk3288-board.c @@ -122,6 +122,22 @@ static int veyron_init(void) if (IS_ERR_VALUE(ret)) return ret; + ret = regulator_get_by_platname("vcc33_sd", &dev); + if (ret) { + debug("Cannot get regulator name\n"); + return ret; + } + + ret = regulator_set_value(dev, 3300000); + if (ret) + return ret; + + ret = regulators_enable_boot_on(false); + if (ret) { + debug("%s: Cannot enable boot on regulators\n", __func__); + return ret; + } + return 0; } #endif @@ -301,10 +317,10 @@ U_BOOT_CMD( "" ); -#define GRF_SOC_CON2 0xff77024c - int board_early_init_f(void) { + const uintptr_t GRF_SOC_CON0 = 0xff770244; + const uintptr_t GRF_SOC_CON2 = 0xff77024c; struct udevice *pinctrl; struct udevice *dev; int ret; @@ -333,5 +349,11 @@ int board_early_init_f(void) } rk_setreg(GRF_SOC_CON2, 1 << 0); + /* + * Disable JTAG on sdmmc0 IO. The SDMMC won't work until this bit is + * cleared + */ + rk_clrreg(GRF_SOC_CON0, 1 << 12); + return 0; } |