diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2020-03-13 14:42:46 -0300 |
|---|---|---|
| committer | Kever Yang <kever.yang@rock-chips.com> | 2020-03-26 22:58:46 +0800 |
| commit | 1ac0d52a9bb2a20e07542ca54c526e35b0f2ffca (patch) | |
| tree | 27ba4affc3a21cf9a670eb90bcdda0ae93eed476 | |
| parent | af84b3327ad269ffefcd66ddff2f5dea5eff38f8 (diff) | |
| download | u-boot-1ac0d52a9bb2a20e07542ca54c526e35b0f2ffca.tar.gz | |
elgin-rv1108: Use rk_board_late_init() for GPIO settings
Since commit 8e9a8d0d0c8c ("rockchip: elgin-rv1108: use board_early_init_f
for per-boar init") the function that configure the board GPIOs is no
longer called since CONFIG_BOARD_EARLY_INIT_F=y is not selected.
These GPIOs do not need to be configured in such early stagem, so change it
to rk_board_late_init() and also select CONFIG_BOARD_LATE_INIT=y
to fix the regression.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| -rw-r--r-- | board/elgin/elgin_rv1108/elgin_rv1108.c | 2 | ||||
| -rw-r--r-- | configs/elgin-rv1108_defconfig | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c index 06df25a326..c5a1cc95e4 100644 --- a/board/elgin/elgin_rv1108/elgin_rv1108.c +++ b/board/elgin/elgin_rv1108/elgin_rv1108.c @@ -49,7 +49,7 @@ int mach_cpu_init(void) #define MODEM_ENABLE_GPIO 111 -int board_early_init_f(void) +int rk_board_late_init(void) { gpio_request(MODEM_ENABLE_GPIO, "modem_enable"); gpio_direction_output(MODEM_ENABLE_GPIO, 0); diff --git a/configs/elgin-rv1108_defconfig b/configs/elgin-rv1108_defconfig index 62af7634a3..80d53f3c10 100644 --- a/configs/elgin-rv1108_defconfig +++ b/configs/elgin-rv1108_defconfig @@ -10,6 +10,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="rv1108-elgin-r1.dtb" +CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GPIO=y |