rk322x: add overlay for USB OTG peripheral mode, add current and edge kernel config options

2025-09-24 19:47:06 +07:00 · 2022-03-17 20:28:01 +00:00
parent c6a8ca6d1a
commit 13469fd8a9
4 changed files with 202 additions and 84 deletions
--- a/config/kernel/linux-rk322x-current.config
+++ b/config/kernel/linux-rk322x-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.15.13 Kernel Configuration
+# Linux/arm 5.15.29 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -383,6 +383,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_SPECTRE=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
@@ -1773,6 +1774,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -1838,7 +1840,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -2186,7 +2187,7 @@ CONFIG_BCM_NET_PHYLIB=m
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
 # CONFIG_MAXLINEAR_GPHY is not set
-# CONFIG_MEDIATEK_GE_PHY is not set
+CONFIG_MEDIATEK_GE_PHY=m
 # CONFIG_MICREL_PHY is not set
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
@@ -2433,7 +2434,6 @@ CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822CS=m
 CONFIG_RTL8822BU=m
-# CONFIG_RTL8188EU is not set
 CONFIG_RTL8821CU=m
 CONFIG_88XXAU=m
 CONFIG_RTL8192EU=m
@@ -3828,12 +3828,12 @@ CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_TTPCI_EEPROM=m
 CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_V4L2=y
+CONFIG_VIDEOBUF2_MEMOPS=y
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_VMALLOC=y
+CONFIG_VIDEOBUF2_DMA_SG=y
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
@@ -5137,7 +5137,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_VBUS_DRAW=300
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_U_SERIAL_CONSOLE is not set

@@ -5151,7 +5151,8 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_SNP_UDC_PLAT is not set
+CONFIG_USB_SNP_CORE=y
+CONFIG_USB_SNP_UDC_PLAT=y
 # CONFIG_USB_M66592 is not set
 # CONFIG_USB_BDC_UDC is not set
 # CONFIG_USB_NET2272 is not set
@@ -5161,39 +5162,53 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # end of USB Peripheral Controller

 CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_ACM=m
-CONFIG_USB_U_SERIAL=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_ACM=y
+CONFIG_USB_U_SERIAL=y
+CONFIG_USB_U_ETHER=y
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=y
+CONFIG_USB_F_OBEX=y
+CONFIG_USB_F_NCM=y
+CONFIG_USB_F_ECM=y
+CONFIG_USB_F_EEM=y
+CONFIG_USB_F_SUBSET=y
+CONFIG_USB_F_RNDIS=y
 CONFIG_USB_F_MASS_STORAGE=y
 CONFIG_USB_F_FS=y
-CONFIG_USB_F_HID=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC1_LEGACY=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=y
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=y
+CONFIG_USB_F_PRINTER=y
 CONFIG_USB_CONFIGFS=y
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 CONFIG_USB_CONFIGFS_F_FS=y
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
 # CONFIG_USB_CONFIGFS_F_TCM is not set

 #
 # USB Gadget precomposed configurations
 #
 # CONFIG_USB_ZERO is not set
-# CONFIG_USB_AUDIO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
 # CONFIG_USB_ETH is not set
 # CONFIG_USB_G_NCM is not set
 CONFIG_USB_GADGETFS=m
@@ -6634,6 +6649,24 @@ CONFIG_PSTORE_RAM=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_EROFS_FS is not set
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_SBILIST=y
+# CONFIG_AUFS_HNOTIFY is not set
+# CONFIG_AUFS_EXPORT is not set
+# CONFIG_AUFS_XATTR is not set
+# CONFIG_AUFS_FHSM is not set
+# CONFIG_AUFS_RDU is not set
+# CONFIG_AUFS_DIRREN is not set
+# CONFIG_AUFS_SHWH is not set
+# CONFIG_AUFS_BR_RAMFS is not set
+# CONFIG_AUFS_BR_FUSE is not set
+CONFIG_AUFS_BR_HFSPLUS=y
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V2=m
--- a/config/kernel/linux-rk322x-edge.config
+++ b/config/kernel/linux-rk322x-edge.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.16.5 Kernel Configuration
+# Linux/arm 5.16.15 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -385,6 +385,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_SPECTRE=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
@@ -1780,6 +1781,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -2196,7 +2198,7 @@ CONFIG_BCM_NET_PHYLIB=m
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
 # CONFIG_MAXLINEAR_GPHY is not set
-# CONFIG_MEDIATEK_GE_PHY is not set
+CONFIG_MEDIATEK_GE_PHY=m
 # CONFIG_MICREL_PHY is not set
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
@@ -2445,7 +2447,6 @@ CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822CS=m
 CONFIG_RTL8822BU=m
