Merge git://git.denx.de/u-boot-fsl-qoriq

[people/ms/u-boot.git] / arch / arm / mach-rockchip / rk3288-board-spl.c

diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c
index 08152aa72bbf049968421beaa4b9846ed87850cd..ed14023021d5694a9c8a4ef512d1da0c9a96c5ac 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3288-board-spl.c
@@ -187,7 +187,7 @@ void board_init_f(ulong dummy)
        rockchip_timer_init();
        configure_l2ctlr();
 
-       ret = uclass_get_device(UCLASS_CLK, 0, &dev);
+       ret = rockchip_get_clk(&dev);
        if (ret) {
                debug("CLK init failed: %d\n", ret);
                return;
@@ -251,7 +251,8 @@ void spl_board_init(void)
        }
 #ifdef CONFIG_SPL_MMC_SUPPORT
        if (!IS_ENABLED(CONFIG_TARGET_ROCK2) &&
-           !IS_ENABLED(CONFIG_TARGET_FIREFLY_RK3288)) {
+           !IS_ENABLED(CONFIG_TARGET_FIREFLY_RK3288) &&
+           !IS_ENABLED(CONFIG_TARGET_EVB_RK3288)) {
                ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
                if (ret) {
                        debug("%s: Failed to set up SD card\n", __func__);