diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-25 08:19:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-25 08:19:14 -0400 |
| commit | e49a9d4ddb10f0047ba0f292e0eb9f07a8f6f5f0 (patch) | |
| tree | 697ae751162dfe10400128eb960a6c178479fd2d | |
| parent | 078656186f1037894c45682ca74d0921de8a7010 (diff) | |
| parent | b5b81f2490628650137c9fee3679c995f5fac757 (diff) | |
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
| -rw-r--r-- | arch/arm/dts/rk3399-evb-u-boot.dtsi | 13 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk3188/rk3188.c | 4 | ||||
| -rw-r--r-- | board/firefly/firefly-rk3288/firefly-rk3288.c | 4 | ||||
| -rw-r--r-- | configs/evb-rk3399_defconfig | 1 |
4 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi index 1be54feacc..8056dc843e 100644 --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi +++ b/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"; +}; diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c index 1b2f4a4757..222953ab94 100644 --- a/arch/arm/mach-rockchip/rk3188/rk3188.c +++ b/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 diff --git a/board/firefly/firefly-rk3288/firefly-rk3288.c b/board/firefly/firefly-rk3288/firefly-rk3288.c index 1965985a0f..bd8a32cf7b 100644 --- a/board/firefly/firefly-rk3288/firefly-rk3288.c +++ b/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 diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 509c86b81b..909c68822c 100644 --- a/configs/evb-rk3399_defconfig +++ b/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 |