-# CONFIG_RTL8188EU is not set
 CONFIG_RTL8821CU=m
 CONFIG_88XXAU=m
 CONFIG_RTL8192EU=m
@@ -3841,12 +3842,12 @@ CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_TTPCI_EEPROM=m
 CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_V4L2=y
+CONFIG_VIDEOBUF2_MEMOPS=y
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_VMALLOC=y
+CONFIG_VIDEOBUF2_DMA_SG=y
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
@@ -5162,7 +5163,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_VBUS_DRAW=300
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_U_SERIAL_CONSOLE is not set

@@ -5176,7 +5177,8 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_SNP_UDC_PLAT is not set
+CONFIG_USB_SNP_CORE=y
+CONFIG_USB_SNP_UDC_PLAT=y
 # CONFIG_USB_M66592 is not set
 # CONFIG_USB_BDC_UDC is not set
 # CONFIG_USB_NET2272 is not set
@@ -5186,32 +5188,45 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # end of USB Peripheral Controller

 CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_ACM=m
-CONFIG_USB_U_SERIAL=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_ACM=y
+CONFIG_USB_U_SERIAL=y
+CONFIG_USB_U_ETHER=y
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=y
+CONFIG_USB_F_OBEX=y
+CONFIG_USB_F_NCM=y
+CONFIG_USB_F_ECM=y
+CONFIG_USB_F_EEM=y
+CONFIG_USB_F_SUBSET=y
+CONFIG_USB_F_RNDIS=y
 CONFIG_USB_F_MASS_STORAGE=y
 CONFIG_USB_F_FS=y
-CONFIG_USB_F_HID=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC1_LEGACY=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=y
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=y
+CONFIG_USB_F_PRINTER=y
 CONFIG_USB_CONFIGFS=y
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 CONFIG_USB_CONFIGFS_F_FS=y
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
 # CONFIG_USB_CONFIGFS_F_TCM is not set

 #
@@ -6672,6 +6687,24 @@ CONFIG_PSTORE_RAM=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_EROFS_FS is not set
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_SBILIST=y
+# CONFIG_AUFS_HNOTIFY is not set
+# CONFIG_AUFS_EXPORT is not set
+# CONFIG_AUFS_XATTR is not set
+# CONFIG_AUFS_FHSM is not set
+# CONFIG_AUFS_RDU is not set
+# CONFIG_AUFS_DIRREN is not set
+# CONFIG_AUFS_SHWH is not set
+# CONFIG_AUFS_BR_RAMFS is not set
+# CONFIG_AUFS_BR_FUSE is not set
+CONFIG_AUFS_BR_HFSPLUS=y
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V2=m
--- a/patch/kernel/archive/rk322x-5.15/general-add-overlays.patch
+++ b/patch/kernel/archive/rk322x-5.15/general-add-overlays.patch
@@ -1,11 +1,11 @@
-From 8aeeea69e20238c1a642367101652901cd1ad4cd Mon Sep 17 00:00:00 2001
+From 257afedf9a3acb135bb7ab1dec95d2ebc38817db Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Thu, 9 Dec 2021 23:22:53 +0000
-Subject: [PATCH] rk322x: add general overlays
+Date: Thu, 17 Mar 2022 19:17:34 +0000
+Subject: [PATCH] rk322x device tree overlays

 ---
- arch/arm/boot/dts/overlay/Makefile            |  37 ++++++
- .../boot/dts/overlay/README.rk322x-overlays   |  84 +++++++++++++
+ arch/arm/boot/dts/overlay/Makefile            |  38 ++++++
+ .../boot/dts/overlay/README.rk322x-overlays   |  90 ++++++++++++++
 .../arm/boot/dts/overlay/rk322x-bt-8723cs.dts |  19 +++
 .../arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts | 113 ++++++++++++++++++
 arch/arm/boot/dts/overlay/rk322x-cpu-hs.dts   |  28 +++++
@@ -29,8 +29,9 @@ Subject: [PATCH] rk322x: add general overlays
 .../arm/boot/dts/overlay/rk322x-led-conf6.dts | 109 +++++++++++++++++
 .../arm/boot/dts/overlay/rk322x-led-conf7.dts | 106 ++++++++++++++++
 arch/arm/boot/dts/overlay/rk322x-nand.dts     |  22 ++++
+ .../dts/overlay/rk322x-usb-otg-peripheral.dts |  11 ++
 .../dts/overlay/rk322x-wlan-alt-wiring.dts    |  67 +++++++++++
