uboot-rockchip: update to v2021.07

Tested on NanoPi R2S

Signed-off-by: David Bauer <mail@david-bauer.net>

2 files changed, 61 insertions, 10 deletions

diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-decl.h b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-decl.h
new file mode 100644
index 0000000000..0919e4ed53
--- /dev/null
+++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-decl.h
@@ -0,0 +1,23 @@
+/*
+ * DO NOT MODIFY
+ *
+ * Declares externs for all device/uclass instances.
+ * This was generated by dtoc from a .dtb (device tree binary) file.
+ */
+
+#include <dm/device-internal.h>
+#include <dm/uclass-internal.h>
+
+/* driver declarations - these allow DM_DRIVER_GET() to be used */
+extern U_BOOT_DRIVER(rockchip_rk3328_cru);
+extern U_BOOT_DRIVER(rockchip_rk3328_dmc);
+extern U_BOOT_DRIVER(rockchip_rk3288_dw_mshc);
+extern U_BOOT_DRIVER(ns16550_serial);
+extern U_BOOT_DRIVER(rockchip_rk3328_grf);
+
+/* uclass driver declarations - needed for DM_UCLASS_DRIVER_REF() */
+extern UCLASS_DRIVER(clk);
+extern UCLASS_DRIVER(mmc);
+extern UCLASS_DRIVER(ram);
+extern UCLASS_DRIVER(serial);
+extern UCLASS_DRIVER(syscon);
diff --git a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c
index 1818461ec8..e5b330c9d9 100644
--- a/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c
+++ b/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-plat.c
@@ -12,19 +12,38 @@
 #include <dm.h>
 #include <dt-structs.h>
 
-/* Node /clock-controller@ff440000 index 0 */
+/*
+ * driver_info declarations, ordered by 'struct driver_info' linker_list idx:
+ *
+ * idx  driver_info          driver
+ * ---  -------------------- --------------------
+ *   0: clock_controller_at_ff440000 rockchip_rk3328_cru
+ *   1: dmc                  rockchip_rk3328_dmc
+ *   2: mmc_at_ff500000      rockchip_rk3288_dw_mshc
+ *   3: serial_at_ff130000   ns16550_serial
+ *   4: syscon_at_ff100000   rockchip_rk3328_grf
+ * ---  -------------------- --------------------
+ */
+
+/*
+ * Node /clock-controller@ff440000 index 0
+ * driver rockchip_rk3328_cru parent None
+ */
 static struct dtd_rockchip_rk3328_cru dtv_clock_controller_at_ff440000 = {
 	.reg			= {0xff440000, 0x1000},
 	.rockchip_grf		= 0x3a,
 };
 U_BOOT_DRVINFO(clock_controller_at_ff440000) = {
 	.name		= "rockchip_rk3328_cru",
-	.plat	= &dtv_clock_controller_at_ff440000,
+	.plat		= &dtv_clock_controller_at_ff440000,
 	.plat_size	= sizeof(dtv_clock_controller_at_ff440000),
 	.parent_idx	= -1,
 };
 
-/* Node /dmc index 1 */
+/*
+ * Node /dmc index 1
+ * driver rockchip_rk3328_dmc parent None
+ */
 static struct dtd_rockchip_rk3328_dmc dtv_dmc = {
 	.reg			= {0xff400000, 0x1000, 0xff780000, 0x3000, 0xff100000, 0x1000, 0xff440000, 0x1000,
 		0xff720000, 0x1000, 0xff798000, 0x1000},
@@ -56,12 +75,15 @@ static struct dtd_rockchip_rk3328_dmc dtv_dmc = {
 };
 U_BOOT_DRVINFO(dmc) = {
 	.name		= "rockchip_rk3328_dmc",
-	.plat	= &dtv_dmc,
+	.plat		= &dtv_dmc,
 	.plat_size	= sizeof(dtv_dmc),
 	.parent_idx	= -1,
 };
 
-/* Node /mmc@ff500000 index 2 */
+/*
+ * Node /mmc@ff500000 index 2
+ * driver rockchip_rk3288_dw_mshc parent None
+ */
 static struct dtd_rockchip_rk3288_dw_mshc dtv_mmc_at_ff500000 = {
 	.bus_width		= 0x4,
 	.cap_sd_highspeed	= true,
@@ -87,12 +109,15 @@ static struct dtd_rockchip_rk3288_dw_mshc dtv_mmc_at_ff500000 = {
 };
 U_BOOT_DRVINFO(mmc_at_ff500000) = {
 	.name		= "rockchip_rk3288_dw_mshc",
-	.plat	= &dtv_mmc_at_ff500000,
+	.plat		= &dtv_mmc_at_ff500000,
 	.plat_size	= sizeof(dtv_mmc_at_ff500000),
 	.parent_idx	= -1,
 };
 
-/* Node /serial@ff130000 index 3 */
+/*
+ * Node /serial@ff130000 index 3
+ * driver ns16550_serial parent None
+ */
 static struct dtd_ns16550_serial dtv_serial_at_ff130000 = {
 	.clock_frequency	= 0x16e3600,
 	.clocks			= {
@@ -109,18 +134,21 @@ static struct dtd_ns16550_serial dtv_serial_at_ff130000 = {
 };
 U_BOOT_DRVINFO(serial_at_ff130000) = {
 	.name		= "ns16550_serial",
-	.plat	= &dtv_serial_at_ff130000,
+	.plat		= &dtv_serial_at_ff130000,
 	.plat_size	= sizeof(dtv_serial_at_ff130000),
 	.parent_idx	= -1,
 };
 
-/* Node /syscon@ff100000 index 4 */
+/*
+ * Node /syscon@ff100000 index 4
+ * driver rockchip_rk3328_grf parent None
+ */
 static struct dtd_rockchip_rk3328_grf dtv_syscon_at_ff100000 = {
 	.reg			= {0xff100000, 0x1000},
 };
 U_BOOT_DRVINFO(syscon_at_ff100000) = {
 	.name		= "rockchip_rk3328_grf",
-	.plat	= &dtv_syscon_at_ff100000,
+	.plat		= &dtv_syscon_at_ff100000,
 	.plat_size	= sizeof(dtv_syscon_at_ff100000),
 	.parent_idx	= -1,
 };