From 638b1b5a83c10754bf9375246c10a200ecd5d791 Mon Sep 17 00:00:00 2001
From: Alex Shumsky <alexthreed@gmail.com>
Date: Fri, 13 Sep 2024 22:53:07 +0300
Subject: [PATCH] rk3318-box: fix usb2 functionality in u-boot, that was broken
 after update to v2024.07

---
 .../board_rk3318-box/rk3318-box-add-defconfig.patch         | 3 +--
 .../v2024.07/board_rk3318-box/rk3318-box-add-dts.patch      | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-defconfig.patch b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-defconfig.patch
index dac35f3e69fe..173d1fda8514 100644
--- a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-defconfig.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-defconfig.patch
@@ -62,7 +62,7 @@ new file mode 100644
 index 000000000000..111111111111
 --- /dev/null
 +++ b/configs/rk3318-box_defconfig
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,130 @@
 +CONFIG_ARM=y
 +CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_COUNTER_FREQUENCY=24000000
@@ -170,7 +170,6 @@ index 000000000000..111111111111
 +CONFIG_SYSRESET=y
 +# CONFIG_TPL_SYSRESET is not set
 +CONFIG_USB=y
-+CONFIG_DM_USB_GADGET=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_DWC3=y
 +CONFIG_USB_EHCI_HCD=y
diff --git a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-dts.patch b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-dts.patch
index e461198d0962..66faf1d94ef7 100644
--- a/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-dts.patch
+++ b/patch/u-boot/v2024.07/board_rk3318-box/rk3318-box-add-dts.patch
@@ -28,7 +28,7 @@ new file mode 100644
 index 000000000000..111111111111
 --- /dev/null
 +++ b/arch/arm/dts/rk3318-box-u-boot.dtsi
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,62 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * (C) Copyright 2020 Armbian project (jock)
@@ -66,6 +66,10 @@ index 000000000000..111111111111
 +};
 +*/
 +
++&usb20_otg {
++	hnp-srp-disable;
++};
++
 +&sdio {
 +	status="disabled";
 +};