- 26 files changed, 1228 insertions(+)
+ 27 files changed, 1246 insertions(+)
 create mode 100755 arch/arm/boot/dts/overlay/Makefile
 create mode 100755 arch/arm/boot/dts/overlay/README.rk322x-overlays
 create mode 100644 arch/arm/boot/dts/overlay/rk322x-bt-8723cs.dts
@@ -56,14 +57,15 @@ Subject: [PATCH] rk322x: add general overlays
 create mode 100644 arch/arm/boot/dts/overlay/rk322x-led-conf6.dts
 create mode 100644 arch/arm/boot/dts/overlay/rk322x-led-conf7.dts
 create mode 100755 arch/arm/boot/dts/overlay/rk322x-nand.dts
+ create mode 100644 arch/arm/boot/dts/overlay/rk322x-usb-otg-peripheral.dts
 create mode 100755 arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts

 diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
 new file mode 100755
-index 00000000000..31402961182
+index 00000000000..661081dcb6e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlay/Makefile
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,38 @@
 +# SPDX-License-Identifier: GPL-2.0
 +dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 +	rk322x-emmc.dtbo	\
@@ -87,7 +89,8 @@ index 00000000000..31402961182
 +	rk322x-ddr3-528.dtbo \
 +	rk322x-ddr3-660.dtbo \
 +	rk322x-ddr3-800.dtbo \
-+	rk322x-bt-8723cs.dtbo
+	rk322x-bt-8723cs.dtbo \
+	rk322x-usb-otg-peripheral.dtbo
 +
 +
 +scr-$(CONFIG_ARCH_ROCKCHIP) += \
@@ -103,10 +106,10 @@ index 00000000000..31402961182
 +
 diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays
 new file mode 100755
-index 00000000000..faf5e58f12c
+index 00000000000..1c366d80921
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays
-@@ -0,0 +1,84 @@
+@@ -0,0 +1,90 @@
 +This document describes overlays provided in the kernel packages
 +For generic Armbian overlays documentation please see
 +https://docs.armbian.com/User-Guide_Allwinner_overlays/
@@ -126,6 +129,7 @@ index 00000000000..faf5e58f12c
 +- rk322x-wlan-alt-wiring
 +- rk322x-ddr3-*
 +- rk322x-bt-*
+- rk322x-usb-otg-peripheral
 +
 +### Overlay details:
 +
@@ -191,6 +195,11 @@ index 00000000000..faf5e58f12c
 +Overlays that enable bluetooth devices. Most common bluetooth chips are
 +realtek ones.
 +rk322x-bt-8723cs: enable this overlay for 8723cs and 8703bs wifi/bluetooth
+
+### rk322x-usb-otg-peripheral
+
+Set the OTG USB port to peripheral mode to be used as USB slave instead
+of USB host
 diff --git a/arch/arm/boot/dts/overlay/rk322x-bt-8723cs.dts b/arch/arm/boot/dts/overlay/rk322x-bt-8723cs.dts
 new file mode 100644
 index 00000000000..48bb04f779f
@@ -1369,6 +1378,23 @@ index 00000000000..2a939ab492c
 +	};
 +
 +};
+diff --git a/arch/arm/boot/dts/overlay/rk322x-usb-otg-peripheral.dts b/arch/arm/boot/dts/overlay/rk322x-usb-otg-peripheral.dts
+new file mode 100644
+index 00000000000..01e03d816c1
+--- /dev/null
+++ b/arch/arm/boot/dts/overlay/rk322x-usb-otg-peripheral.dts
+@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+/*
+ * change OTG USB port mode to "peripheral"
+ *
+ */
+
+&usb_otg {
+	dr_mode = "peripheral";
+};
 diff --git a/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts b/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts
 new file mode 100755
 index 00000000000..f04c9ac166b
--- a/patch/kernel/archive/rk322x-5.16/general-add-overlays.patch
+++ b/patch/kernel/archive/rk322x-5.16/general-add-overlays.patch
@@ -1,11 +1,11 @@
-From 8aeeea69e20238c1a642367101652901cd1ad4cd Mon Sep 17 00:00:00 2001
+From 257afedf9a3acb135bb7ab1dec95d2ebc38817db Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Thu, 9 Dec 2021 23:22:53 +0000
-Subject: [PATCH] rk322x: add general overlays
+Date: Thu, 17 Mar 2022 19:17:34 +0000
+Subject: [PATCH] rk322x device tree overlays

 ---
- arch/arm/boot/dts/overlay/Makefile            |  37 ++++++
- .../boot/dts/overlay/README.rk322x-overlays   |  84 +++++++++++++
+ arch/arm/boot/dts/overlay/Makefile            |  38 ++++++
+ .../boot/dts/overlay/README.rk322x-overlays   |  90 ++++++++++++++
 .../arm/boot/dts/overlay/rk322x-bt-8723cs.dts |  19 +++
 .../arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts | 113 ++++++++++++++++++
 arch/arm/boot/dts/overlay/rk322x-cpu-hs.dts   |  28 +++++
