From 3c20768bb981b636b97a7ed80b7834835fc36ca1 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 13 Jan 2021 00:33:10 +0100 Subject: uboot-rockchip: update NanoPi R2S patches Update the NanoPi R2S to the latest version submitted upstream. Signed-off-by: David Bauer --- .../src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c | 10 +++++++--- .../src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328') diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c index cf9411116b..17e1e302a5 100644 --- a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c +++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-platdata.c @@ -79,7 +79,6 @@ U_BOOT_DEVICE(gpio0_at_ff210000) = { /* Node /mmc@ff500000 index 3 */ static struct dtd_rockchip_rk3288_dw_mshc dtv_mmc_at_ff500000 = { .bus_width = 0x4, - .cap_mmc_highspeed = true, .cap_sd_highspeed = true, .clocks = { {0, {317}}, @@ -93,6 +92,10 @@ static struct dtd_rockchip_rk3288_dw_mshc dtv_mmc_at_ff500000 = { .pinctrl_0 = {0x47, 0x48, 0x49, 0x4a}, .pinctrl_names = "default", .reg = {0xff500000, 0x4000}, + .sd_uhs_sdr104 = true, + .sd_uhs_sdr12 = true, + .sd_uhs_sdr25 = true, + .sd_uhs_sdr50 = true, .u_boot_spl_fifo_mode = true, .vmmc_supply = 0x4b, .vqmmc_supply = 0x1e, @@ -118,9 +121,10 @@ U_BOOT_DEVICE(pinctrl) = { /* Node /sdmmc-regulator index 5 */ static struct dtd_regulator_fixed dtv_sdmmc_regulator = { - .gpio = {0x60, 0x1e, 0x1}, - .pinctrl_0 = 0x61, + .gpio = {0x61, 0x1e, 0x1}, + .pinctrl_0 = 0x67, .pinctrl_names = "default", + .regulator_boot_on = true, .regulator_max_microvolt = 0x325aa0, .regulator_min_microvolt = 0x325aa0, .regulator_name = "vcc_sd", diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h index 6dcb4c1f1b..847b121a34 100644 --- a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h +++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h @@ -22,6 +22,7 @@ struct dtd_regulator_fixed { fdt32_t gpio[3]; fdt32_t pinctrl_0; const char * pinctrl_names; + bool regulator_boot_on; fdt32_t regulator_max_microvolt; fdt32_t regulator_min_microvolt; const char * regulator_name; @@ -36,7 +37,6 @@ struct dtd_rockchip_gpio_bank { }; struct dtd_rockchip_rk3288_dw_mshc { fdt32_t bus_width; - bool cap_mmc_highspeed; bool cap_sd_highspeed; struct phandle_1_arg clocks[4]; bool disable_wp; @@ -46,6 +46,10 @@ struct dtd_rockchip_rk3288_dw_mshc { fdt32_t pinctrl_0[4]; const char * pinctrl_names; fdt64_t reg[2]; + bool sd_uhs_sdr104; + bool sd_uhs_sdr12; + bool sd_uhs_sdr25; + bool sd_uhs_sdr50; bool u_boot_spl_fifo_mode; fdt32_t vmmc_supply; fdt32_t vqmmc_supply; -- cgit v1.2.3