Merge tag 'u-boot-rockchip-20230731' of https://source.denx.de/u-boot/custodians/u-boot-rockchip

- Update dwc3 generic driver and update support for rk3568/rk3328;
- Add boards:
        rk3566: Pine64 Quartz64-A/B, SOQuartz on Model A/Blade/CM4-IO
        rk3568: Radxa E25 Carrier Board
        rk3588: Radxa ROCK5A
- Fixes and updates for chromebook veryon/jerry/speedy;
- SPI support fixes for rk3399/rk3568/rk3588;
- rk3588 usbdp phy support;
- dts and config updates for different boards;

9 files changed, 116 insertions, 0 deletions

diff --git a/board/pine64/quartz64_rk3566/Kconfig b/board/pine64/quartz64_rk3566/Kconfig
new file mode 100644
index 0000000000..3de1d8f7a9
--- /dev/null
+++ b/board/pine64/quartz64_rk3566/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_QUARTZ64_RK3566
+
+config SYS_BOARD
+	default "quartz64_rk3566"
+
+config SYS_VENDOR
+	default "pine64"
+
+config SYS_CONFIG_NAME
+	default "quartz64_rk3566"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+endif
diff --git a/board/pine64/quartz64_rk3566/MAINTAINERS b/board/pine64/quartz64_rk3566/MAINTAINERS
new file mode 100644
index 0000000000..6b75b35a12
--- /dev/null
+++ b/board/pine64/quartz64_rk3566/MAINTAINERS
@@ -0,0 +1,23 @@
+QUARTZ64-RK3566
+M:	Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
+R:	Jonas Karlman <jonas@kwiboo.se>
+S:	Maintained
+F:	board/pine64/quartz64_rk3566/
+F:	include/configs/quartz64_rk3566.h
+F:	configs/quartz64-a-rk3566_defconfig
+F:	configs/quartz64-b-rk3566_defconfig
+F:	configs/soquartz-blade-rk3566_defconfig
+F:	configs/soquartz-cm4-rk3566_defconfig
+F:	configs/soquartz-model-a-rk3566_defconfig
+F:	arch/arm/dts/rk3566-quartz64-a.dts
+F:	arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
+F:	arch/arm/dts/rk3566-quartz64-b.dts
+F:	arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
+F:	arch/arm/dts/rk3566-soquartz.dtsi
+F:	arch/arm/dts/rk3566-soquartz-u-boot.dtsi
+F:	arch/arm/dts/rk3566-soquartz-blade.dts
+F:	arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi
+F:	arch/arm/dts/rk3566-soquartz-cm4.dts
+F:	arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi
+F:	arch/arm/dts/rk3566-soquartz-model-a.dts
+F:	arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi
diff --git a/board/pine64/quartz64_rk3566/Makefile b/board/pine64/quartz64_rk3566/Makefile
new file mode 100644
index 0000000000..c24a40e724
--- /dev/null
+++ b/board/pine64/quartz64_rk3566/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+obj-y	+= quartz64-rk3566.o
diff --git a/board/pine64/quartz64_rk3566/quartz64-rk3566.c b/board/pine64/quartz64_rk3566/quartz64-rk3566.c
new file mode 100644
index 0000000000..4c027f2a7a
--- /dev/null
+++ b/board/pine64/quartz64_rk3566/quartz64-rk3566.c
@@ -0,0 +1 @@
+// SPDX-License-Identifier: GPL-2.0+
diff --git a/board/radxa/rock5a-rk3588s/Kconfig b/board/radxa/rock5a-rk3588s/Kconfig
new file mode 100644
index 0000000000..2d7fc85df4
--- /dev/null
+++ b/board/radxa/rock5a-rk3588s/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_ROCK5A_RK3588
+
+config SYS_BOARD
+	default "rock5a-rk3588s"
+
+config SYS_VENDOR
+	default "radxa"
+
+config SYS_CONFIG_NAME
+	default "rock5a-rk3588s"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+endif
diff --git a/board/radxa/rock5a-rk3588s/MAINTAINERS b/board/radxa/rock5a-rk3588s/MAINTAINERS
new file mode 100644
index 0000000000..62fb6b4c0e
--- /dev/null
+++ b/board/radxa/rock5a-rk3588s/MAINTAINERS
@@ -0,0 +1,6 @@
+ROCK5A-RK3588
+M:	Eugen Hristev <eugen.hristev@collabora.com>
+S:	Maintained
+F:	board/radxa/rock5a-rk3588s
+F:	include/configs/rock5a-rk3588s.h
+F:	configs/rock5a-rk3588s_defconfig
diff --git a/board/radxa/rock5a-rk3588s/Makefile b/board/radxa/rock5a-rk3588s/Makefile
new file mode 100644
index 0000000000..48dd512455
--- /dev/null
+++ b/board/radxa/rock5a-rk3588s/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier:     GPL-2.0+
+#
+# Copyright (c) 2023 Collabora Ltd.
+#
+
+obj-y += rock5a-rk3588s.o
diff --git a/board/radxa/rock5a-rk3588s/rock5a-rk3588s.c b/board/radxa/rock5a-rk3588s/rock5a-rk3588s.c
new file mode 100644
index 0000000000..2d7a8c07dc
--- /dev/null
+++ b/board/radxa/rock5a-rk3588s/rock5a-rk3588s.c
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2023 Collabora Ltd.
+ */
+
+#include <fdtdec.h>
+#include <fdt_support.h>
+
+#ifdef CONFIG_OF_BOARD_SETUP
+int rock5a_add_reserved_memory_fdt_nodes(void *new_blob)
+{
+	struct fdt_memory gap1 = {
+		.start = 0x3fc000000,
+		.end = 0x3fc4fffff,
+	};
+	struct fdt_memory gap2 = {
+		.start = 0x3fff00000,
+		.end = 0x3ffffffff,
+	};
+	unsigned long flags = FDTDEC_RESERVED_MEMORY_NO_MAP;
+	unsigned int ret;
+
+	/*
+	 * Inject the reserved-memory nodes into the DTS
+	 */
+	ret = fdtdec_add_reserved_memory(new_blob, "gap1", &gap1,  NULL, 0,
+					 NULL, flags);
+	if (ret)
+		return ret;
+
+	return fdtdec_add_reserved_memory(new_blob, "gap2", &gap2,  NULL, 0,
+					  NULL, flags);
+}
+
+int ft_board_setup(void *blob, struct bd_info *bd)
+{
+	return rock5a_add_reserved_memory_fdt_nodes(blob);
+}
+#endif
diff --git a/board/rockchip/evb_rk3568/MAINTAINERS b/board/rockchip/evb_rk3568/MAINTAINERS
index a8ed2508a1..82a92b89fa 100644
--- a/board/rockchip/evb_rk3568/MAINTAINERS
+++ b/board/rockchip/evb_rk3568/MAINTAINERS
@@ -27,6 +27,14 @@ M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/radxa-cm3-io-rk3566_defconfig
 
+RADXA-E25
+M:	Jonas Karlman <jonas@kwiboo.se>
+S:	Maintained
+F:	configs/radxa-e25-rk3568_defconfig
+F:	arch/arm/dts/rk3568-radxa-cm3i.dtsi
+F:	arch/arm/dts/rk3568-radxa-e25.dts
+F:	arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
+
 ROCK-3A
 M:      Akash Gajjar <gajjar04akash@gmail.com>
 S:      Maintained