nanopct6(-lts): edge: u-boot: pull upstream/dts v6.13-rc5-dts for…

… USB3 Type-A

- to enable USB3 Type-A host port (
  - ref torvalds/linux@a6ae420

config/boards/nanopct6.conf

@@ -67,6 +67,20 @@ function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() {
 	run_host_command_logged cp "arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi" "arch/arm/dts/rk3588-nanopc-t6-lts-u-boot.dtsi"
 }
 
+# Pull in a newer upstream/dts, which has a fix for the USB3 Type-A (host); this enables booting high speed USB3 devices (https://github.com/torvalds/linux/commit/a6ae420439dc47a58550a6e61e596e9dd1562caf)
+# See https://docs.u-boot.org/en/latest/develop/devicetree/control.html#resyncing-with-devicetree-rebasing
+# @TODO this probably can be removed for 2025.04
+function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() {
+	[[ "${BRANCH}" != "edge" ]] && return 0
+
+	regular_git add . || true
+	regular_git commit -m "commit pre update OF upstream so that tree is clean" || true
+	run_host_command_logged bash tools/update-subtree.sh pull dts v6.13-rc5-dts "||" true # do not fail as conflicts are expected
+	regular_git checkout --theirs dts/upstream                                            # "accept theirs" on all conflicts
+	regular_git add dts/upstream
+	regular_git commit -m "Update OF upstream to v6.13-rc5-dts and accept theirs on all conflicts"
+}
+
 function post_config_uboot_target__extra_configs_for_nanopct6_mainline_environment_in_spi() {
 	[[ "${BRANCH}" != "edge" ]] && return 0