Merge tag 'u-boot-rockchip-20200820' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip

- Fix rk3399 evb sdcard support
- Fix for SPL_LED support

arch/arm/dts/rk3399-evb-u-boot.dtsi

@@ -37,3 +37,16 @@
 	dr_mode = "host";
 	status = "okay";
 };
+
+&sdmmc {
+	u-boot,dm-pre-reloc;
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+	disable-wp;
+	max-frequency = <150000000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
+	status = "okay";
+};

arch/arm/mach-rockchip/rk3188/rk3188.c

@@ -6,6 +6,7 @@
 #include <dm.h>
 #include <hang.h>
 #include <init.h>
+#include <led.h>
 #include <log.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -105,6 +106,7 @@ int rk_board_late_init(void)
 }
 
 #ifdef CONFIG_SPL_BUILD
+DECLARE_GLOBAL_DATA_PTR;
 static int setup_led(void)
 {
 #ifdef CONFIG_SPL_LED
@@ -120,7 +122,7 @@ static int setup_led(void)
 		debug("%s: get=%d\n", __func__, ret);
 		return ret;
 	}
-	ret = led_set_on(dev, 1);
+	ret = led_set_state(dev, LEDST_ON);
 	if (ret)
 		return ret;
 #endif

board/firefly/firefly-rk3288/firefly-rk3288.c

@@ -5,9 +5,11 @@
 
 #include <common.h>
 #include <hang.h>
+#include <led.h>
 #include <log.h>
 
 #ifdef CONFIG_SPL_BUILD
+DECLARE_GLOBAL_DATA_PTR;
 static int setup_led(void)
 {
 #ifdef CONFIG_SPL_LED
@@ -23,7 +25,7 @@ static int setup_led(void)
 		debug("%s: get=%d\n", __func__, ret);
 		return ret;
 	}
-	ret = led_set_on(dev, 1);
+	ret = led_set_state(dev, LEDST_ON);
 	if (ret)
 		return ret;
 #endif

configs/evb-rk3399_defconfig

@@ -30,6 +30,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
 CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_SF_DEFAULT_SPEED=20000000