diff --git a/patch/u-boot/v2024.01/board_rk322x-box/rk322x-add-usb-reset-props.patch b/patch/u-boot/v2024.01/board_rk322x-box/rk322x-add-usb-reset-props.patch new file mode 100644 index 0000000000..1035b4d848 --- /dev/null +++ b/patch/u-boot/v2024.01/board_rk322x-box/rk322x-add-usb-reset-props.patch @@ -0,0 +1,52 @@ +From 908176615a6aa710563883715da75e50e7305179 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Sat, 4 May 2024 15:07:27 +0200 +Subject: [PATCH] add reset properties for usb otg/ehci + +--- + arch/arm/dts/rk322x.dtsi | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/arch/arm/dts/rk322x.dtsi b/arch/arm/dts/rk322x.dtsi +index 8eed9e3a92..ffe503e5db 100644 +--- a/arch/arm/dts/rk322x.dtsi ++++ b/arch/arm/dts/rk322x.dtsi +@@ -799,6 +799,8 @@ + g-tx-fifo-size = <256 128 128 64 32 16>; + phys = <&u2phy0_otg>; + phy-names = "usb2-phy"; ++ resets = <&cru SRST_USBOTG>; ++ reset-names = "dwc2"; + status = "disabled"; + }; + +@@ -809,6 +811,8 @@ + clocks = <&cru HCLK_HOST0>, <&u2phy0>; + phys = <&u2phy0_host>; + phy-names = "usb"; ++ resets = <&cru SRST_USBHOST0>; ++ reset-names = "ehci"; + status = "disabled"; + }; + +@@ -829,6 +833,8 @@ + clocks = <&cru HCLK_HOST1>, <&u2phy1>; + phys = <&u2phy1_otg>; + phy-names = "usb"; ++ resets = <&cru SRST_USBHOST1>; ++ reset-names = "ehci"; + status = "disabled"; + }; + +@@ -849,6 +855,8 @@ + clocks = <&cru HCLK_HOST2>, <&u2phy1>; + phys = <&u2phy1_host>; + phy-names = "usb"; ++ resets = <&cru SRST_USBHOST2>; ++ reset-names = "ehci"; + status = "disabled"; + }; + +-- +2.34.1 + diff --git a/patch/u-boot/v2024.01/board_rk322x-box/rk322x-box-add-defconfig.patch b/patch/u-boot/v2024.01/board_rk322x-box/rk322x-box-add-defconfig.patch index bdc4e67bae..eb26baa448 100644 --- a/patch/u-boot/v2024.01/board_rk322x-box/rk322x-box-add-defconfig.patch +++ b/patch/u-boot/v2024.01/board_rk322x-box/rk322x-box-add-defconfig.patch @@ -1,9 +1,9 @@ diff --git a/configs/rk322x-box_defconfig b/configs/rk322x-box_defconfig new file mode 100644 -index 0000000000..98eec32a53 +index 0000000000..767c7edb72 --- /dev/null +++ b/configs/rk322x-box_defconfig -@@ -0,0 +1,133 @@ +@@ -0,0 +1,125 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_SPL_SKIP_LOWLEVEL_INIT=y @@ -32,7 +32,6 @@ index 0000000000..98eec32a53 +CONFIG_DEBUG_UART=y +CONFIG_LOCALVERSION="-armbian" +# CONFIG_LOCALVERSION_AUTO is not set -+# CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y @@ -40,6 +39,7 @@ index 0000000000..98eec32a53 +CONFIG_BOOTDELAY=1 +CONFIG_USE_PREBOOT=y +CONFIG_DEFAULT_FDT_FILE="rk322x-box.dtb" ++CONFIG_LOGLEVEL=4 +CONFIG_SILENT_CONSOLE=y +# CONFIG_SPL_SILENT_CONSOLE is not set +# CONFIG_TPL_SILENT_CONSOLE is not set @@ -58,7 +58,6 @@ index 0000000000..98eec32a53 +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y -+CONFIG_CMD_ROCKUSB=y +# CONFIG_CMD_SETEXPR is not set +# CONFIG_CMD_CLS is not set +CONFIG_CMD_TIME=y @@ -85,8 +84,6 @@ index 0000000000..98eec32a53 +CONFIG_CLK_CCF=y +CONFIG_CLK_COMPOSITE_CCF=y +CONFIG_CLK_GPIO=y -+CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y @@ -100,8 +97,10 @@ index 0000000000..98eec32a53 +CONFIG_PHY_ROCKCHIP_INNO_HDMI=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PINCTRL=y ++CONFIG_REGULATOR_PWM=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_SPL_DM_REGULATOR_FIXED=y ++CONFIG_DM_REGULATOR_GPIO=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM=y +CONFIG_SPL_RAM=y @@ -120,13 +119,6 @@ index 0000000000..98eec32a53 +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_DWC2=y +CONFIG_USB_KEYBOARD=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a -+CONFIG_USB_GADGET_DWC2_OTG=y -+CONFIG_USB_GADGET_DWC2_OTG_PHY=y -+CONFIG_USB_GADGET_VBUS_DRAW=500 -+CONFIG_USB_FUNCTION_MASS_STORAGE=y -+CONFIG_USB_FUNCTION_ROCKUSB=y +CONFIG_VIDEO=y +# CONFIG_BACKLIGHT_PWM is not set +# CONFIG_PANEL is not set diff --git a/patch/u-boot/v2024.01/board_rk322x-box/rk322x-box-add-device-tree.patch b/patch/u-boot/v2024.01/board_rk322x-box/rk322x-box-add-device-tree.patch index 24fb95ae88..6b7056a50d 100644 --- a/patch/u-boot/v2024.01/board_rk322x-box/rk322x-box-add-device-tree.patch +++ b/patch/u-boot/v2024.01/board_rk322x-box/rk322x-box-add-device-tree.patch @@ -1,9 +1,9 @@ diff --git a/arch/arm/dts/rk322x-box.dts b/arch/arm/dts/rk322x-box.dts new file mode 100755 -index 0000000000..91d4afd29c +index 0000000000..d1433c6e3b --- /dev/null +++ b/arch/arm/dts/rk322x-box.dts -@@ -0,0 +1,266 @@ +@@ -0,0 +1,268 @@ +// SPDX-License-Identifier: GPL-2.0+ OR X11 +/* + * (C) Copyright 2019 Paolo Sabatino @@ -213,7 +213,9 @@ index 0000000000..91d4afd29c + status = "okay"; +}; + -+&usb_otg{ ++&usb_otg { ++ dr_mode = "host"; ++ hnp-srp-disable; + vbus-supply = <&vcc_otg_vbus>; + status = "okay"; +};