rockchip: rk3188: remove pinctrl init in spl_board_init
authorKever Yang <kever.yang@rock-chips.com>
Tue, 9 Jul 2019 13:55:28 +0000 (21:55 +0800)
committerKever Yang <kever.yang@rock-chips.com>
Sat, 20 Jul 2019 15:59:44 +0000 (23:59 +0800)
The pinctrl will default init the io while driver is probe
with new pinctrl driver.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/mach-rockchip/rk3188-board-spl.c
arch/arm/mach-rockchip/rk3188-board.c

index 77b9b36d3577c6e835652dc6217f5d230d02c75e..84c2a5756fa56b9cd7318d741f1edace01003098 100644 (file)
@@ -23,7 +23,6 @@
 #include <asm/arch-rockchip/pmu_rk3188.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/timer.h>
-#include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <dm/test.h>
 #include <dm/util.h>
index 80d8c4241ec36a77575b9b300b271621cdf5e87d..94fd6c01eb70160b9d661b5ee19c1a3c6e5399d0 100644 (file)
@@ -15,7 +15,6 @@
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/pmu_rk3288.h>
 #include <asm/arch-rockchip/boot_mode.h>
-#include <dm/pinctrl.h>
 
 __weak int rk_board_late_init(void)
 {
@@ -42,37 +41,7 @@ int board_late_init(void)
 
 int board_init(void)
 {
-#if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM)
-       struct udevice *pinctrl;
-       int ret;
-
-       /*
-        * We need to implement sdcard iomux here for the further
-        * initialization, otherwise, it'll hit sdcard command sending
-        * timeout exception.
-        */
-       ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
-       if (ret) {
-               debug("%s: Cannot find pinctrl device\n", __func__);
-               goto err;
-       }
-       ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
-       if (ret) {
-               debug("%s: Failed to set up SD card\n", __func__);
-               goto err;
-       }
-
        return 0;
-err:
-       printf("board_init: Error %d\n", ret);
-
-       /* No way to report error here */
-       hang();
-
-       return -1;
-#else
-       return 0;
-#endif
 }
 
 #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)