@@ -29,8 +29,9 @@ Subject: [PATCH] rk322x: add general overlays
 .../arm/boot/dts/overlay/rk322x-led-conf6.dts | 109 +++++++++++++++++
 .../arm/boot/dts/overlay/rk322x-led-conf7.dts | 106 ++++++++++++++++
 arch/arm/boot/dts/overlay/rk322x-nand.dts     |  22 ++++
+ .../dts/overlay/rk322x-usb-otg-peripheral.dts |  11 ++
 .../dts/overlay/rk322x-wlan-alt-wiring.dts    |  67 +++++++++++
- 26 files changed, 1228 insertions(+)
+ 27 files changed, 1246 insertions(+)
 create mode 100755 arch/arm/boot/dts/overlay/Makefile
 create mode 100755 arch/arm/boot/dts/overlay/README.rk322x-overlays
 create mode 100644 arch/arm/boot/dts/overlay/rk322x-bt-8723cs.dts
@@ -56,14 +57,15 @@ Subject: [PATCH] rk322x: add general overlays
 create mode 100644 arch/arm/boot/dts/overlay/rk322x-led-conf6.dts
 create mode 100644 arch/arm/boot/dts/overlay/rk322x-led-conf7.dts
 create mode 100755 arch/arm/boot/dts/overlay/rk322x-nand.dts
+ create mode 100644 arch/arm/boot/dts/overlay/rk322x-usb-otg-peripheral.dts
 create mode 100755 arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts

 diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
 new file mode 100755
-index 00000000000..31402961182
+index 00000000000..661081dcb6e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlay/Makefile
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,38 @@
 +# SPDX-License-Identifier: GPL-2.0
 +dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 +	rk322x-emmc.dtbo	\
@@ -87,7 +89,8 @@ index 00000000000..31402961182
 +	rk322x-ddr3-528.dtbo \
 +	rk322x-ddr3-660.dtbo \
 +	rk322x-ddr3-800.dtbo \
-+	rk322x-bt-8723cs.dtbo
+	rk322x-bt-8723cs.dtbo \
+	rk322x-usb-otg-peripheral.dtbo
 +
 +
 +scr-$(CONFIG_ARCH_ROCKCHIP) += \
@@ -103,10 +106,10 @@ index 00000000000..31402961182
 +
 diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays
 new file mode 100755
-index 00000000000..faf5e58f12c
+index 00000000000..1c366d80921
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays
-@@ -0,0 +1,84 @@
+@@ -0,0 +1,90 @@
 +This document describes overlays provided in the kernel packages
 +For generic Armbian overlays documentation please see
 +https://docs.armbian.com/User-Guide_Allwinner_overlays/
@@ -126,6 +129,7 @@ index 00000000000..faf5e58f12c
 +- rk322x-wlan-alt-wiring
 +- rk322x-ddr3-*
 +- rk322x-bt-*
+- rk322x-usb-otg-peripheral
 +
 +### Overlay details:
 +
@@ -191,6 +195,11 @@ index 00000000000..faf5e58f12c
 +Overlays that enable bluetooth devices. Most common bluetooth chips are
 +realtek ones.
 +rk322x-bt-8723cs: enable this overlay for 8723cs and 8703bs wifi/bluetooth
+
+### rk322x-usb-otg-peripheral
+
+Set the OTG USB port to peripheral mode to be used as USB slave instead
+of USB host
 diff --git a/arch/arm/boot/dts/overlay/rk322x-bt-8723cs.dts b/arch/arm/boot/dts/overlay/rk322x-bt-8723cs.dts
 new file mode 100644
 index 00000000000..48bb04f779f
@@ -1369,6 +1378,23 @@ index 00000000000..2a939ab492c
 +	};
 +
 +};
+diff --git a/arch/arm/boot/dts/overlay/rk322x-usb-otg-peripheral.dts b/arch/arm/boot/dts/overlay/rk322x-usb-otg-peripheral.dts
+new file mode 100644
+index 00000000000..01e03d816c1
+--- /dev/null
+++ b/arch/arm/boot/dts/overlay/rk322x-usb-otg-peripheral.dts
+@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+/*
+ * change OTG USB port mode to "peripheral"
+ *
+ */
+
+&usb_otg {
+	dr_mode = "peripheral";
+};
 diff --git a/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts b/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts
 new file mode 100755
 index 00000000000..f04c9ac166b