aboutsummaryrefslogtreecommitdiff
path: root/board/rockchip
diff options
context:
space:
mode:
authorKever Yang2019-07-22 20:02:18 +0800
committerKever Yang2019-07-29 10:27:48 +0800
commit54b012fd961816990e7b8f9da3211fe7260c05b3 (patch)
tree79c555e6651fe8ca2cb4b14fe3ea2a60a226da3c /board/rockchip
parentedaf8db86648c0549e70b278421ae7db31e06922 (diff)
rockchip: rk3399: init vbus regulator in board_early_init_f()
Handle per-board init in board_early_init_f() and use the common board_init() for per-platform board init later. Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'board/rockchip')
-rw-r--r--board/rockchip/evb_rk3399/evb-rk3399.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
index eb1b832274a..c7e93a358db 100644
--- a/board/rockchip/evb_rk3399/evb-rk3399.c
+++ b/board/rockchip/evb_rk3399/evb-rk3399.c
@@ -9,15 +9,12 @@
#include <asm/arch-rockchip/periph.h>
#include <power/regulator.h>
-int board_init(void)
+#ifndef CONFIG_SPL_BUILD
+int board_early_init_f(void)
{
struct udevice *regulator;
int ret;
- ret = regulators_enable_boot_on(false);
- if (ret)
- debug("%s: Cannot enable boot on regulator\n", __func__);
-
ret = regulator_get_by_platname("vcc5v0_host", &regulator);
if (ret) {
debug("%s vcc5v0_host init fail! ret %d\n", __func__, ret);
@@ -25,11 +22,22 @@ int board_init(void)
}
ret = regulator_set_enable(regulator, true);
- if (ret) {
- debug("%s vcc5v0-host-en set fail!\n", __func__);
- goto out;
- }
+ if (ret)
+ debug("%s vcc5v0-host-en set fail! ret %d\n", __func__, ret);
out:
return 0;
}
+
+int board_init(void)
+{
+ struct udevice *regulator;
+ int ret;
+
+ ret = regulators_enable_boot_on(false);
+ if (ret)
+ debug("%s: Cannot enable boot on regulator\n", __func__);
+
+ return 0;
+}
+#endif