GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: rockchip: Remove the pinctrl request at rk3288-board-spl

Browse source 
If we use the new pinctrl driver, the pinctrl setup will be done
by device probe. Remove the pinctrl setup at rk3288-board-spl.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
David Wu 2019-01-02 20:51:00 +08:00 • committed by Philipp Tomsich
parent bfb11abef2
commit 08c817c399
1 changed files with 0 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
arch/arm/mach-rockchip/rk3288-board-spl.c
View file

@ -78,45 +78,6 @@ fallback:
return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC1;
} }
#ifdef CONFIG_SPL_MMC_SUPPORT
static int configure_emmc(struct udevice *pinctrl)
{
#if defined(CONFIG_TARGET_CHROMEBOOK_JERRY)
struct gpio_desc desc;
int ret;
pinctrl_request_noflags(pinctrl, PERIPH_ID_EMMC);
/*
* TODO(sjg@chromium.org): Pick this up from device tree or perhaps
* use the EMMC_PWREN setting.
*/
ret = dm_gpio_lookup_name("D9", &desc);
if (ret) {
debug("gpio ret=%d\n", ret);
return ret;
}
ret = dm_gpio_request(&desc, "emmc_pwren");
if (ret) {
debug("gpio_request ret=%d\n", ret);
return ret;
}
ret = dm_gpio_set_dir_flags(&desc, GPIOD_IS_OUT);
if (ret) {
debug("gpio dir ret=%d\n", ret);
return ret;
}
ret = dm_gpio_set_value(&desc, 1);
if (ret) {
debug("gpio value ret=%d\n", ret);
return ret;
}
#endif
return 0;
}
#endif
#if !defined(CONFIG_SPL_OF_PLATDATA) #if !defined(CONFIG_SPL_OF_PLATDATA)
static int phycore_init(void) static int phycore_init(void)
{ {
@ -145,7 +106,6 @@ static int phycore_init(void)
void board_init_f(ulong dummy) void board_init_f(ulong dummy)
{ {
struct udevice *pinctrl;
struct udevice *dev; struct udevice *dev;
int ret; int ret;
@ -184,12 +144,6 @@ void board_init_f(ulong dummy)
return; return;
} }
ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
if (ret) {
debug("Pinctrl init failed: %d\n", ret);
return;
}
#if !defined(CONFIG_SPL_OF_PLATDATA) #if !defined(CONFIG_SPL_OF_PLATDATA)
if (of_machine_is_compatible("phytec,rk3288-phycore-som")) { if (of_machine_is_compatible("phytec,rk3288-phycore-som")) {
ret = phycore_init(); ret = phycore_init();
@ -240,52 +194,19 @@ static int setup_led(void)
void spl_board_init(void) void spl_board_init(void)
{ {
struct udevice *pinctrl;
int ret; int ret;
ret = setup_led(); ret = setup_led();
if (ret) { if (ret) {
debug("LED ret=%d\n", ret); debug("LED ret=%d\n", ret);
hang(); hang();
} }
ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
if (ret) {
debug("%s: Cannot find pinctrl device\n", __func__);
goto err;
}
#ifdef CONFIG_SPL_MMC_SUPPORT
ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
if (ret) {
debug("%s: Failed to set up SD card\n", __func__);
goto err;
}
ret = configure_emmc(pinctrl);
if (ret) {
debug("%s: Failed to set up eMMC\n", __func__);
goto err;
}
#endif
/* Enable debug UART */
ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART_DBG);
if (ret) {
debug("%s: Failed to set up console UART\n", __func__);
goto err;
}
preloader_console_init(); preloader_console_init();
#if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM) #if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM)
back_to_bootrom(BROM_BOOT_NEXTSTAGE); back_to_bootrom(BROM_BOOT_NEXTSTAGE);
#endif #endif
return; return;
err:
printf("spl_board_init: Error %d\n", ret);
/* No way to report error here */
hang();
} }
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT