Merge pull request #411 from ludiazv/new-opizero2

Support for Orange pi zero 2 for 6.6 LTS
Merge pull request #413 from alperak/master
2025-12-24 05:56:40 +01:00 · 2024-06-17 16:05:33 +02:00 · 2024-06-17 16:04:33 +02:00 · 2024-06-05 17:25:20 +03:00 · 2024-05-23 14:28:05 +02:00 · 2024-05-23 14:26:00 +02:00
99 changed files with 452893 additions and 1587 deletions
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"

 LAYERDEPENDS_sunxi = "core meta-python meta-arm"

-LAYERSERIES_COMPAT_sunxi = "honister kirkstone langdale mickledore nanbield scarthgap"
+LAYERSERIES_COMPAT_sunxi = "styhead"
--- a/conf/machine/bananapi-m2-berry.conf
+++ b/conf/machine/bananapi-m2-berry.conf
@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: bananapi-m2-berry
-#@DESCRIPTION: Machine configuration for the Banana Pi M2 Berry, based on Allwinner V40 CPU
-
-require conf/machine/include/sun8i.inc
-require conf/machine/include/hardware/ap6212a.inc
-
-KERNEL_DEVICETREE = "allwinner/sun8i-v40-bananapi-m2-berry.dtb"
-UBOOT_MACHINE = "bananapi_m2_berry_defconfig"
--- a/conf/machine/bananapi-m2-zero.conf
+++ b/conf/machine/bananapi-m2-zero.conf
@@ -5,5 +5,6 @@
 require conf/machine/include/sun8i.inc
 require conf/machine/include/hardware/ap6212a.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-bananapi-m2-zero.dtb"
+KERNEL_DEVICETREE = "sun8i-h2-plus-bananapi-m2-zero.dtb"
 UBOOT_MACHINE = "bananapi_m2_zero_defconfig"
+
--- a/conf/machine/bananapi-m2m.conf
+++ b/conf/machine/bananapi-m2m.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-r16-bananapi-m2m.dtb"
+KERNEL_DEVICETREE = "sun8i-r16-bananapi-m2m.dtb"
 UBOOT_MACHINE = "Bananapi_m2m_defconfig"
+
--- a/conf/machine/bananapi-m2plus.conf
+++ b/conf/machine/bananapi-m2plus.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-bananapi-m2-plus.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-bananapi-m2-plus.dtb"
 UBOOT_MACHINE = "bananapi_m2_plus_h3_defconfig"
+
--- a/conf/machine/bananapi.conf
+++ b/conf/machine/bananapi.conf
@@ -4,6 +4,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-bananapi.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-bananapi.dtb"
 UBOOT_MACHINE = "Bananapi_config"
-SUNXI_FEX_FILE = "sys_config/a20/Bananapi.fex"
+SUNXI_FEX_FILE = "sys_config/a20/Bananapi.fex"
--- a/conf/machine/cubieboard.conf
+++ b/conf/machine/cubieboard.conf
@@ -4,6 +4,6 @@

 require conf/machine/include/sun4i.inc

-KERNEL_DEVICETREE = "allwinner/sun4i-a10-cubieboard.dtb"
+KERNEL_DEVICETREE = "sun4i-a10-cubieboard.dtb"
 UBOOT_MACHINE = "Cubieboard_config"
 SUNXI_FEX_FILE = "sys_config/a10/cubieboard.fex"
--- a/conf/machine/cubieboard2.conf
+++ b/conf/machine/cubieboard2.conf
@@ -4,6 +4,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-cubieboard2.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-cubieboard2.dtb"
 UBOOT_MACHINE = "Cubieboard2_config"
 SUNXI_FEX_FILE = "sys_config/a20/cubieboard2.fex"
--- a/conf/machine/cubieboard4.conf
+++ b/conf/machine/cubieboard4.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: CubieBoard4
-#@DESCRIPTION: Machine configuration for the cubieboard4, based on allwinner A80 CPU http://cubieboard.org/
-
-require conf/machine/include/sun9i.inc
-require conf/machine/include/hardware/ap6330.inc
-
-KERNEL_IMAGETYPE = "zImage"
-
-KERNEL_DEVICETREE = "allwinner/sun9i-a80-cubieboard4.dtb"
-UBOOT_MACHINE = "Cubieboard4_defconfig"
--- a/conf/machine/cubietruck.conf
+++ b/conf/machine/cubietruck.conf
@@ -4,6 +4,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-cubietruck.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-cubietruck.dtb"
 UBOOT_MACHINE = "Cubietruck_config"
-SUNXI_FEX_FILE = "sys_config/a20/cubietruck.fex"
+SUNXI_FEX_FILE = "sys_config/a20/cubietruck.fex"
--- a/conf/machine/include/hardware/ap6212a.inc
+++ b/conf/machine/include/hardware/ap6212a.inc
@@ -1,9 +1,5 @@
 # Include for boards with AMPAK 6212A Wifi / Bluetooth module
 # https://linux-sunxi.org/Wifi#Ampak

-MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac kernel-module-hci-uart"
-MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm43430 armbian-firmware-ap6212"
-
-MACHINE_FEATURES:append = " bluetooth wifi"
-
-KERNEL_FEATURES:append = " features/ap6212/ap6212.scc"
+MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac"
+MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm43430"
--- a/conf/machine/include/hardware/ap6330.inc
+++ b/conf/machine/include/hardware/ap6330.inc
@@ -1,7 +0,0 @@
-# Include for boards with AMPAK AP6330 Wifi / Bluetooth module
-# https://linux-sunxi.org/Wifi#Ampak
-
-MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac"
-MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm4330"
-
-MACHINE_FEATURES:append = " bluetooth wifi"
--- a/conf/machine/include/sun9i.inc
+++ b/conf/machine/include/sun9i.inc
@@ -1,5 +0,0 @@
-require conf/machine/include/sunxi.inc
-require conf/machine/include/sunxi-mali.inc
-require conf/machine/include/arm/armv7a/tune-cortexa15.inc
-
-SOC_FAMILY = "sun9i"
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
           xf86-input-evdev \
           xf86-input-mouse \
-           xf86-input-libinput"
+           xf86-input-keyboard"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
 PREFERRED_VERSION_linux-mainline ?= "6.6.%"
@@ -40,7 +40,7 @@ SUNXI_FEX_FILE ?= " "
 SUNXI_BOOT_SPACE ?= "40"
 IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr"
 # ship fex file for sunxi kernel, devicetree file for mainline kernel
-IMAGE_BOOT_FILES += "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-sunxi', '${SUNXI_FEX_FILE}', d.getVar('KERNEL_DEVICETREE', '').split('/')[-1], d)}"
+IMAGE_BOOT_FILES += "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-sunxi', '${SUNXI_FEX_FILE}', '${KERNEL_DEVICETREE}', d)}"
 WKS_FILES ?= "sunxi-sdcard-image.wks.in"
 WKS_FILE_DEPENDS ?= "virtual/kernel u-boot"
 # in case of sunxi kernel, sunxi-board-fex must be built prior wic image assembly
--- a/conf/machine/include/sunxi64.inc
+++ b/conf/machine/include/sunxi64.inc
@@ -17,7 +17,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"

 UBOOT_ENTRYPOINT ?= "0x40008000"
-UBOOT_LOADADDRESS ?= "0x40008000"
+UBOOT_LOADADDRESS ?= "0x400080OB00"

 #UBOOT_BINARY ?= "u-boot.itb"
 SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
@@ -25,8 +25,28 @@ SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
 SERIAL_CONSOLES ?= "115200;ttyS0"
 MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"

+# arm64 dbts are under <vendor>/dts but is deployed under DEPLOYDIR 
+do_fix_device_tree_location() {
+
+    for kdt in ${KERNEL_DEVICETREE}
+    do
+        local dbt_dir=$(dirname ${kdt})
+        if [ "." != "${dbt_dir}" ] ; then
+            local dbt=$(basename ${kdt})
+            local dst=${DEPLOY_DIR_IMAGE}/${dbt_dir}/${dbt}
+            if [ ! -f ${dst} ] ; then
+                mkdir -p ${DEPLOY_DIR_IMAGE}/$dbt_dir
+                ln -s ${DEPLOY_DIR_IMAGE}/${dbt} ${dst}
+            fi
+        fi
+    done
+}
+
+
+addtask do_fix_device_tree_location after do_write_wks_template before do_image_wic
+
 SUNXI_BOOT_SPACE ?= "40"
-IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr ${@d.getVar('KERNEL_DEVICETREE', '').split('/')[-1]}"
+IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr ${KERNEL_DEVICETREE}"

 WKS_FILES ?= "sunxi-sdcard-image.wks.in"
 WKS_FILE_DEPENDS ?= "virtual/kernel u-boot"
--- a/conf/machine/lamobo-r1.conf
+++ b/conf/machine/lamobo-r1.conf
@@ -5,6 +5,6 @@
 require conf/machine/include/sun7i.inc

 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
-KERNEL_DEVICETREE = "allwinner/sun7i-a20-lamobo-r1.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-lamobo-r1.dtb"
 UBOOT_MACHINE = "Lamobo_R1_config"
 SUNXI_FEX_FILE = "sys_config/a20/lamobo-r1.fex"
--- a/conf/machine/licheepi-zero.conf
+++ b/conf/machine/licheepi-zero.conf
@@ -6,4 +6,4 @@ require conf/machine/include/sun8i.inc


 UBOOT_MACHINE = "LicheePi_Zero_defconfig"
-KERNEL_DEVICETREE = "allwinner/sun8i-v3s-licheepi-zero.dtb"
+KERNEL_DEVICETREE = "sun8i-v3s-licheepi-zero.dtb"
--- a/conf/machine/mangopi-mq-t-t113.conf
+++ b/conf/machine/mangopi-mq-t-t113.conf
@@ -4,7 +4,7 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-t113s-mangopi-mq-r-t113.dtb"
+KERNEL_DEVICETREE = "sun8i-t113s-mangopi-mq-r-t113.dtb"
 KERNEL_IMAGETYPE = "zImage"

 UBOOT_MACHINE = "mangopi_mq_r_defconfig"
--- a/conf/machine/marsboard-a10.conf
+++ b/conf/machine/marsboard-a10.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun4i.inc

-KERNEL_DEVICETREE = "allwinner/sun4i-a10-marsboard.dtb"
+KERNEL_DEVICETREE = "sun4i-a10-marsboard.dtb"
 UBOOT_MACHINE = "Marsboard_A10_config"
 SUNXI_FEX_FILE = "sys_config/a10/marsboard_a10.fex"
--- a/conf/machine/mele.conf
+++ b/conf/machine/mele.conf
@@ -4,6 +4,6 @@

 require conf/machine/include/sun4i.inc

-KERNEL_DEVICETREE = "allwinner/sun4i-a10-a1000.dtb"
+KERNEL_DEVICETREE = "sun4i-a10-a1000.dtb"
 UBOOT_MACHINE = "Mele_A1000_config"
-SUNXI_FEX_FILE = "sys_config/a10/mele_a1000.fex"
+SUNXI_FEX_FILE = "sys_config/a10/mele_a1000.fex"
--- a/conf/machine/merrii-a80-optimus.conf
+++ b/conf/machine/merrii-a80-optimus.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: Merrii A80 Optimus
-#@DESCRIPTION: Machine configuration for the Merrii A80 Optimus, based on Allwinner A80 CPU https://linux-sunxi.org/Merrii_A80_Optimus_Board
-
-require conf/machine/include/sun9i.inc
-require conf/machine/include/hardware/ap6330.inc
-
-KERNEL_IMAGETYPE = "zImage"
-
-KERNEL_DEVICETREE = "allwinner/sun9i-a80-optimus.dtb"
-UBOOT_MACHINE = "Merrii_A80_Optimus_defconfig"
--- a/conf/machine/nanopi-m1-plus.conf
+++ b/conf/machine/nanopi-m1-plus.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-m1-plus.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1-plus.dtb"
 UBOOT_MACHINE = "nanopi_m1_plus_defconfig"
+
--- a/conf/machine/nanopi-m1.conf
+++ b/conf/machine/nanopi-m1.conf
@@ -4,5 +4,5 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-m1.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1.dtb"
 UBOOT_MACHINE = "nanopi_m1_defconfig"
--- a/conf/machine/nanopi-neo-air.conf
+++ b/conf/machine/nanopi-neo-air.conf
@@ -5,5 +5,5 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-neo-air.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb"
 UBOOT_MACHINE = "nanopi_neo_air_defconfig"
--- a/conf/machine/nanopi-neo.conf
+++ b/conf/machine/nanopi-neo.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-neo.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"
+
--- a/conf/machine/nanopi-r1.conf
+++ b/conf/machine/nanopi-r1.conf
@@ -4,5 +4,5 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-r1.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-r1.dtb"
 UBOOT_MACHINE = "nanopi_r1_defconfig"
--- a/conf/machine/olinuxino-a10lime.conf
+++ b/conf/machine/olinuxino-a10lime.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun4i.inc

-KERNEL_DEVICETREE = "allwinner/sun4i-a10-olinuxino-lime.dtb"
+KERNEL_DEVICETREE = "sun4i-a10-olinuxino-lime.dtb"
 UBOOT_MACHINE = "A10-OLinuXino-Lime_config"
-SUNXI_FEX_FILE = "sys_config/a10/a10-olinuxino-lime.fex"
+SUNXI_FEX_FILE = "sys_config/a10/a10-olinuxino-lime.fex"
--- a/conf/machine/olinuxino-a10s.conf
+++ b/conf/machine/olinuxino-a10s.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun5i.inc

-KERNEL_DEVICETREE = "allwinner/sun5i-a10s-olinuxino-micro.dtb"
+KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb"
 UBOOT_MACHINE = "A10s-OLinuXino-M_config"
-SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex"
+SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex"
--- a/conf/machine/olinuxino-a13.conf
+++ b/conf/machine/olinuxino-a13.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun5i.inc

-KERNEL_DEVICETREE = "allwinner/sun5i-a13-olinuxino.dtb"
+KERNEL_DEVICETREE = "sun5i-a13-olinuxino.dtb"
 UBOOT_MACHINE = "A13-OLinuXino_config"
-SUNXI_FEX_FILE = "sys_config/a13/a13-olinuxino.fex"
+SUNXI_FEX_FILE = "sys_config/a13/a13-olinuxino.fex"
--- a/conf/machine/olinuxino-a20.conf
+++ b/conf/machine/olinuxino-a20.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-micro.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-olinuxino-micro.dtb"
 UBOOT_MACHINE = "A20-OLinuXino_MICRO_config"
-SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex"
+SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex"
--- a/conf/machine/olinuxino-a20lime.conf
+++ b/conf/machine/olinuxino-a20lime.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-lime.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb"
 UBOOT_MACHINE = "A20-OLinuXino-Lime_config"
-SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime.fex"
+SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime.fex"
--- a/conf/machine/olinuxino-a20lime2-emmc.conf
+++ b/conf/machine/olinuxino-a20lime2-emmc.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-lime2-emmc.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime2-emmc.dtb"
 UBOOT_MACHINE = "A20-OLinuXino-Lime2-eMMC_config"
 SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex"
--- a/conf/machine/olinuxino-a20lime2.conf
+++ b/conf/machine/olinuxino-a20lime2.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-lime2.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime2.dtb"
 UBOOT_MACHINE = "A20-OLinuXino-Lime2_config"
 SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex"
--- a/conf/machine/olinuxino-a20som.conf
+++ b/conf/machine/olinuxino-a20som.conf
@@ -5,6 +5,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-olimex-som-evb.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-olimex-som-evb.dtb"
 UBOOT_MACHINE = "A20-Olimex-SOM-EVB_config"
 SUNXI_FEX_FILE = "sys_config/a20/olimex_a20_som.fex"
--- a/conf/machine/orange-pi-lite.conf
+++ b/conf/machine/orange-pi-lite.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-lite.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-orangepi-lite.dtb"
 UBOOT_MACHINE = "orangepi_lite_defconfig"
+
--- a/conf/machine/orange-pi-one.conf
+++ b/conf/machine/orange-pi-one.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-one.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"
+
--- a/conf/machine/orange-pi-pc-plus.conf
+++ b/conf/machine/orange-pi-pc-plus.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-pc-plus.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc-plus.dtb"
 UBOOT_MACHINE = "orangepi_pc_plus_defconfig"
+
--- a/conf/machine/orange-pi-pc.conf
+++ b/conf/machine/orange-pi-pc.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-pc.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
 UBOOT_MACHINE = "orangepi_pc_defconfig"
+
--- a/conf/machine/orange-pi-prime.conf
+++ b/conf/machine/orange-pi-prime.conf
@@ -8,4 +8,5 @@ require conf/machine/include/hardware/ap6212a.inc
 KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-prime.dtb"
 UBOOT_MACHINE = "orangepi_prime_defconfig"

+MACHINE_FEATURES:append = " bluetooth wifi"
 MACHINE_EXTRA_RRECOMMENDS:append = " linux-firmware-rtl8723"
--- a/conf/machine/orange-pi-r1.conf
+++ b/conf/machine/orange-pi-r1.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-orangepi-r1.dtb"
+KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-r1.dtb"
 UBOOT_MACHINE = "orangepi_r1_defconfig"
+
--- a/conf/machine/orange-pi-zero-plus2-h3.conf
+++ b/conf/machine/orange-pi-zero-plus2-h3.conf
@@ -5,5 +5,5 @@
 require conf/machine/include/sun8i.inc
 require conf/machine/include/hardware/ap6212a.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-zero-plus2.dtb"
+KERNEL_DEVICETREE = "sun8i-h3-orangepi-zero-plus2.dtb"
 UBOOT_MACHINE = "orangepi_zero_plus2_h3_defconfig"
--- a/conf/machine/orange-pi-zero.conf
+++ b/conf/machine/orange-pi-zero.conf
@@ -4,5 +4,6 @@

 require conf/machine/include/sun8i.inc

-KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-orangepi-zero.dtb"
+KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
 UBOOT_MACHINE = "orangepi_zero_defconfig"
+
--- a/conf/machine/pcduino.conf
+++ b/conf/machine/pcduino.conf
@@ -4,6 +4,6 @@

 require conf/machine/include/sun4i.inc

-KERNEL_DEVICETREE = "allwinner/sun4i-a10-pcduino.dtb"
+KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
 SUNXI_FEX_FILE = "sys_config/a10/pcduino.fex"
--- a/conf/machine/pcduino3.conf
+++ b/conf/machine/pcduino3.conf
@@ -4,6 +4,6 @@

 require conf/machine/include/sun7i.inc

-KERNEL_DEVICETREE = "allwinner/sun7i-a20-pcduino3.dtb"
+KERNEL_DEVICETREE = "sun7i-a20-pcduino3.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino3_defconfig"
-SUNXI_FEX_FILE = "sys_config/a20/linksprite_pcduino3.fex"
+SUNXI_FEX_FILE = "sys_config/a20/linksprite_pcduino3.fex"
--- a/recipes-bsp/u-boot/files/0001-sunxi-board-Fix-early-PMIC-setup-conditions.patch
+++ b/recipes-bsp/u-boot/files/0001-sunxi-board-Fix-early-PMIC-setup-conditions.patch
@@ -1,41 +0,0 @@
-From f4dde09fa41eb538b743ee2104c1e2e10cc7e13f Mon Sep 17 00:00:00 2001
-From: Leon Anavi <leon.anavi@konsulko.com>
-Date: Sat, 14 Dec 2024 10:59:09 +0000
-Subject: [PATCH] sunxi: board: Fix early PMIC setup conditions
-
-Patch provided by Andre Przywara through the U-Boot mailing list:
-https://lists.denx.de/pipermail/u-boot/2024-December/575050.html
-
-Upstream-Status: Pending
-
-Suggested-by: Andre Przywara <andre.przywara@arm.com>
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
- board/sunxi/board.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/board/sunxi/board.c b/board/sunxi/board.c
-index 961cdcde74..d6759fe853 100644
--- a/board/sunxi/board.c
-+++ b/board/sunxi/board.c
-@@ -577,7 +577,6 @@ void sunxi_board_init(void)
- 
- #ifdef CONFIG_AXP_DCDC1_VOLT
- 	power_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT);
-	power_failed |= axp_set_dcdc5(CONFIG_AXP_DCDC5_VOLT);
- #endif
- #ifdef CONFIG_AXP_DCDC2_VOLT
- 	power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT);
-@@ -586,6 +585,9 @@ void sunxi_board_init(void)
- #ifdef CONFIG_AXP_DCDC4_VOLT
- 	power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT);
- #endif
-+#ifdef CONFIG_AXP_DCDC5_VOLT
-+	power_failed |= axp_set_dcdc5(CONFIG_AXP_DCDC5_VOLT);
-+#endif
- 
- #ifdef CONFIG_AXP_ALDO1_VOLT
- 	power_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT);
-- 
-2.47.1
-
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend:sunxi := "${THISDIR}/files:"
 DEPENDS:append:sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native "
 DEPENDS:append:sun50i = " trusted-firmware-a"

-COMPATIBLE_MACHINE:sunxi = "(sun4i|sun5i|sun7i|sun8i|sun9i|sun50i)"
+COMPATIBLE_MACHINE:sunxi = "(sun4i|sun5i|sun7i|sun8i|sun50i)"

 DEFAULT_PREFERENCE:sun4i = "1"
 DEFAULT_PREFERENCE:sun5i = "1"
@@ -15,16 +15,10 @@ SRC_URI:append:sunxi = " \
    file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
    file://0002-Added-nanopi-r1-board-support.patch \
    file://0003-sunxi-H6-Enable-Ethernet-on-Orange-Pi-One-Plus.patch \
+    file://0004-mangopi-mq-r-t113-Fix-serial-console.patch \
    file://0004-OrangePi-3-LTS-support.patch \
    file://boot.cmd \
 "
-SRC_URI:append:sun9i = " \
-    file://0001-sunxi-board-Fix-early-PMIC-setup-conditions.patch \
-"
-
-SRC_URI:append:mangopi-mq-t-t113 = " \
-    file://0004-mangopi-mq-r-t113-Fix-serial-console.patch \
-    "

 UBOOT_ENV_SUFFIX:sunxi = "scr"
 UBOOT_ENV:sunxi = "boot"
@@ -35,5 +29,5 @@ EXTRA_OEMAKE:append:sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin SCP=/dev/null"
 do_compile:sun50i[depends] += "trusted-firmware-a:do_deploy"

 do_compile:append:sunxi() {
-    ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
+    ${B}/tools/mkimage -C none -A arm -T script -d ${UNPACKDIR}/boot.cmd ${UNPACKDIR}/${UBOOT_ENV_BINARY}
 }
--- a/recipes-devtools/python/files/olinuxino-a20lime2-emmc
+++ b/recipes-devtools/python/files/olinuxino-a20lime2-emmc
@@ -1 +1 @@
-olinuxino-a20lime2
+/home/marek/data/projects/kas/sources/meta-sunxi/recipes-devtools/python/files/olinuxino-a20lime2
--- a/recipes-devtools/python/pya20_0.2.12.bb
+++ b/recipes-devtools/python/pya20_0.2.12.bb
@@ -13,10 +13,10 @@ SRC_URI = "https://pypi.python.org/packages/source/p/pyA20/pyA20-${PV}.tar.gz \
          "
 S = "${WORKDIR}/pyA20-${PV}"

-inherit setuptools3
+inherit distutils3

 do_compile:prepend() { 
-cp ${WORKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
+    cp ${UNPACKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
 }

 SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f"
--- a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
+++ b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
@@ -20,7 +20,7 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg "

 do_install:append() {
    install -d ${D}${datadir}/X11/xorg.conf.d
-    install -m 0644 ${WORKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
+    install -m 0644 ${UNPACKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
 }

 FILES:${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf"
--- a/recipes-kernel/armbian-firmware/armbian-firmware_git.bb
+++ b/recipes-kernel/armbian-firmware/armbian-firmware_git.bb
@@ -1,37 +0,0 @@
-SUMMARY = "Armbian Firmware"
-DESCRIPTION = "Collection of firmware files necessary for Armbian supported hardware devices to work correctly with the Linux kernel"
-LICENSE = "CLOSED"
-
-PV = "1.0+git"
-SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master"
-SRCREV = "4050e02da2dce2b74c97101f7964ecfb962f5aec"
-
-S = "${WORKDIR}/git"
-
-inherit allarch
-
-do_compile[noexec] = "1"
-
-do_install() {
-    # ap6212 (bluetooth firmware only, wifi firmware is provided by linux-firmware-bcm43430)
-    install -d "${D}${nonarch_base_libdir}/firmware/ap6212"
-    install -m 0644 "${S}/ap6212/bcm43438a1.hcd" "${D}${nonarch_base_libdir}/firmware/ap6212/"
-    install -d "${D}${nonarch_base_libdir}/firmware/brcm"
-    ln -sf ../ap6212/bcm43438a1.hcd "${D}${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd"
-}
-
-PACKAGES =+ " \
-    ${PN}-ap6212 \
-"
-
-FILES:${PN}-ap6212 = " \
-    ${nonarch_base_libdir}/firmware/ap6212/* \
-    ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \
-"
-
-
-# Make armbian-firmware depend on all of the split-out packages.
-python populate_packages:prepend () {
-    firmware_pkgs = oe.utils.packages_filter_out_system(d)
-    d.appendVar('RRECOMMENDS:armbian-firmware', ' ' + ' '.join(firmware_pkgs))
-}
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -10,17 +10,4 @@ do_install:append:sunxi() {
 	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.xunlong,orangepi-zero-plus2.txt
 	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.xunlong,orangepi-zero-plus2-h3.txt
 	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-berry.txt
-}
-
-do_install:append:cubieboard4() {
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.cubietech,a80-cubieboard4.bin
-}
-
-do_install:append:merrii-a80-optimus() {
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.merrii,a80-optimus.bin
-}
-
-do_install:append:sun9i() {
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.Prowise-PT301.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.txt
 }
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0001-drv-wireless-add-uwe5622-wifi-driver.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0001-drv-wireless-add-uwe5622-wifi-driver.patch
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0002-drv-wireless-driver-for-uwe5622-allwinner-bugfix.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0002-drv-wireless-driver-for-uwe5622-allwinner-bugfix.patch
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0003-drv-fix-incldue-path-for-unisocwcn.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0003-drv-fix-incldue-path-for-unisocwcn.patch
@@ -0,0 +1,45 @@
+From 5138d597275fd503573fac84018186bd18740644 Mon Sep 17 00:00:00 2001
+From: pbiel <pbiel7@gmail.com>
+Date: Thu, 30 Mar 2023 22:45:33 +0200
+Subject: [PATCH] Fix incldue path for unisocwcn
+
+---
+ drivers/net/wireless/uwe5622/Makefile           | 4 +++-
+ drivers/net/wireless/uwe5622/unisocwcn/Makefile | 6 +++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/wireless/uwe5622/Makefile b/drivers/net/wireless/uwe5622/Makefile
+index 313ea5123..e9a398584 100644
+--- a/drivers/net/wireless/uwe5622/Makefile
+++ b/drivers/net/wireless/uwe5622/Makefile
+@@ -2,7 +2,9 @@ obj-$(CONFIG_AW_WIFI_DEVICE_UWE5622) += unisocwcn/
+ obj-$(CONFIG_WLAN_UWE5622)    += unisocwifi/
+ obj-$(CONFIG_TTY_OVERY_SDIO)  += tty-sdio/
+ 
+-UNISOCWCN_DIR := $(shell cd $(src)/unisocwcn/ && /bin/pwd)
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
+UNISOCWCN_DIR := $(dir $(mkfile_path))/unisocwcn/
+
+ UNISOC_BSP_INCLUDE := $(UNISOCWCN_DIR)/include
+ export UNISOC_BSP_INCLUDE
+ 
+diff --git a/drivers/net/wireless/uwe5622/unisocwcn/Makefile b/drivers/net/wireless/uwe5622/unisocwcn/Makefile
+index f9c595747..1ad490594 100644
+--- a/drivers/net/wireless/uwe5622/unisocwcn/Makefile
+++ b/drivers/net/wireless/uwe5622/unisocwcn/Makefile
+@@ -129,9 +129,9 @@ ccflags-y += -DCONFIG_WCN_BOOT
+ ccflags-y += -DCONFIG_WCN_UTILS
+ 
+ #### include path ######
+-ccflags-y += -I$(src)/include/
+-ccflags-y += -I$(src)/platform/
+-ccflags-y += -I$(src)/platform/rf/
+ccflags-y += -I$(srctree)/$(src)/include/
+ccflags-y += -I$(srctree)/$(src)/platform/
+ccflags-y += -I$(srctree)/$(src)/platform/rf/
+ 
+ #### add cflag for Customer ######
+ ### ---------- Hisilicon start ---------- ###
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0004-drv-wireless-adapt-uwe5622-wifi-driver-to-kernel-6.1.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0004-drv-wireless-adapt-uwe5622-wifi-driver-to-kernel-6.1.patch
@@ -0,0 +1,177 @@
+From 5f4d2d5fc32dfe41c73cac36ec6747c34e5562a3 Mon Sep 17 00:00:00 2001
+From: pbiel <pbiel7@gmail.com>
+Date: Wed, 15 Mar 2023 23:04:27 +0100
+Subject: [PATCH] wireless: Adapt uwe5622 wifi driver to kernel 6.1
+
+---
+ drivers/net/wireless/uwe5622/tty-sdio/lpm.c            |  2 +-
+ .../uwe5622/unisocwcn/boot/wcn_integrate_dev.c         |  2 +-
+ .../uwe5622/unisocwcn/platform/wcn_parn_parser.c       |  2 +-
+ .../wireless/uwe5622/unisocwcn/platform/wcn_procfs.c   |  2 +-
+ .../wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c  |  2 +-
+ .../net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c  |  6 +++---
+ drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c     | 10 +++++-----
+ drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c       |  2 +-
+ 8 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/net/wireless/uwe5622/tty-sdio/lpm.c b/drivers/net/wireless/uwe5622/tty-sdio/lpm.c
+index b2d9a8994e5e..35e30651a921 100644
+--- a/drivers/net/wireless/uwe5622/tty-sdio/lpm.c
+++ b/drivers/net/wireless/uwe5622/tty-sdio/lpm.c
+@@ -70,7 +70,7 @@ static int btwrite_proc_show(struct seq_file *m, void *v)
+ 
+ static int bluesleep_open_proc_btwrite(struct inode *inode, struct file *file)
+ {
+-	return single_open(file, btwrite_proc_show, PDE_DATA(inode));
+	return single_open(file, btwrite_proc_show, pde_data(inode));
+ }
+ 
+ static const struct proc_ops lpm_proc_btwrite_fops = {
+diff --git a/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c b/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c
+index 3ee6910e7cf7..29a3ec298bc1 100644
+--- a/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c
+++ b/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c
+@@ -562,7 +562,7 @@ static struct wcn_proc_data g_proc_data = {
+ static int wcn_platform_open(struct inode *inode, struct file *filp)
+ {
+ 	struct platform_proc_file_entry
+-	*entry = (struct platform_proc_file_entry *)PDE_DATA(inode);
+	*entry = (struct platform_proc_file_entry *)pde_data(inode);
+ 
+ 	WCN_INFO("entry name:%s\n!", entry->name);
+ 
+diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_parn_parser.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_parn_parser.c
+index aea7d6d0fe57..bd841f0b32d3 100644
+--- a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_parn_parser.c
+++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_parn_parser.c
+@@ -146,7 +146,7 @@ static int prefixcmp(const char *str, const char *prefix)
+ }
+ 
+ #if KERNEL_VERSION(3, 19, 0) <= LINUX_VERSION_CODE
+-static int find_callback(struct dir_context *ctx, const char *name, int namlen,
+static bool find_callback(struct dir_context *ctx, const char *name, int namlen,
+ 		     loff_t offset, u64 ino, unsigned int d_type)
+ #else
+ static int find_callback(void *ctx, const char *name, int namlen,
+diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c
+index 2edb7903d80e..9e453365bba8 100644
+--- a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c
+++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c
+@@ -431,7 +431,7 @@ static const struct proc_ops mdbg_snap_shoot_seq_fops = {
+ static int mdbg_proc_open(struct inode *inode, struct file *filp)
+ {
+ 	struct mdbg_proc_entry *entry =
+-		(struct mdbg_proc_entry *)PDE_DATA(inode);
+		(struct mdbg_proc_entry *)pde_data(inode);
+ 	filp->private_data = entry;
+ 
+ 	return 0;
+diff --git a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c
+index 8f228d403909..750bfc0466cb 100644
+--- a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c
+++ b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c
+@@ -82,7 +82,7 @@ static int wcn_usb_dopen(struct inode *inode, struct file *file)
+ {
+ 	struct wcn_usb_ddata *data;
+ 
+-	data = (struct wcn_usb_ddata *)PDE_DATA(inode);
+	data = (struct wcn_usb_ddata *)pde_data(inode);
+ 
+ 	if (!data)
+ 		return -EIO;
+diff --git a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c
+index c2cccc658c0d..e7a9f258943e 100644
+--- a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c
+++ b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c
+@@ -61,7 +61,7 @@ static int wcn_usb_channel_open(struct inode *inode, struct file *file)
+ {
+ 	struct channel *channel;
+ 
+-	channel = (struct channel *)PDE_DATA(inode);
+	channel = (struct channel *)pde_data(inode);
+ 
+ 	if (!channel)
+ 		return -EIO;
+@@ -467,7 +467,7 @@ static int wcn_usb_chnmg_open(struct inode *inode, struct file *file)
+ {
+ 	struct chnmg *chnmg;
+ 	/* get channel_list head */
+-	chnmg = (struct chnmg *)PDE_DATA(inode);
+	chnmg = (struct chnmg *)pde_data(inode);
+ 
+ 	file->private_data = chnmg;
+ 	return 0;
+@@ -916,7 +916,7 @@ static int print_level_open(struct inode *inode, struct file *file)
+ {
+ 	struct chnmg *chnmg;
+ 	/* get channel_list head */
+-	chnmg = (struct chnmg *)PDE_DATA(inode);
+	chnmg = (struct chnmg *)pde_data(inode);
+ 
+ 	file->private_data = chnmg;
+ 	return 0;
+diff --git a/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c b/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c
+index daef880ae3c0..2231388da70a 100644
+--- a/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c
+++ b/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c
+@@ -703,7 +703,7 @@ static int sprdwl_add_cipher_key(struct sprdwl_vif *vif, bool pairwise,
+ }
+ 
+ static int sprdwl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
+-				   u8 key_index, bool pairwise,
+				   int link_id, u8 key_index, bool pairwise,
+ 				   const u8 *mac_addr,
+ 				   struct key_params *params)
+ {
+@@ -725,7 +725,7 @@ static int sprdwl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
+ }
+ 
+ static int sprdwl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
+-				   u8 key_index, bool pairwise,
+				   int link_id, u8 key_index, bool pairwise,
+ 				   const u8 *mac_addr)
+ {
+ 	struct sprdwl_vif *vif = netdev_priv(ndev);
+@@ -755,7 +755,7 @@ static int sprdwl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
+ 
+ static int sprdwl_cfg80211_set_default_key(struct wiphy *wiphy,
+ 					   struct net_device *ndev,
+-					   u8 key_index, bool unicast,
+					   int link_id, u8 key_index, bool unicast,
+ 					   bool multicast)
+ {
+ 	struct sprdwl_vif *vif = netdev_priv(ndev);
+@@ -984,7 +984,7 @@ static int sprdwl_cfg80211_change_beacon(struct wiphy *wiphy,
+ 	return sprdwl_change_beacon(vif, beacon);
+ }
+ 
+-static int sprdwl_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
+static int sprdwl_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
+ {
+ #ifdef DFS_MASTER
+ 	struct sprdwl_vif *vif = netdev_priv(ndev);
+@@ -2367,7 +2367,7 @@ void sprdwl_report_connection(struct sprdwl_vif *vif,
+ 		 conn_info->status == SPRDWL_ROAM_SUCCESS){
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
+ 		struct cfg80211_roam_info roam_info = {
+-			.bss = bss,
+			.links[0].bss = bss,
+ 			.req_ie = conn_info->req_ie,
+ 			.req_ie_len = conn_info->req_ie_len,
+ 			.resp_ie = conn_info->resp_ie,
+diff --git a/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c b/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c
+index e81619b12e39..1ecbfac5b490 100644
+--- a/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c
+++ b/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c
+@@ -3296,7 +3296,7 @@ void sprdwl_event_chan_changed(struct sprdwl_vif *vif, u8 *data, u16 len)
+ 						NL80211_CHAN_HT20);
+ 		else
+ 			wl_err("%s, ch is null!\n", __func__);
+-		cfg80211_ch_switch_notify(vif->ndev, &chandef);
+		cfg80211_ch_switch_notify(vif->ndev, &chandef, 0);
+ 	}
+ }
+ 
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0005-drv-fix-setting-mac-address-for-netdev-in-uwe5622.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0005-drv-fix-setting-mac-address-for-netdev-in-uwe5622.patch
@@ -0,0 +1,35 @@
+From 9211a92d07e9a43fce104f87f9d45e890257b699 Mon Sep 17 00:00:00 2001
+From: pbiel <pbiel7@gmail.com>
+Date: Tue, 7 Mar 2023 20:28:44 +0100
+Subject: [PATCH] wireless: fix setting mac address for netdev in uwe5622
+ unisocwifi driver
+
+---
+ drivers/net/wireless/uwe5622/unisocwifi/main.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/uwe5622/unisocwifi/main.c b/drivers/net/wireless/uwe5622/unisocwifi/main.c
+index 21efdf4e0..566a9a7f3 100644
+--- a/drivers/net/wireless/uwe5622/unisocwifi/main.c
+++ b/drivers/net/wireless/uwe5622/unisocwifi/main.c
+@@ -1356,6 +1356,7 @@ static struct sprdwl_vif *sprdwl_register_netdev(struct sprdwl_priv *priv,
+ 	struct wireless_dev *wdev;
+ 	struct sprdwl_vif *vif;
+ 	int ret;
+	u8 target_mac_addr[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
+ 	ndev = alloc_netdev(sizeof(*vif), name, NET_NAME_UNKNOWN, ether_setup);
+@@ -1411,7 +1412,8 @@ static struct sprdwl_vif *sprdwl_register_netdev(struct sprdwl_priv *priv,
+ 	ndev->features |= NETIF_F_SG;
+ 	SET_NETDEV_DEV(ndev, wiphy_dev(priv->wiphy));
+ 
+-	sprdwl_set_mac_addr(vif, addr, ndev->dev_addr);
+	sprdwl_set_mac_addr(vif, addr, target_mac_addr);
+	dev_addr_set(ndev, target_mac_addr);
+ 
+ #ifdef CONFIG_P2P_INTF
+ 	if (type == NL80211_IFTYPE_P2P_DEVICE)
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0006-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0006-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0007-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0007-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch
@@ -0,0 +1,60 @@
+From 452a691a83df1aab77cec33203cb04a817817a05 Mon Sep 17 00:00:00 2001
+From: The-going <48602507+The-going@users.noreply.github.com>
+Date: Thu, 5 May 2022 22:55:13 +0300
+Subject: [PATCH] drv: nvmem: sunxi_sid: Add sunxi_get_soc_chipid,
+ sunxi_get_serial
+
+---
+ drivers/nvmem/sunxi_sid.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
+index 37a6abb0e..c81fac63d 100644
+--- a/drivers/nvmem/sunxi_sid.c
+++ b/drivers/nvmem/sunxi_sid.c
+@@ -37,6 +37,25 @@ struct sunxi_sid {
+ 	u32			value_offset;
+ };
+ 
+static unsigned int sunxi_soc_chipid[4];
+static unsigned int sunxi_serial[4];
+
+int sunxi_get_soc_chipid(unsigned char *chipid)
+{
+	memcpy(chipid, sunxi_soc_chipid, 16);
+
+	return 0;
+}
+EXPORT_SYMBOL(sunxi_get_soc_chipid);
+
+int sunxi_get_serial(unsigned       char *serial)
+{
+	memcpy(serial, sunxi_serial, 16);
+
+	return 0;
+}
+EXPORT_SYMBOL(sunxi_get_serial);
+
+ static int sunxi_sid_read(void *context, unsigned int offset,
+ 			  void *val, size_t bytes)
+ {
+@@ -167,6 +186,15 @@ static int sunxi_sid_probe(struct platform_device *pdev)
+ 
+ 	platform_set_drvdata(pdev, nvmem);
+ 
+	nvmem_cfg->reg_read(sid, 0, &sunxi_soc_chipid[0], sizeof(int));
+	nvmem_cfg->reg_read(sid, 4, &sunxi_soc_chipid[1], sizeof(int));
+	nvmem_cfg->reg_read(sid, 8, &sunxi_soc_chipid[2], sizeof(int));
+	nvmem_cfg->reg_read(sid, 12, &sunxi_soc_chipid[3], sizeof(int));
+
+	sunxi_serial[0] = sunxi_soc_chipid[3];
+	sunxi_serial[1] = sunxi_soc_chipid[2];
+	sunxi_serial[2] = (sunxi_soc_chipid[1] >> 16) & 0x0ffff;
+
+ 	return 0;
+ }
+ 
+-- 
+2.35.3
+
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0008-drv-add-sunxi-addr-driver.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0008-drv-add-sunxi-addr-driver.patch
@@ -0,0 +1,612 @@
+From 418436514e2e64e07e7fd2ef9d77ec4712d1033b Mon Sep 17 00:00:00 2001
+From: pbiel <pbiel7@gmail.com>
+Date: Fri, 24 Feb 2023 10:38:03 +0100
+Subject: [PATCH 2/2] Add sunxi addr driver
+
+---
+ drivers/misc/Kconfig                 |   1 +
+ drivers/misc/Makefile                |   1 +
+ drivers/misc/sunxi-addr/Kconfig      |   6 +
+ drivers/misc/sunxi-addr/Makefile     |   5 +
+ drivers/misc/sunxi-addr/sha256.c     | 178 +++++++++++++
+ drivers/misc/sunxi-addr/sunxi-addr.c | 358 +++++++++++++++++++++++++++
+ 6 files changed, 549 insertions(+)
+ create mode 100644 drivers/misc/sunxi-addr/Kconfig
+ create mode 100644 drivers/misc/sunxi-addr/Makefile
+ create mode 100644 drivers/misc/sunxi-addr/sha256.c
+ create mode 100644 drivers/misc/sunxi-addr/sunxi-addr.c
+
+diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
+index 358ad56f6..c59480dc8 100644
+--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
+@@ -514,4 +514,5 @@ source "drivers/misc/habanalabs/Kconfig"
+ source "drivers/misc/uacce/Kconfig"
+ source "drivers/misc/pvpanic/Kconfig"
+ source "drivers/misc/mchp_pci1xxxx/Kconfig"
+source "drivers/misc/sunxi-addr/Kconfig"
+ endmenu
+diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
+index ac9b3e757..487a2bf2d 100644
+--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
+@@ -62,3 +62,4 @@ obj-$(CONFIG_HI6421V600_IRQ)	+= hi6421v600-irq.o
+ obj-$(CONFIG_OPEN_DICE)		+= open-dice.o
+ obj-$(CONFIG_GP_PCI1XXXX)	+= mchp_pci1xxxx/
+ obj-$(CONFIG_VCPU_STALL_DETECTOR)	+= vcpu_stall_detector.o
+obj-$(CONFIG_SUNXI_ADDR_MGT)    += sunxi-addr/
+\ No newline at end of file
+diff --git a/drivers/misc/sunxi-addr/Kconfig b/drivers/misc/sunxi-addr/Kconfig
+new file mode 100644
+index 000000000..801dd2c02
+--- /dev/null
+++ b/drivers/misc/sunxi-addr/Kconfig
+@@ -0,0 +1,6 @@
+config SUNXI_ADDR_MGT
+  tristate "Allwinner Network MAC Addess Manager"
+  depends on BT || ETHERNET || WLAN
+  depends on NVMEM_SUNXI_SID
+  help
+    allwinner network mac address management
+diff --git a/drivers/misc/sunxi-addr/Makefile b/drivers/misc/sunxi-addr/Makefile
+new file mode 100644
+index 000000000..f01fd4783
+--- /dev/null
+++ b/drivers/misc/sunxi-addr/Makefile
+@@ -0,0 +1,5 @@
+#
+# Makefile for wifi mac addr manager drivers
+#
+sunxi_addr-objs := sunxi-addr.o sha256.o
+obj-$(CONFIG_SUNXI_ADDR_MGT)   += sunxi_addr.o
+diff --git a/drivers/misc/sunxi-addr/sha256.c b/drivers/misc/sunxi-addr/sha256.c
+new file mode 100644
+index 000000000..78825810c
+--- /dev/null
+++ b/drivers/misc/sunxi-addr/sha256.c
+@@ -0,0 +1,178 @@
+/*
+ * Local implement of sha256.
+ *
+ * Copyright (C) 2013 Allwinner.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/string.h>
+
+/****************************** MACROS ******************************/
+#define ROTRIGHT(a, b) (((a) >> (b)) | ((a) << (32 - (b))))
+#define CH(x, y, z)    (((x) & (y)) ^ (~(x) & (z)))
+#define MAJ(x, y, z)   (((x) & (y)) ^  ((x) & (z)) ^ ((y) & (z)))
+#define EP0(x)         (ROTRIGHT(x,  2) ^ ROTRIGHT(x, 13) ^ ROTRIGHT(x, 22))
+#define EP1(x)         (ROTRIGHT(x,  6) ^ ROTRIGHT(x, 11) ^ ROTRIGHT(x, 25))
+#define SIG0(x)        (ROTRIGHT(x,  7) ^ ROTRIGHT(x, 18) ^ ((x) >> 3))
+#define SIG1(x)        (ROTRIGHT(x, 17) ^ ROTRIGHT(x, 19) ^ ((x) >> 10))
+
+/**************************** VARIABLES *****************************/
+static const uint32_t k[64] = {
+	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
+	0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+	0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+	0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+	0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+	0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+	0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+	0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+	0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+	0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
+	0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
+	0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+	0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+};
+
+struct sha256_ctx {
+	uint8_t data[64];   /* current 512-bit chunk of message data, just like a buffer */
+	uint32_t datalen;   /* sign the data length of current chunk */
+	uint64_t bitlen;    /* the bit length of the total message */
+	uint32_t state[8];  /* store the middle state of hash abstract */
+};
+
+/*********************** FUNCTION DEFINITIONS ***********************/
+static void sha256_transform(struct sha256_ctx *ctx, const uint8_t *data)
+{
+	uint32_t a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
+
+	/* initialization */
+	for (i = 0, j = 0; i < 16; ++i, j += 4)
+		m[i] = (data[j] << 24) | (data[j + 1] << 16) |
+			(data[j + 2] << 8) | (data[j + 3]);
+	for ( ; i < 64; ++i)
+		m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
+
+	a = ctx->state[0];
+	b = ctx->state[1];
+	c = ctx->state[2];
+	d = ctx->state[3];
+	e = ctx->state[4];
+	f = ctx->state[5];
+	g = ctx->state[6];
+	h = ctx->state[7];
+
+	for (i = 0; i < 64; ++i) {
+		t1 = h + EP1(e) + CH(e, f, g) + k[i] + m[i];
+		t2 = EP0(a) + MAJ(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + t1;
+		d = c;
+		c = b;
+		b = a;
+		a = t1 + t2;
+	}
+
+	ctx->state[0] += a;
+	ctx->state[1] += b;
+	ctx->state[2] += c;
+	ctx->state[3] += d;
+	ctx->state[4] += e;
+	ctx->state[5] += f;
+	ctx->state[6] += g;
+	ctx->state[7] += h;
+}
+
+static void sha256_init(struct sha256_ctx *ctx)
+{
+	ctx->datalen = 0;
+	ctx->bitlen = 0;
+	ctx->state[0] = 0x6a09e667;
+	ctx->state[1] = 0xbb67ae85;
+	ctx->state[2] = 0x3c6ef372;
+	ctx->state[3] = 0xa54ff53a;
+	ctx->state[4] = 0x510e527f;
+	ctx->state[5] = 0x9b05688c;
+	ctx->state[6] = 0x1f83d9ab;
+	ctx->state[7] = 0x5be0cd19;
+}
+
+static void sha256_update(struct sha256_ctx *ctx, const uint8_t *data, size_t len)
+{
+	uint32_t i;
+
+	for (i = 0; i < len; ++i) {
+		ctx->data[ctx->datalen] = data[i];
+		ctx->datalen++;
+		if (ctx->datalen == 64) {
+			/* 64 byte = 512 bit  means the buffer ctx->data has
+			 * fully stored one chunk of message,
+			 * so do the sha256 hash map for the current chunk.
+			 */
+			sha256_transform(ctx, ctx->data);
+			ctx->bitlen += 512;
+			ctx->datalen = 0;
+		}
+	}
+}
+
+static void sha256_final(struct sha256_ctx *ctx, uint8_t *hash)
+{
+	uint32_t i;
+
+	i = ctx->datalen;
+
+	/* Pad whatever data is left in the buffer. */
+	if (ctx->datalen < 56) {
+		ctx->data[i++] = 0x80;  /* pad 10000000 = 0x80 */
+		while (i < 56)
+			ctx->data[i++] = 0x00;
+	} else {
+		ctx->data[i++] = 0x80;
+		while (i < 64)
+			ctx->data[i++] = 0x00;
+		sha256_transform(ctx, ctx->data);
+		memset(ctx->data, 0, 56);
+	}
+
+	/* Append to the padding the total message's length in bits and transform. */
+	ctx->bitlen += ctx->datalen * 8;
+	ctx->data[63] = ctx->bitlen;
+	ctx->data[62] = ctx->bitlen >> 8;
+	ctx->data[61] = ctx->bitlen >> 16;
+	ctx->data[60] = ctx->bitlen >> 24;
+	ctx->data[59] = ctx->bitlen >> 32;
+	ctx->data[58] = ctx->bitlen >> 40;
+	ctx->data[57] = ctx->bitlen >> 48;
+	ctx->data[56] = ctx->bitlen >> 56;
+	sha256_transform(ctx, ctx->data);
+
+	/* copying the final state to the output hash(use big endian). */
+	for (i = 0; i < 4; ++i) {
+		hash[i]      = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 4]  = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 8]  = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 24] = (ctx->state[6] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 28] = (ctx->state[7] >> (24 - i * 8)) & 0x000000ff;
+	}
+}
+
+int hmac_sha256(const uint8_t *plaintext, ssize_t psize, uint8_t *output)
+{
+	struct sha256_ctx ctx;
+
+	sha256_init(&ctx);
+	sha256_update(&ctx, plaintext, psize);
+	sha256_final(&ctx, output);
+	return 0;
+}
+diff --git a/drivers/misc/sunxi-addr/sunxi-addr.c b/drivers/misc/sunxi-addr/sunxi-addr.c
+new file mode 100644
+index 000000000..a812e4e82
+--- /dev/null
+++ b/drivers/misc/sunxi-addr/sunxi-addr.c
+@@ -0,0 +1,358 @@
+/*
+ * The driver of SUNXI NET MAC ADDR Manager.
+ *
+ * Copyright (C) 2013 Allwinner.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#define DEBUG
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/miscdevice.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+
+#define ADDR_MGT_DBG(fmt, arg...) printk(KERN_DEBUG "[ADDR_MGT] %s: " fmt "\n",\
+				__func__, ## arg)
+#define ADDR_MGT_ERR(fmt, arg...) printk(KERN_ERR "[ADDR_MGT] %s: " fmt "\n",\
+				__func__, ## arg)
+
+#define MODULE_CUR_VERSION  "v1.0.9"
+
+#define MATCH_STR_LEN       20
+#define ADDR_VAL_LEN        6
+#define ADDR_STR_LEN        18
+#define ID_LEN              16
+#define HASH_LEN            32
+
+#define TYPE_ANY            0
+#define TYPE_BURN           1
+#define TYPE_IDGEN          2
+#define TYPE_USER           3
+#define TYPE_RAND           4
+
+#define ADDR_FMT_STR        0
+#define ADDR_FMT_VAL        1
+
+#define IS_TYPE_INVALID(x)  ((x < TYPE_ANY) || (x > TYPE_RAND))
+
+#define ADDR_CLASS_ATTR_ADD(name) \
+static ssize_t addr_##name##_show(struct class *class, \
+		struct class_attribute *attr, char *buffer) \
+{ \
+	char addr[ADDR_STR_LEN]; \
+	if (IS_TYPE_INVALID(get_addr_by_name(ADDR_FMT_STR, addr, #name))) \
+		return 0; \
+	return sprintf(buffer, "%.17s\n", addr); \
+} \
+static ssize_t addr_##name##_store(struct class *class, \
+		struct class_attribute *attr, \
+		const char *buffer, size_t count) \
+{ \
+	if (count != ADDR_STR_LEN) { \
+		ADDR_MGT_ERR("Length wrong."); \
+		return -EINVAL; \
+	} \
+	set_addr_by_name(TYPE_USER, ADDR_FMT_STR, buffer, #name); \
+	return count; \
+} \
+static CLASS_ATTR_RW(addr_##name);
+
+struct addr_mgt_info {
+	unsigned int type_def;
+	unsigned int type_cur;
+	unsigned int flag;
+	char *addr;
+	char *name;
+};
+
+static struct addr_mgt_info info[] = {
+	{TYPE_ANY, TYPE_ANY, 1, NULL, "wifi"},
+	{TYPE_ANY, TYPE_ANY, 0, NULL, "bt"  },
+	{TYPE_ANY, TYPE_ANY, 1, NULL, "eth" },
+};
+
+extern int hmac_sha256(const uint8_t *plaintext, ssize_t psize, uint8_t *output);
+extern int sunxi_get_soc_chipid(unsigned char *chipid);
+
+static int addr_parse(int fmt, const char *addr, int check)
+{
+	char val_buf[ADDR_VAL_LEN];
+	char cmp_buf[ADDR_VAL_LEN];
+	int  ret = ADDR_VAL_LEN;
+
+	if (fmt == ADDR_FMT_STR)
+		ret = sscanf(addr, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+					&val_buf[0], &val_buf[1], &val_buf[2],
+					&val_buf[3], &val_buf[4], &val_buf[5]);
+	else
+		memcpy(val_buf, addr, ADDR_VAL_LEN);
+
+	if (ret != ADDR_VAL_LEN)
+		return -1;
+
+	if (check && (val_buf[0] & 0x3))
+		return -1;
+
+	memset(cmp_buf, 0x00, ADDR_VAL_LEN);
+	if (memcmp(val_buf, cmp_buf, ADDR_VAL_LEN) == 0)
+		return -1;
+
+	memset(cmp_buf, 0xFF, ADDR_VAL_LEN);
+	if (memcmp(val_buf, cmp_buf, ADDR_VAL_LEN) == 0)
+		return -1;
+
+	return 0;
+}
+
+static struct addr_mgt_info *addr_find_by_name(char *name)
+{
+	int i = 0;
+	for (i = 0; i < ARRAY_SIZE(info); i++) {
+		if (strcmp(info[i].name, name) == 0)
+			return &info[i];
+	}
+	return NULL;
+}
+
+static int get_addr_by_name(int fmt, char *addr, char *name)
+{
+	struct addr_mgt_info *t;
+
+	t = addr_find_by_name(name);
+	if (t == NULL) {
+		ADDR_MGT_ERR("can't find addr named: %s", name);
+		return -1;
+	}
+
+	if (IS_TYPE_INVALID(t->type_cur)) {
+		ADDR_MGT_ERR("addr type invalid");
+		return -1;
+	}
+
+	if (addr_parse(ADDR_FMT_VAL, t->addr, t->flag)) {
+		ADDR_MGT_ERR("addr parse fail(%s)", t->addr);
+		return -1;
+	}
+
+	if (fmt == ADDR_FMT_STR)
+		sprintf(addr, "%02X:%02X:%02X:%02X:%02X:%02X",
+				t->addr[0], t->addr[1], t->addr[2],
+				t->addr[3], t->addr[4], t->addr[5]);
+	else
+		memcpy(addr, t->addr, ADDR_VAL_LEN);
+
+	return t->type_cur;
+}
+
+static int set_addr_by_name(int type, int fmt, const char *addr, char *name)
+{
+	struct addr_mgt_info *t;
+
+	t = addr_find_by_name(name);
+	if (t == NULL) {
+		ADDR_MGT_ERR("can't find addr named: %s", name);
+		return -1;
+	}
+
+	if (addr_parse(fmt, addr, t->flag)) {
+		ADDR_MGT_ERR("addr parse fail(%s)", addr);
+		return -1;
+	}
+
+	t->type_cur = type;
+	if (fmt == ADDR_FMT_STR)
+		sscanf(addr, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+				&t->addr[0], &t->addr[1], &t->addr[2],
+				&t->addr[3], &t->addr[4], &t->addr[5]);
+	else
+		memcpy(t->addr, addr, ADDR_VAL_LEN);
+
+	return 0;
+}
+
+int get_custom_mac_address(int fmt, char *name, char *addr)
+{
+	return get_addr_by_name(fmt, addr, name);
+}
+EXPORT_SYMBOL_GPL(get_custom_mac_address);
+
+static int addr_factory(struct device_node *np,
+			int idx, int type, char *mac, char *name)
+{
+	int  ret, i;
+	char match[MATCH_STR_LEN];
+	const char *p;
+	char id[ID_LEN], hash[HASH_LEN], cmp_buf[ID_LEN];
+	struct timespec64 curtime;
+
+	switch (type) {
+	case TYPE_BURN:
+		sprintf(match, "addr_%s", name);
+		ret = of_property_read_string_index(np, match, 0, &p);
+		if (ret)
+			return -1;
+
+		ret = sscanf(p, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+			&mac[0], &mac[1], &mac[2],
+			&mac[3], &mac[4], &mac[5]);
+
+		if (ret != ADDR_VAL_LEN)
+			return -1;
+		break;
+	case TYPE_IDGEN:
+		if (idx > HASH_LEN / ADDR_VAL_LEN - 1)
+			return -1;
+		if (sunxi_get_soc_chipid(id))
+			return -1;
+		memset(cmp_buf, 0x00, ID_LEN);
+		if (memcmp(id, cmp_buf, ID_LEN) == 0)
+			return -1;
+		if (hmac_sha256(id, ID_LEN, hash))
+			return -1;
+		memcpy(mac, &hash[idx * ADDR_VAL_LEN], ADDR_VAL_LEN);
+		break;
+	case TYPE_RAND:
+		for (i = 0; i < ADDR_VAL_LEN; i++) {
+			ktime_get_real_ts64(&curtime);
+			mac[i] = (char)curtime.tv_nsec;
+		}
+		break;
+	default:
+		ADDR_MGT_ERR("unsupport type: %d", type);
+		return -1;
+	}
+	return 0;
+}
+
+static int addr_init(struct platform_device *pdev)
+{
+	struct device_node *np = pdev->dev.of_node;
+	int  type, i, j;
+	char match[MATCH_STR_LEN];
+	char addr[ADDR_VAL_LEN];
+	int  type_tab[] = {TYPE_BURN, TYPE_IDGEN, TYPE_RAND};
+
+	/* init addr type and value */
+	for (i = 0; i < ARRAY_SIZE(info); i++) {
+		sprintf(match, "type_addr_%s", info[i].name);
+		if (of_property_read_u32(np, match, &type)) {
+			ADDR_MGT_DBG("Failed to get type_def_%s, use default: %d",
+						info[i].name, info[i].type_def);
+		} else {
+			info[i].type_def = type;
+			info[i].type_cur = type;
+		}
+
+		if (IS_TYPE_INVALID(info[i].type_def))
+			return -1;
+		if (info[i].type_def != TYPE_ANY) {
+			if (addr_factory(np, i, info[i].type_def, addr, info[i].name))
+				return -1;
+		} else {
+			for (j = 0; j < ARRAY_SIZE(type_tab); j++) {
+				if (!addr_factory(np, i, type_tab[j], addr, info[i].name)) {
+					info[i].type_cur = type_tab[j];
+					break;
+				}
+			}
+		}
+
+		if (info[i].flag)
+			addr[0] &= 0xFC;
+
+		if (addr_parse(ADDR_FMT_VAL, addr, info[i].flag))
+			return -1;
+		else {
+			info[i].addr = devm_kzalloc(&pdev->dev, ADDR_VAL_LEN, GFP_KERNEL);
+			memcpy(info[i].addr, addr, ADDR_VAL_LEN);
+		}
+	}
+	return 0;
+}
+
+static ssize_t summary_show(struct class *class,
+				struct class_attribute *attr, char *buffer)
+{
+	int i = 0, ret = 0;
+
+	ret += sprintf(&buffer[ret], "name cfg cur address\n");
+	for (i = 0; i < ARRAY_SIZE(info); i++) {
+		ret += sprintf(&buffer[ret],
+			"%4s  %d   %d  %02X:%02X:%02X:%02X:%02X:%02X\n",
+			info[i].name,   info[i].type_def, info[i].type_cur,
+			info[i].addr[0], info[i].addr[1], info[i].addr[2],
+			info[i].addr[3], info[i].addr[4], info[i].addr[5]);
+	}
+	return ret;
+}
+static CLASS_ATTR_RO(summary);
+
+ADDR_CLASS_ATTR_ADD(wifi);
+ADDR_CLASS_ATTR_ADD(bt);
+ADDR_CLASS_ATTR_ADD(eth);
+
+static struct attribute *addr_class_attrs[] = {
+	&class_attr_summary.attr,
+	&class_attr_addr_wifi.attr,
+	&class_attr_addr_bt.attr,
+	&class_attr_addr_eth.attr,
+	NULL
+};
+ATTRIBUTE_GROUPS(addr_class);
+
+static struct class addr_class = {
+	.name = "addr_mgt",
+	.owner = THIS_MODULE,
+	.class_groups = addr_class_groups,
+};
+
+static const struct of_device_id addr_mgt_ids[] = {
+	{ .compatible = "allwinner,sunxi-addr_mgt" },
+	{ /* Sentinel */ }
+};
+
+static int addr_mgt_probe(struct platform_device *pdev)
+{
+	int status;
+
+	ADDR_MGT_DBG("module version: %s", MODULE_CUR_VERSION);
+	status = class_register(&addr_class);
+	if (status < 0) {
+		ADDR_MGT_ERR("class register error, status: %d.", status);
+		return -1;
+	}
+
+	if (addr_init(pdev)) {
+		ADDR_MGT_ERR("failed to init addr.");
+		class_unregister(&addr_class);
+		return -1;
+	}
+	ADDR_MGT_DBG("success.");
+	return 0;
+}
+
+static int addr_mgt_remove(struct platform_device *pdev)
+{
+	class_unregister(&addr_class);
+	return 0;
+}
+
+static struct platform_driver addr_mgt_driver = {
+	.probe  = addr_mgt_probe,
+	.remove = addr_mgt_remove,
+	.driver = {
+		.owner = THIS_MODULE,
+		.name  = "sunxi-addr-mgt",
+		.of_match_table = addr_mgt_ids,
+	},
+};
+
+module_platform_driver_probe(addr_mgt_driver, addr_mgt_probe);
+
+MODULE_AUTHOR("Allwinnertech");
+MODULE_DESCRIPTION("Network MAC Addess Manager");
+MODULE_LICENSE("GPL");
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0009-dts-add-addr_mgt-device-tree-node.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0009-dts-add-addr_mgt-device-tree-node.patch
@@ -0,0 +1,32 @@
+From 706dc6ed092e4a1b9d84893cb4186fbd354bb1c8 Mon Sep 17 00:00:00 2001
+From: pbiel <pbiel7@gmail.com>
+Date: Thu, 26 Jan 2023 09:51:22 +0100
+Subject: [PATCH] Add addr_mgt device tree node
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index d0b95d43a..15f45a3f9 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -591,5 +591,15 @@ sunxi-info {
+ 			compatible = "allwinner,sun50i-h616-sys-info";
+ 			status = "okay";
+ 		};
+
+		addr_mgt {
+			compatible = "allwinner,sunxi-addr_mgt";
+			type_addr_wifi = <0x00>;
+			type_addr_bt = <0x00>;
+			type_addr_eth = <0x00>;
+			status = "okay";
+			linux,phandle = <0x179>;
+			phandle = <0x179>;
+		};
+ 	};
+ };
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0010-dts-add-wifi-power-regulator.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0010-dts-add-wifi-power-regulator.patch
@@ -0,0 +1,70 @@
+From 899da8366afd97b1ca59b632036dc313777026da Mon Sep 17 00:00:00 2001
+From: pbiel <pbiel7@gmail.com>
+Date: Fri, 24 Feb 2023 22:14:58 +0100
+Subject: [PATCH] Add wifi power regulator
+
+---
+ .../allwinner/sun50i-h616-orangepi-zero2.dts  | 47 +++++++++++++++++++
+ 1 file changed, 47 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+index 02893f3ac..88234a139 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+@@ -49,6 +49,53 @@ reg_vcc5v: vcc5v {
+ 		regulator-max-microvolt = <5000000>;
+ 		regulator-always-on;
+ 	};
+
+	reg_vcc33_wifi: vcc33-wifi {
+		/* Always on 3.3V regulator for WiFi and BT */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc33-wifi";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		vin-supply = <&reg_vcc5v>;
+	};
+
+	reg_vcc_wifi_io: vcc-wifi-io {
+		/* Always on 1.8V/300mA regulator for WiFi and BT IO */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-wifi-io";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		vin-supply = <&reg_vcc33_wifi>;
+	};
+
+	wifi_pwrseq: wifi-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&rtc 1>;
+		clock-names = "osc32k-out";
+		reset-gpios = <&pio 6 18 GPIO_ACTIVE_LOW>; /* PG18 */
+		post-power-on-delay-ms = <200>;
+	};
+};
+
+&mmc1 {
+	vmmc-supply = <&reg_vcc33_wifi>;
+	vqmmc-supply = <&reg_vcc_wifi_io>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
+	mmc-ddr-1_8v;
+	status = "okay";
+	uwe-bsp {
+		compatible = "unisoc,uwe_bsp";
+		keep-power-on;
+		data-irq;
+		//adma-tx;
+		adma-rx;
+		//blksz-512;
+		status = "okay";
+	};
+ };
+ 
+ &emac0 {
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0011-dts-add-usb-to-h616.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0011-dts-add-usb-to-h616.patch
@@ -0,0 +1,184 @@
+From ab35c98369d50766eb20920a93a2dca927935481 Mon Sep 17 00:00:00 2001
+From: OpenEmbedded <oe.patch@oe>
+Date: Fri, 19 May 2023 23:01:14 +0200
+Subject: [PATCH] Add usb support to h616. This is not needed from kernel 6.2
+
+Signed-off-by: OpenEmbedded <oe.patch@oe>
+---
+ .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 160 ++++++++++++++++++
+ 1 file changed, 160 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 04cdec7e2..a1d872e74 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -504,6 +504,166 @@ mdio0: mdio {
+ 			};
+ 		};
+ 
+		usbotg: usb@5100000 {
+			compatible = "allwinner,sun50i-h616-musb",
+				     "allwinner,sun8i-h3-musb";
+			reg = <0x05100000 0x0400>;
+			clocks = <&ccu CLK_BUS_OTG>;
+			resets = <&ccu RST_BUS_OTG>;
+			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "mc";
+			phys = <&usbphy 0>;
+			phy-names = "usb";
+			extcon = <&usbphy 0>;
+			status = "disabled";
+		};
+
+		usbphy: phy@5100400 {
+			compatible = "allwinner,sun50i-h616-usb-phy";
+			reg = <0x05100400 0x24>,
+			      <0x05101800 0x14>,
+			      <0x05200800 0x14>,
+			      <0x05310800 0x14>,
+			      <0x05311800 0x14>;
+			reg-names = "phy_ctrl",
+				    "pmu0",
+				    "pmu1",
+				    "pmu2",
+				    "pmu3";
+			clocks = <&ccu CLK_USB_PHY0>,
+				 <&ccu CLK_USB_PHY1>,
+				 <&ccu CLK_USB_PHY2>,
+				 <&ccu CLK_USB_PHY3>,
+				 <&ccu CLK_BUS_EHCI2>;
+			clock-names = "usb0_phy",
+				      "usb1_phy",
+				      "usb2_phy",
+				      "usb3_phy",
+				      "pmu2_clk";
+			resets = <&ccu RST_USB_PHY0>,
+				 <&ccu RST_USB_PHY1>,
+				 <&ccu RST_USB_PHY2>,
+				 <&ccu RST_USB_PHY3>;
+			reset-names = "usb0_reset",
+				      "usb1_reset",
+				      "usb2_reset",
+				      "usb3_reset";
+			status = "disabled";
+			#phy-cells = <1>;
+		};
+
+		ehci0: usb@5101000 {
+			compatible = "allwinner,sun50i-h616-ehci",
+				     "generic-ehci";
+			reg = <0x05101000 0x100>;
+			interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_OHCI0>,
+				 <&ccu CLK_BUS_EHCI0>,
+				 <&ccu CLK_USB_OHCI0>;
+			resets = <&ccu RST_BUS_OHCI0>,
+				 <&ccu RST_BUS_EHCI0>;
+			phys = <&usbphy 0>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
+		ohci0: usb@5101400 {
+			compatible = "allwinner,sun50i-h616-ohci",
+				     "generic-ohci";
+			reg = <0x05101400 0x100>;
+			interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_OHCI0>,
+				 <&ccu CLK_USB_OHCI0>;
+			resets = <&ccu RST_BUS_OHCI0>;
+			phys = <&usbphy 0>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
+		ehci1: usb@5200000 {
+			compatible = "allwinner,sun50i-h616-ehci",
+				     "generic-ehci";
+			reg = <0x05200000 0x100>;
+			interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_OHCI1>,
+				 <&ccu CLK_BUS_EHCI1>,
+				 <&ccu CLK_USB_OHCI1>;
+			resets = <&ccu RST_BUS_OHCI1>,
+				 <&ccu RST_BUS_EHCI1>;
+			phys = <&usbphy 1>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
+		ohci1: usb@5200400 {
+			compatible = "allwinner,sun50i-h616-ohci",
+				     "generic-ohci";
+			reg = <0x05200400 0x100>;
+			interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_OHCI1>,
+				 <&ccu CLK_USB_OHCI1>;
+			resets = <&ccu RST_BUS_OHCI1>;
+			phys = <&usbphy 1>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
+		ehci2: usb@5310000 {
+			compatible = "allwinner,sun50i-h616-ehci",
+				     "generic-ehci";
+			reg = <0x05310000 0x100>;
+			interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_OHCI2>,
+				 <&ccu CLK_BUS_EHCI2>,
+				 <&ccu CLK_USB_OHCI2>;
+			resets = <&ccu RST_BUS_OHCI2>,
+				 <&ccu RST_BUS_EHCI2>;
+			phys = <&usbphy 2>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
+		ohci2: usb@5310400 {
+			compatible = "allwinner,sun50i-h616-ohci",
+				     "generic-ohci";
+			reg = <0x05310400 0x100>;
+			interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_OHCI2>,
+				 <&ccu CLK_USB_OHCI2>;
+			resets = <&ccu RST_BUS_OHCI2>;
+			phys = <&usbphy 2>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
+		ehci3: usb@5311000 {
+			compatible = "allwinner,sun50i-h616-ehci",
+				     "generic-ehci";
+			reg = <0x05311000 0x100>;
+			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_OHCI3>,
+				 <&ccu CLK_BUS_EHCI3>,
+				 <&ccu CLK_USB_OHCI3>;
+			resets = <&ccu RST_BUS_OHCI3>,
+				 <&ccu RST_BUS_EHCI3>;
+			phys = <&usbphy 3>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
+		ohci3: usb@5311400 {
+			compatible = "allwinner,sun50i-h616-ohci",
+				     "generic-ohci";
+			reg = <0x05311400 0x100>;
+			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_OHCI3>,
+				 <&ccu CLK_USB_OHCI3>;
+			resets = <&ccu RST_BUS_OHCI3>;
+			phys = <&usbphy 3>;
+			phy-names = "usb";
+			status = "disabled";
+		};
+
+ 		rtc: rtc@7000000 {
+ 			compatible = "allwinner,sun50i-h616-rtc";
+ 			reg = <0x07000000 0x400>;
+-- 
+2.40.1
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0012-dts-orange-pi-zero2.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0012-dts-orange-pi-zero2.patch
@@ -0,0 +1,84 @@
+From 038441bbe0f6dab3e701061c514a8d776dbe6523 Mon Sep 17 00:00:00 2001
+From: OpenEmbedded <oe.patch@oe>
+Date: Sat, 20 May 2023 14:07:47 +0200
+Subject: [PATCH] DTS orange pi zero2 enable usb
+
+Signed-off-by: OpenEmbedded <oe.patch@oe>
+---
+ .../allwinner/sun50i-h616-orangepi-zero2.dts  | 42 +++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+index 88234a139..3b836296b 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+@@ -50,6 +50,16 @@ reg_vcc5v: vcc5v {
+ 		regulator-always-on;
+ 	};
+ 
+        reg_usb1_vbus: regulator-usb1-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb1-vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                vin-supply = <&reg_vcc5v>;
+                enable-active-high;
+                gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>; /* PC16 */
+        };
+
+ 	reg_vcc33_wifi: vcc33-wifi {
+ 		/* Always on 3.3V regulator for WiFi and BT */
+ 		compatible = "regulator-fixed";
+@@ -79,6 +89,12 @@ wifi_pwrseq: wifi-pwrseq {
+ 	};
+ };
+ 
+&ehci1 {
+        status = "okay";
+};
+
+/* USB 2 & 3 are on headers only. */
+
+ &mmc1 {
+ 	vmmc-supply = <&reg_vcc33_wifi>;
+ 	vqmmc-supply = <&reg_vcc_wifi_io>;
+@@ -123,6 +139,11 @@ &mmc0 {
+ 	status = "okay";
+ };
+ 
+
+&ohci1 {
+	status = "okay";
+};
+
+ &r_rsb {
+ 	status = "okay";
+ 
+@@ -258,3 +279,24 @@ &uart0 {
+ 	pinctrl-0 = <&uart0_ph_pins>;
+ 	status = "okay";
+ };
+
+&usbotg {
+	/*
+	 * PHY0 pins are connected to a USB-C socket, but a role switch
+	 * is not implemented: both CC pins are pulled to GND.
+	 * The VBUS pins power the device, so a fixed peripheral mode
+	 * is the best choice.
+	 * The board can be powered via GPIOs, in this case port0 *can*
+	 * act as a host (with a cable/adapter ignoring CC), as VBUS is
+	 * then provided by the GPIOs. Any user of this setup would
+	 * need to adjust the DT accordingly: dr_mode set to "host",
+	 * enabling OHCI0 and EHCI0.
+	 */
+	dr_mode = "peripheral";
+	status = "okay";
+};
+
+&usbphy {
+	usb1_vbus-supply = <&reg_usb1_vbus>;
+	status = "okay";
+};
+-- 
+2.40.1
+
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/defconfig
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/defconfig
--- a/recipes-kernel/linux/linux-mainline.inc
+++ b/recipes-kernel/linux/linux-mainline.inc
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun9i|sun50i)"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"

 inherit kernel

@@ -9,6 +9,24 @@ require linux.inc

 LINUX_VERSION = "${PV}"

+KERNEL_DTB_PREFIX = "0"
+
+python() {
+    # return version in int form
+    def kernel_version():
+        ver = d.getVar('PV', True).split('.')
+        return int("".join(ver[0])),int("".join(ver[1]))
+
+    # kernel 6.5 have updated dts path add 'allwinner' prefix automatically
+    major, minor = kernel_version()
+    if major >= 6 and minor >= 5:
+        dt = d.getVar('KERNEL_DEVICETREE', True)
+        if not "allwinner" in dt:
+            dt = "allwinner/{0}".format(dt)
+            d.setVar('KERNEL_DEVICETREE', dt)
+        d.setVar('KERNEL_DTB_PREFIX', "1")
+}
+
 # Since we're not using git, this doesn't make a difference, but we need to fill
 # in something or kernel-yocto.bbclass will fail.
 KBRANCH ?= "master"
@@ -30,19 +48,25 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.ta
 	   file://sunxi-kmeta;type=kmeta;name=sunxi-kmeta;destsuffix=sunxi-kmeta \
 "

-# patches
-SRC_URI:append = " \
-	file://patches/0001-dts-orangepi-zero-Add-wifi-support.patch \
-	file://patches/0002-dts-nanopi-neo-air-Add-camera-support.patch \
-	file://patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch \
-	file://patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch \
-	file://patches/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch \
-	file://patches/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch \
+# append patches for kernels before 6.5 and after based on version
+SRC_URI += "${@oe.utils.ifelse(d.getVar('KERNEL_DTB_PREFIX') == '1', d.getVar('SOURCES_K65'), d.getVar('SOURCES'))}"
+
+SOURCES_K65 = " \
+	file://6.5/0001-dts-orangepi-zero-Add-wifi-support.patch \
+	file://6.5/0002-dts-nanopi-neo-air-Add-camera-support.patch \
+	file://6.5/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch \
+	file://6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch \
+"
+
+SOURCES = " \
+	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
+	file://0002-dts-nanopi-neo-air-add-camera.patch \
+	file://0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch \
+	file://0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch \
 "

 SRC_URI:append:use-mailine-graphics = " file://drm.cfg"
 SRC_URI:append:bananapi = " file://axp20x.cfg"
-SRC_URI:append:bananapi-m2-berry = " file://axp20x.cfg"
 SRC_URI:append:bananapi-m2-zero = " file://axp20x.cfg"
 SRC_URI:append:cubietruck = " file://axp20x.cfg"
 SRC_URI:append:nanopi-neo-air = " file://cam500b.cfg"
--- a/recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch
+++ b/recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch
@@ -0,0 +1,87 @@
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+index 84cd9c061..917986cce 100644
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+@@ -80,13 +80,15 @@
+ 		};
+ 	};
+ 
+-	reg_vcc_wifi: reg_vcc_wifi {
+	vdd_wifi: vdd_wifi {
+ 		compatible = "regulator-fixed";
+-		regulator-min-microvolt = <3300000>;
+-		regulator-max-microvolt = <3300000>;
+-		regulator-name = "vcc-wifi";
+-		enable-active-high;
+		regulator-name = "wifi";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+ 		gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>;
+		startup-delay-us = <70000>;
+		enable-active-high;
+
+ 	};
+ 
+ 	reg_vdd_cpux: vdd-cpux-regulator {
+@@ -106,10 +108,12 @@
+ 			  1300000 1>;
+ 	};
+ 
+-	wifi_pwrseq: wifi_pwrseq {
+	pwrseq_wifi: pwrseq_wifi {
+ 		compatible = "mmc-pwrseq-simple";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_rst>;
+ 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>;
+-		post-power-on-delay-ms = <200>;
+		post-power-on-delay-ms = <50>;
+ 	};
+ };
+ 
+@@ -140,9 +144,11 @@
+ };
+ 
+ &mmc1 {
+-	vmmc-supply = <&reg_vcc_wifi>;
+-	mmc-pwrseq = <&wifi_pwrseq>;
+	vmmc-supply = <&reg_vcc3v3>;
+	vqmmc-supply = <&vdd_wifi>;
+	mmc-pwrseq = <&pwrseq_wifi>;
+ 	bus-width = <4>;
+	max-frequency = <16000000>;
+ 	non-removable;
+ 	status = "okay";
+ 
+@@ -152,6 +158,13 @@
+ 	 */
+ 	xr819: sdio_wifi@1 {
+ 		reg = <1>;
+		compatible = "xradio,xr819";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_wake>;
+		interrupt-parent = <&pio>;
+		interrupts = <6 10 IRQ_TYPE_EDGE_RISING>;
+		interrupt-names = "host-wake";
+		local-mac-address = [dc 44 6d c0 ff ee];
+ 	};
+ };
+ 
+@@ -208,3 +221,18 @@
+ 	status = "okay";
+ 	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
+ };
+
+&pio {
+	wifi_wake: wifi_wake {
+		pins = "PG10";
+		function = "gpio_in";
+    };
+};
+
+&r_pio {
+	wifi_rst: wifi_rst {
+		pins = "PL7";
+		function = "gpio_out";
+    };
+};
+
--- a/recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch
+++ b/recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch
@@ -0,0 +1,101 @@
+diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+index cd3df12b65..33a161692f 100644
+--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+@@ -77,6 +77,39 @@
+ 		compatible = "mmc-pwrseq-simple";
+ 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
+ 	};
+
+        cam_xclk: cam-xclk {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <24000000>;
+                clock-output-names = "cam-xclk";
+        };
+
+        reg_cam_avdd: cam-avdd {
+                compatible = "regulator-fixed";
+                regulator-name = "cam-avdd";
+                regulator-min-microvolt = <2800000>;
+                regulator-max-microvolt = <2800000>;
+                vin-supply = <&reg_vcc3v3>;
+        };
+
+        reg_cam_dovdd: cam-dovdd {
+                compatible = "regulator-fixed";
+                regulator-name = "cam-dovdd";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                vin-supply = <&reg_vcc3v3>;
+        };
+
+        reg_cam_dvdd: cam-dvdd {
+                compatible = "regulator-fixed";
+                regulator-name = "cam-dvdd";
+                regulator-min-microvolt = <1500000>;
+                regulator-max-microvolt = <1500000>;
+                vin-supply = <&reg_vcc3v3>;
+        };
+
+
+ };
+ 
+ &mmc0 {
+@@ -141,3 +174,55 @@
+ 	/* USB VBUS is always on */
+ 	status = "okay";
+ };
+
+&csi {
+    status = "okay";
+
+    port {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        /* Parallel bus endpoint */
+        csi_from_ov5640: endpoint {
+            remote-endpoint = <&ov5640_to_csi>;
+            bus-width = <8>;
+            data-shift = <2>;
+            hsync-active = <1>; /* Active high */
+            vsync-active = <0>; /* Active low */
+            data-active = <1>;  /* Active high */
+            pclk-sample = <1>;  /* Rising */
+        };
+    };
+};
+
+&i2c2 {
+   status = "okay";
+
+   ov5640: camera@3c {
+        compatible = "ovti,ov5640";
+        reg = <0x3c>;
+        clocks = <&cam_xclk>;
+        clock-names = "xclk";
+
+        reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>;
+        powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>;
+        AVDD-supply = <&reg_cam_avdd>;
+        DOVDD-supply = <&reg_cam_dovdd>;
+        DVDD-supply = <&reg_cam_dvdd>;
+
+        port {
+            ov5640_to_csi: endpoint {
+                remote-endpoint = <&csi_from_ov5640>;
+                bus-width = <8>;
+                data-shift = <2>;
+                hsync-active = <1>; /* Active high */
+                vsync-active = <0>; /* Active low */
+                data-active = <1>;  /* Active high */
+                pclk-sample = <1>;  /* Rising */
+            };
+        };
+    };
+};
+&i2c2_pins {
+   bias-pull-up;
+};
+
--- a/recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch
+++ b/recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch
@@ -0,0 +1,28 @@
+From 9b4baa9b5aab0511c46a1ae95485e1a3ea984352 Mon Sep 17 00:00:00 2001
+From: matteolel <matteolel91@hotmail.it>
+Date: Fri, 9 Dec 2022 16:38:11 +0000
+Subject: [PATCH] dts: allwinner: bananapi-m2-zreo: Enforce consistent MMC
+ numbering
+
+Enforce MMC number (sometimes the order was wrong and the device does not boot).
+---
+ arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
+index 8e8634ff2..37a2ed937 100644
+--- a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
+@@ -20,6 +20,9 @@ / {
+ 	aliases {
+ 		serial0 = &uart0;
+ 		serial1 = &uart1;
+		mmc0 = &mmc0;
+		mmc1 = &mmc1;
+		mmc2 = &mmc2;
+ 	};
+ 
+ 	chosen {
+-- 
+2.25.1
+
--- a/recipes-kernel/linux/linux-mainline/patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
--- a/recipes-kernel/linux/linux-mainline/patches/0001-dts-orangepi-zero-Add-wifi-support.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0001-dts-orangepi-zero-Add-wifi-support.patch
--- a/recipes-kernel/linux/linux-mainline/patches/0002-dts-nanopi-neo-air-Add-camera-support.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0002-dts-nanopi-neo-air-Add-camera-support.patch
--- a/recipes-kernel/linux/linux-mainline/patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch
--- a/recipes-kernel/linux/linux-mainline/6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
+++ b/recipes-kernel/linux/linux-mainline/6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
@@ -0,0 +1,27 @@
+From f487f62babb11d014da7a0b58a0fcdf6d217a812 Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@open-nandra.com>
+Date: Thu, 11 May 2023 11:18:33 +0200
+Subject: [PATCH] bananapi-m64: Consistent nodes for mmc devices
+
+Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+index e6d5bc0f7..39a28aad8 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+@@ -16,6 +16,9 @@ aliases {
+ 		ethernet0 = &emac;
+ 		serial0 = &uart0;
+ 		serial1 = &uart1;
+                mmc0 = &mmc0;
+                mmc1 = &mmc1;
+                mmc2 = &mmc2;
+ 	};
+ 
+ 	chosen {
+-- 
+2.25.1
+
--- a/recipes-kernel/linux/linux-mainline/patches/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch
@@ -1,31 +0,0 @@
-From 8b245b30a451bc4a4081759a6918b630ec075a7c Mon Sep 17 00:00:00 2001
-From: Stefan Gloor <code@stefan-gloor.ch>
-Date: Thu, 19 Dec 2024 10:34:54 +0100
-Subject: [PATCH] ARM: dts: sunxi: Add MMC alias for consistent enumeration
-
-Add explicit alias for MMC devices, so that (e)MMC and micro SD cards
-are enumerated consistenly. This should fix spurious boot failures when
-specifying a hard-coded root partition, e.g., mmcblk0p2.
-
-Signed-off-by: Stefan Gloor <code@stefan-gloor.ch>
-Upstream-Status: Denied https://lore.kernel.org/lkml/CAGb2v67dBhL3-AhLeHg3xOgbNZ3qu0aj9+kA+MoOMRYfr_Z_zQ@mail.gmail.com/
---
- arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-micro.dts | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-micro.dts
-index a1b89b2a2999..9cd1eb690134 100644
--- a/arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-micro.dts
-+++ b/arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-micro.dts
-@@ -60,6 +60,8 @@ aliases {
- 		serial2 = &uart7;
- 		spi0 = &spi1;
- 		spi1 = &spi2;
-+		mmc0 = &mmc0;
-+		mmc1 = &mmc3;
- 	};
- 
- 	chosen {
-- 
-2.45.2
-
--- a/recipes-kernel/linux/linux-mainline/patches/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch
@@ -1,32 +0,0 @@
-From a2d765aab2989ba080b8f63cb0489d6a531cb3fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Oliver=20K=C3=A4stner?= <git@oliver-kaestner.de>
-Date: Sun, 16 Mar 2025 22:36:53 +0100
-Subject: [PATCH] dts: allwinner: orangepi-zero: mmc aliases for consistent
- enumeration
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes random boot failures.
-
-Upstream-Status: Inappropriate [https://github.com/linux-sunxi/meta-sunxi/pull/431]
-
-Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
---
- arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-index ca94e313f..570a88327 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-@@ -59,6 +59,9 @@ aliases {
- 		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
- 		ethernet0 = &emac;
- 		ethernet1 = &xr819;
-+		mmc0 = &mmc0; /* microSD */
-+		mmc1 = &mmc1; /* XR819 WiFi */
-+		mmc2 = &mmc2;
- 	};
- 
- 	chosen {
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/0001-clk-config-fixup-of_property_for_each_u32-after-land.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/0001-clk-config-fixup-of_property_for_each_u32-after-land.patch
@@ -1,42 +0,0 @@
-From 071808589900d4f2f5407a8a638466e75bb35a61 Mon Sep 17 00:00:00 2001
-From: Alexander Sack <asac@pantacor.com>
-Date: Thu, 12 Jun 2025 08:43:13 +0000
-Subject: [PATCH] clk-config: fixup of_property_for_each_u32 after landing of
- 914ef7d1a702c510d0b59151a9623f9d20c69d2a
-
---
- drivers/clk/clk-conf.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
-index 70b0fdd63..602383b96 100644
--- a/drivers/clk/clk-conf.c
-+++ b/drivers/clk/clk-conf.c
-@@ -16,9 +16,7 @@
- static int __set_clk_flags(struct device_node *node)
- {
- 	struct of_phandle_args clkspec;
-	struct property *prop;
- 	int i, index = 0, rc;
-	const __be32 *cur;
- 	struct clk *clk;
- 	u32 nr_cells;
- 
-@@ -31,11 +29,11 @@ static int __set_clk_flags(struct device_node *node)
- 	clkspec.np         = node;
- 	clkspec.args_count = nr_cells;
- 
-	of_property_for_each_u32(node, "protected-clocks", prop, cur, clkspec.args[0]) {
-+	of_property_for_each_u32(node, "protected-clocks", clkspec.args[0]) {
- 		/* read the remainder of the clock specifier */
- 		for (i = 1; i < nr_cells; ++i) {
-			cur = of_prop_next_u32(prop, cur, &clkspec.args[i]);
-			if (!cur) {
-+			_it.item = of_prop_next_u32(_it.prop, _it.item, &clkspec.args[i]);
-+			if (!_it.item) {
- 				pr_err("clk: invalid value of protected-clocks"
- 				       " property at %pOF\n", node);
- 				return -EINVAL;
-- 
-2.34.1
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/ASoC-hdmi-codec-fix-channel-allocation.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/ASoC-hdmi-codec-fix-channel-allocation.patch
@@ -0,0 +1,142 @@
+From 91b69779e0875e58d8973b2938a1cc4b7a1c455b Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sun, 25 Mar 2018 22:17:06 +0200
+Subject: [PATCH 22/44] ASoC: hdmi-codec: fix channel allocation
+
+---
+ sound/soc/codecs/hdmi-codec.c | 113 ++++++++++++++++------------------
+ 1 file changed, 52 insertions(+), 61 deletions(-)
+
+--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
+@@ -194,78 +194,69 @@ static const struct snd_pcm_chmap_elem h
+  */
+ static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
+ 	{ .ca_id = 0x00, .n_ch = 2,
+-	  .mask = FL | FR},
+-	/* 2.1 */
+-	{ .ca_id = 0x01, .n_ch = 4,
+-	  .mask = FL | FR | LFE},
+-	/* Dolby Surround */
+	  .mask = FL | FR },
+	{ .ca_id = 0x03, .n_ch = 4,
+	  .mask = FL | FR | LFE | FC },
+ 	{ .ca_id = 0x02, .n_ch = 4,
+ 	  .mask = FL | FR | FC },
+-	/* surround51 */
+	{ .ca_id = 0x01, .n_ch = 4,
+	  .mask = FL | FR | LFE },
+ 	{ .ca_id = 0x0b, .n_ch = 6,
+-	  .mask = FL | FR | LFE | FC | RL | RR},
+-	/* surround40 */
+-	{ .ca_id = 0x08, .n_ch = 6,
+-	  .mask = FL | FR | RL | RR },
+-	/* surround41 */
+-	{ .ca_id = 0x09, .n_ch = 6,
+-	  .mask = FL | FR | LFE | RL | RR },
+-	/* surround50 */
+	  .mask = FL | FR | LFE | FC | RL | RR },
+ 	{ .ca_id = 0x0a, .n_ch = 6,
+ 	  .mask = FL | FR | FC | RL | RR },
+-	/* 6.1 */
+-	{ .ca_id = 0x0f, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC | RL | RR | RC },
+-	/* surround71 */
+	{ .ca_id = 0x09, .n_ch = 6,
+	  .mask = FL | FR | LFE | RL | RR },
+	{ .ca_id = 0x08, .n_ch = 6,
+	  .mask = FL | FR | RL | RR },
+	{ .ca_id = 0x07, .n_ch = 6,
+	  .mask = FL | FR | LFE | FC | RC },
+	{ .ca_id = 0x06, .n_ch = 6,
+	  .mask = FL | FR | FC | RC },
+	{ .ca_id = 0x05, .n_ch = 6,
+	  .mask = FL | FR | LFE | RC },
+	{ .ca_id = 0x04, .n_ch = 6,
+	  .mask = FL | FR | RC },
+ 	{ .ca_id = 0x13, .n_ch = 8,
+ 	  .mask = FL | FR | LFE | FC | RL | RR | RLC | RRC },
+-	/* others */
+-	{ .ca_id = 0x03, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC },
+-	{ .ca_id = 0x04, .n_ch = 8,
+-	  .mask = FL | FR | RC},
+-	{ .ca_id = 0x05, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RC },
+-	{ .ca_id = 0x06, .n_ch = 8,
+-	  .mask = FL | FR | FC | RC },
+-	{ .ca_id = 0x07, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC | RC },
+-	{ .ca_id = 0x0c, .n_ch = 8,
+-	  .mask = FL | FR | RC | RL | RR },
+-	{ .ca_id = 0x0d, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RL | RR | RC },
+-	{ .ca_id = 0x0e, .n_ch = 8,
+-	  .mask = FL | FR | FC | RL | RR | RC },
+-	{ .ca_id = 0x10, .n_ch = 8,
+-	  .mask = FL | FR | RL | RR | RLC | RRC },
+-	{ .ca_id = 0x11, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RL | RR | RLC | RRC },
+	{ .ca_id = 0x1f, .n_ch = 8,
+	  .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
+ 	{ .ca_id = 0x12, .n_ch = 8,
+ 	  .mask = FL | FR | FC | RL | RR | RLC | RRC },
+-	{ .ca_id = 0x14, .n_ch = 8,
+-	  .mask = FL | FR | FLC | FRC },
+-	{ .ca_id = 0x15, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FLC | FRC },
+-	{ .ca_id = 0x16, .n_ch = 8,
+-	  .mask = FL | FR | FC | FLC | FRC },
+-	{ .ca_id = 0x17, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC | FLC | FRC },
+-	{ .ca_id = 0x18, .n_ch = 8,
+-	  .mask = FL | FR | RC | FLC | FRC },
+-	{ .ca_id = 0x19, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RC | FLC | FRC },
+-	{ .ca_id = 0x1a, .n_ch = 8,
+-	  .mask = FL | FR | RC | FC | FLC | FRC },
+-	{ .ca_id = 0x1b, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RC | FC | FLC | FRC },
+-	{ .ca_id = 0x1c, .n_ch = 8,
+-	  .mask = FL | FR | RL | RR | FLC | FRC },
+-	{ .ca_id = 0x1d, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RL | RR | FLC | FRC },
+ 	{ .ca_id = 0x1e, .n_ch = 8,
+ 	  .mask = FL | FR | FC | RL | RR | FLC | FRC },
+-	{ .ca_id = 0x1f, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
+	{ .ca_id = 0x11, .n_ch = 8,
+	  .mask = FL | FR | LFE | RL | RR | RLC | RRC },
+	{ .ca_id = 0x1d, .n_ch = 8,
+	  .mask = FL | FR | LFE | RL | RR | FLC | FRC },
+	{ .ca_id = 0x10, .n_ch = 8,
+	  .mask = FL | FR | RL | RR | RLC | RRC },
+	{ .ca_id = 0x1c, .n_ch = 8,
+	  .mask = FL | FR | RL | RR | FLC | FRC },
+	{ .ca_id = 0x0f, .n_ch = 8,
+	  .mask = FL | FR | LFE | FC | RL | RR | RC },
+	{ .ca_id = 0x1b, .n_ch = 8,
+	  .mask = FL | FR | LFE | RC | FC | FLC | FRC },
+	{ .ca_id = 0x0e, .n_ch = 8,
+	  .mask = FL | FR | FC | RL | RR | RC },
+	{ .ca_id = 0x1a, .n_ch = 8,
+	  .mask = FL | FR | RC | FC | FLC | FRC },
+	{ .ca_id = 0x0d, .n_ch = 8,
+	  .mask = FL | FR | LFE | RL | RR | RC },
+	{ .ca_id = 0x19, .n_ch = 8,
+	  .mask = FL | FR | LFE | RC | FLC | FRC },
+	{ .ca_id = 0x0c, .n_ch = 8,
+	  .mask = FL | FR | RC | RL | RR },
+	{ .ca_id = 0x18, .n_ch = 8,
+	  .mask = FL | FR | RC | FLC | FRC },
+	{ .ca_id = 0x17, .n_ch = 8,
+	  .mask = FL | FR | LFE | FC | FLC | FRC },
+	{ .ca_id = 0x16, .n_ch = 8,
+	  .mask = FL | FR | FC | FLC | FRC },
+	{ .ca_id = 0x15, .n_ch = 8,
+	  .mask = FL | FR | LFE | FLC | FRC },
+	{ .ca_id = 0x14, .n_ch = 8,
+	  .mask = FL | FR | FLC | FRC },
+ };
+ 
+ struct hdmi_codec_priv {
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Input-axp20x-pek-allow-wakeup-after-shutdown-6_1.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Input-axp20x-pek-allow-wakeup-after-shutdown-6_1.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sat, 2 Jan 2021 15:52:27 -0600
+Subject: [PATCH] Input: axp20x-pek - allow wakeup after shutdown
+
+While the AXP20x PMIC handles the power button itself after shutting
+down, it is not always possible to use the PMIC's built-in shutdown
+feature, such as when other wakeup sources are needed (for example, an
+IR remote or wake-on-LAN) that require firmware support. In that case,
+the PMIC remains on, but suspended, until the board is powered back on.
+
+During this "fake" off state, IRQ configuration is similar to system
+sleep, where enable_irq_wake() must be call on an IRQ for it to be
+wakeup capable. Run the suspend callback to arm the power button IRQs
+during the shutdown process, so the power button works in this state.
+
+Signed-off-by: Samuel Holland <samuel@sholland.org>
+---
+ drivers/input/misc/axp20x-pek.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
+@@ -354,7 +354,7 @@ static int axp20x_pek_probe(struct platf
+ 	return 0;
+ }
+ 
+-static int __maybe_unused axp20x_pek_suspend(struct device *dev)
+static int axp20x_pek_suspend(struct device *dev)
+ {
+ 	struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
+ 
+@@ -413,6 +413,11 @@ static const struct dev_pm_ops axp20x_pe
+ #endif
+ };
+ 
+static void axp20x_pek_shutdown(struct platform_device *pdev)
+{
+	axp20x_pek_suspend(&pdev->dev);
+}
+
+ static const struct platform_device_id axp_pek_id_match[] = {
+ 	{
+ 		.name = "axp20x-pek",
+@@ -428,6 +433,7 @@ MODULE_DEVICE_TABLE(platform, axp_pek_id
+ 
+ static struct platform_driver axp20x_pek_driver = {
+ 	.probe		= axp20x_pek_probe,
+	.shutdown	= axp20x_pek_shutdown,
+ 	.id_table	= axp_pek_id_match,
+ 	.driver		= {
+ 		.name		= "axp20x-pek",
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Revert-clk-qcom-Support-protected-clocks-property.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Revert-clk-qcom-Support-protected-clocks-property.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 30 Dec 2019 12:39:31 -0600
+Subject: [PATCH] Revert "clk: qcom: Support 'protected-clocks' property"
+
+Now that protected-clocks is handled in the clk core, this
+driver-specific implementation is redundant.
+
+This reverts commit b181b3b801da8893c8eb706e448dd5111b02de60.
+
+Signed-off-by: Samuel Holland <samuel@sholland.org>
+---
+ drivers/clk/qcom/common.c | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
+@@ -194,22 +194,6 @@ int qcom_cc_register_sleep_clk(struct de
+ }
+ EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);
+ 
+-/* Drop 'protected-clocks' from the list of clocks to register */
+-static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc)
+-{
+-	struct device_node *np = dev->of_node;
+-	struct property *prop;
+-	const __be32 *p;
+-	u32 i;
+-
+-	of_property_for_each_u32(np, "protected-clocks", prop, p, i) {
+-		if (i >= cc->num_rclks)
+-			continue;
+-
+-		cc->rclks[i] = NULL;
+-	}
+-}
+-
+ static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,
+ 					 void *data)
+ {
+@@ -272,8 +256,6 @@ int qcom_cc_really_probe(struct platform
+ 	cc->rclks = rclks;
+ 	cc->num_rclks = num_clks;
+ 
+-	qcom_cc_drop_protected(dev, cc);
+-
+ 	for (i = 0; i < num_clk_hws; i++) {
+ 		ret = devm_clk_hw_register(dev, clk_hws[i]);
+ 		if (ret)
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/mfd-Add-support-for-AC200.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/mfd-Add-support-for-AC200.patch
@@ -0,0 +1,406 @@
+From 59adceb6f34521c0f1a229f20ee9961269daa539 Mon Sep 17 00:00:00 2001
+From: Jernej Skrabec <jernej.skrabec@siol.net>
+Date: Fri, 16 Aug 2019 16:38:21 +0200
+Subject: [PATCH 38/44] mfd: Add support for AC200
+
+Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
+---
+ drivers/mfd/Kconfig       |   9 ++
+ drivers/mfd/Makefile      |   1 +
+ drivers/mfd/ac200.c       | 150 +++++++++++++++++++++++++++
+ include/linux/mfd/ac200.h | 209 ++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 369 insertions(+)
+ create mode 100644 drivers/mfd/ac200.c
+ create mode 100644 include/linux/mfd/ac200.h
+
+--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
+@@ -178,6 +178,15 @@ config MFD_AC100
+ 	  This driver include only the core APIs. You have to select individual
+ 	  components like codecs or RTC under the corresponding menus.
+ 
+config MFD_AC200
+	tristate "X-Powers AC200"
+	select MFD_CORE
+	depends on I2C
+	help
+	  If you say Y here you get support for the X-Powers AC200 IC.
+	  This driver include only the core APIs. You have to select individual
+	  components like Ethernet PHY or RTC under the corresponding menus.
+
+ config MFD_AXP20X
+ 	tristate
+ 	select MFD_CORE
+--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
+@@ -142,6 +142,7 @@ obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-s
+ obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
+ 
+ obj-$(CONFIG_MFD_AC100)		+= ac100.o
+obj-$(CONFIG_MFD_AC200)		+= ac200.o
+ obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
+ obj-$(CONFIG_MFD_AXP20X_I2C)	+= axp20x-i2c.o
+ obj-$(CONFIG_MFD_AXP20X_RSB)	+= axp20x-rsb.o
+--- /dev/null
+++ b/drivers/mfd/ac200.c
+@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * MFD core driver for X-Powers' AC200 IC
+ *
+ * The AC200 is a chip which is co-packaged with Allwinner H6 SoC and
+ * includes analog audio codec, analog TV encoder, ethernet PHY, eFuse
+ * and RTC.
+ *
+ * Copyright (c) 2019 Jernej Skrabec <jernej.skrabec@siol.net>
+ *
+ * Based on AC100 driver with following copyrights:
+ * Copyright (2016) Chen-Yu Tsai
+ */
+
+#include <linux/i2c.h>
+#include <linux/kernel.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/ac200.h>
+#include <linux/module.h>
+#include <linux/of.h>
+
+static const struct regmap_range_cfg ac200_range_cfg[] = {
+	{
+		.range_min = AC200_SYS_VERSION,
+		.range_max = AC200_IC_CHARA1,
+		.selector_reg = AC200_TWI_REG_ADDR_H,
+		.selector_mask = 0xff,
+		.selector_shift = 0,
+		.window_start = 0,
+		.window_len = 256,
+	}
+};
+
+static const struct regmap_config ac200_regmap_config = {
+	.reg_bits	= 8,
+	.val_bits	= 16,
+	.ranges		= ac200_range_cfg,
+	.num_ranges	= ARRAY_SIZE(ac200_range_cfg),
+	.max_register	= AC200_IC_CHARA1,
+};
+
+static struct mfd_cell ac200_cells[] = {
+	{
+		.name		= "ac200-codec",
+		.of_compatible	= "x-powers,ac200-codec",
+	}, {
+		.name		= "ac200-efuse",
+		.of_compatible	= "x-powers,ac200-efuse",
+	}, {
+		.name		= "ac200-ephy",
+		.of_compatible	= "x-powers,ac200-ephy",
+	}, {
+		.name		= "ac200-rtc",
+		.of_compatible	= "x-powers,ac200-rtc",
+	}, {
+		.name		= "ac200-tve",
+		.of_compatible	= "x-powers,ac200-tve",
+	},
+};
+
+static int ac200_i2c_probe(struct i2c_client *i2c,
+			   const struct i2c_device_id *id)
+{
+	struct device *dev = &i2c->dev;
+	struct ac200_dev *ac200;
+	int ret;
+
+	ac200 = devm_kzalloc(dev, sizeof(*ac200), GFP_KERNEL);
+	if (!ac200)
+		return -ENOMEM;
+
+	i2c_set_clientdata(i2c, ac200);
+
+	ac200->clk = devm_clk_get(dev, NULL);
+	if (IS_ERR(ac200->clk)) {
+		ret = PTR_ERR(ac200->clk);
+		dev_err(dev, "Can't obtain the clock: %d\n", ret);
+		return ret;
+	}
+
+	ac200->regmap = devm_regmap_init_i2c(i2c, &ac200_regmap_config);
+	if (IS_ERR(ac200->regmap)) {
+		ret = PTR_ERR(ac200->regmap);
+		dev_err(dev, "Regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	ret = clk_prepare_enable(ac200->clk);
+	if (ret)
+		return ret;
+
+	ret = regmap_write(ac200->regmap, AC200_SYS_CONTROL, 0);
+	if (ret)
+		goto err;
+
+	ret = regmap_write(ac200->regmap, AC200_SYS_CONTROL, 1);
+	if (ret)
+		goto err;
+
+	ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE, ac200_cells,
+				   ARRAY_SIZE(ac200_cells), NULL, 0, NULL);
+	if (ret) {
+		dev_err(dev, "Failed to add MFD devices: %d\n", ret);
+		goto err;
+	}
+
+	return 0;
+
+err:
+	clk_disable_unprepare(ac200->clk);
+	return ret;
+}
+
+void ac200_i2c_remove(struct i2c_client *i2c)
+{
+	struct ac200_dev *ac200 = i2c_get_clientdata(i2c);
+
+	regmap_write(ac200->regmap, AC200_SYS_CONTROL, 0);
+
+	clk_disable_unprepare(ac200->clk);
+}
+
+static const struct i2c_device_id ac200_ids[] = {
+	{ "ac200", },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, ac200_ids);
+
+static const struct of_device_id ac200_of_match[] = {
+	{ .compatible = "x-powers,ac200" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, ac200_of_match);
+
+static struct i2c_driver ac200_i2c_driver = {
+	.driver = {
+		.name	= "ac200",
+		.of_match_table	= of_match_ptr(ac200_of_match),
+	},
+	.probe	= ac200_i2c_probe,
+	.remove = ac200_i2c_remove,
+	.id_table = ac200_ids,
+};
+module_i2c_driver(ac200_i2c_driver);
+
+MODULE_DESCRIPTION("MFD core driver for AC200");
+MODULE_AUTHOR("Jernej Skrabec <jernej.skrabec@siol.net>");
+MODULE_LICENSE("GPL v2");
+--- /dev/null
+++ b/include/linux/mfd/ac200.h
+@@ -0,0 +1,209 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * AC200 register list
+ *
+ * Copyright (C) 2019 Jernej Skrabec <jernej.skrabec@siol.net>
+ */
+
+#ifndef __LINUX_MFD_AC200_H
+#define __LINUX_MFD_AC200_H
+
+#include <linux/clk.h>
+#include <linux/regmap.h>
+
+/* interface registers (can be accessed from any page) */
+#define AC200_TWI_CHANGE_TO_RSB		0x3E
+#define AC200_TWI_PAD_DELAY		0xC4
+#define AC200_TWI_REG_ADDR_H		0xFE
+
+/* General registers */
+#define AC200_SYS_VERSION		0x0000
+#define AC200_SYS_CONTROL		0x0002
+#define AC200_SYS_IRQ_ENABLE		0x0004
+#define AC200_SYS_IRQ_STATUS		0x0006
+#define AC200_SYS_CLK_CTL		0x0008
+#define AC200_SYS_DLDO_OSC_CTL		0x000A
+#define AC200_SYS_PLL_CTL0		0x000C
+#define AC200_SYS_PLL_CTL1		0x000E
+#define AC200_SYS_AUDIO_CTL0		0x0010
+#define AC200_SYS_AUDIO_CTL1		0x0012
+#define AC200_SYS_EPHY_CTL0		0x0014
+#define AC200_SYS_EPHY_CTL1		0x0016
+#define AC200_SYS_TVE_CTL0		0x0018
+#define AC200_SYS_TVE_CTL1		0x001A
+
+/* Audio Codec registers */
+#define AC200_AC_SYS_CLK_CTL		0x2000
+#define AC200_SYS_MOD_RST		0x2002
+#define AC200_SYS_SAMP_CTL		0x2004
+#define AC200_I2S_CTL			0x2100
+#define AC200_I2S_CLK			0x2102
+#define AC200_I2S_FMT0			0x2104
+#define AC200_I2S_FMT1			0x2108
+#define AC200_I2S_MIX_SRC		0x2114
+#define AC200_I2S_MIX_GAIN		0x2116
+#define AC200_I2S_DACDAT_DVC		0x2118
+#define AC200_I2S_ADCDAT_DVC		0x211A
+#define AC200_AC_DAC_DPC		0x2200
+#define AC200_AC_DAC_MIX_SRC		0x2202
+#define AC200_AC_DAC_MIX_GAIN		0x2204
+#define AC200_DACA_OMIXER_CTRL		0x2220
+#define AC200_OMIXER_SR			0x2222
+#define AC200_LINEOUT_CTRL		0x2224
+#define AC200_AC_ADC_DPC		0x2300
+#define AC200_MBIAS_CTRL		0x2310
+#define AC200_ADC_MIC_CTRL		0x2320
+#define AC200_ADCMIXER_SR		0x2322
+#define AC200_ANALOG_TUNING0		0x232A
+#define AC200_ANALOG_TUNING1		0x232C
+#define AC200_AC_AGC_SEL		0x2480
+#define AC200_ADC_DAPLCTRL		0x2500
+#define AC200_ADC_DAPRCTRL		0x2502
+#define AC200_ADC_DAPLSTA		0x2504
+#define AC200_ADC_DAPRSTA		0x2506
+#define AC200_ADC_DAPLTL		0x2508
+#define AC200_ADC_DAPRTL		0x250A
+#define AC200_ADC_DAPLHAC		0x250C
+#define AC200_ADC_DAPLLAC		0x250E
+#define AC200_ADC_DAPRHAC		0x2510
+#define AC200_ADC_DAPRLAC		0x2512
+#define AC200_ADC_DAPLDT		0x2514
+#define AC200_ADC_DAPLAT		0x2516
+#define AC200_ADC_DAPRDT		0x2518
+#define AC200_ADC_DAPRAT		0x251A
+#define AC200_ADC_DAPNTH		0x251C
+#define AC200_ADC_DAPLHNAC		0x251E
+#define AC200_ADC_DAPLLNAC		0x2520
+#define AC200_ADC_DAPRHNAC		0x2522
+#define AC200_ADC_DAPRLNAC		0x2524
+#define AC200_AC_DAPHHPFC		0x2526
+#define AC200_AC_DAPLHPFC		0x2528
+#define AC200_AC_DAPOPT			0x252A
+#define AC200_AC_DAC_DAPCTRL		0x3000
+#define AC200_AC_DRC_HHPFC		0x3002
+#define AC200_AC_DRC_LHPFC		0x3004
+#define AC200_AC_DRC_CTRL		0x3006
+#define AC200_AC_DRC_LPFHAT		0x3008
+#define AC200_AC_DRC_LPFLAT		0x300A
+#define AC200_AC_DRC_RPFHAT		0x300C
+#define AC200_AC_DRC_RPFLAT		0x300E
+#define AC200_AC_DRC_LPFHRT		0x3010
+#define AC200_AC_DRC_LPFLRT		0x3012
+#define AC200_AC_DRC_RPFHRT		0x3014
+#define AC200_AC_DRC_RPFLRT		0x3016
+#define AC200_AC_DRC_LRMSHAT		0x3018
+#define AC200_AC_DRC_LRMSLAT		0x301A
+#define AC200_AC_DRC_RRMSHAT		0x301C
+#define AC200_AC_DRC_RRMSLAT		0x301E
+#define AC200_AC_DRC_HCT		0x3020
+#define AC200_AC_DRC_LCT		0x3022
+#define AC200_AC_DRC_HKC		0x3024
+#define AC200_AC_DRC_LKC		0x3026
+#define AC200_AC_DRC_HOPC		0x3028
+#define AC200_AC_DRC_LOPC		0x302A
+#define AC200_AC_DRC_HLT		0x302C
+#define AC200_AC_DRC_LLT		0x302E
+#define AC200_AC_DRC_HKI		0x3030
+#define AC200_AC_DRC_LKI		0x3032
+#define AC200_AC_DRC_HOPL		0x3034
+#define AC200_AC_DRC_LOPL		0x3036
+#define AC200_AC_DRC_HET		0x3038
+#define AC200_AC_DRC_LET		0x303A
+#define AC200_AC_DRC_HKE		0x303C
+#define AC200_AC_DRC_LKE		0x303E
+#define AC200_AC_DRC_HOPE		0x3040
+#define AC200_AC_DRC_LOPE		0x3042
+#define AC200_AC_DRC_HKN		0x3044
+#define AC200_AC_DRC_LKN		0x3046
+#define AC200_AC_DRC_SFHAT		0x3048
+#define AC200_AC_DRC_SFLAT		0x304A
+#define AC200_AC_DRC_SFHRT		0x304C
+#define AC200_AC_DRC_SFLRT		0x304E
+#define AC200_AC_DRC_MXGHS		0x3050
+#define AC200_AC_DRC_MXGLS		0x3052
+#define AC200_AC_DRC_MNGHS		0x3054
+#define AC200_AC_DRC_MNGLS		0x3056
+#define AC200_AC_DRC_EPSHC		0x3058
+#define AC200_AC_DRC_EPSLC		0x305A
+#define AC200_AC_DRC_HPFHGAIN		0x305E
+#define AC200_AC_DRC_HPFLGAIN		0x3060
+#define AC200_AC_DRC_BISTCR		0x3100
+#define AC200_AC_DRC_BISTST		0x3102
+
+/* TVE registers */
+#define AC200_TVE_CTL0			0x4000
+#define AC200_TVE_CTL1			0x4002
+#define AC200_TVE_MOD0			0x4004
+#define AC200_TVE_MOD1			0x4006
+#define AC200_TVE_DAC_CFG0		0x4008
+#define AC200_TVE_DAC_CFG1		0x400A
+#define AC200_TVE_YC_DELAY		0x400C
+#define AC200_TVE_YC_FILTER		0x400E
+#define AC200_TVE_BURST_FRQ0		0x4010
+#define AC200_TVE_BURST_FRQ1		0x4012
+#define AC200_TVE_FRONT_PORCH		0x4014
+#define AC200_TVE_BACK_PORCH		0x4016
+#define AC200_TVE_TOTAL_LINE		0x401C
+#define AC200_TVE_FIRST_ACTIVE		0x401E
+#define AC200_TVE_BLACK_LEVEL		0x4020
+#define AC200_TVE_BLANK_LEVEL		0x4022
+#define AC200_TVE_PLUG_EN		0x4030
+#define AC200_TVE_PLUG_IRQ_EN		0x4032
+#define AC200_TVE_PLUG_IRQ_STA		0x4034
+#define AC200_TVE_PLUG_STA		0x4038
+#define AC200_TVE_PLUG_DEBOUNCE		0x4040
+#define AC200_TVE_DAC_TEST		0x4042
+#define AC200_TVE_PLUG_PULSE_LEVEL	0x40F4
+#define AC200_TVE_PLUG_PULSE_START	0x40F8
+#define AC200_TVE_PLUG_PULSE_PERIOD	0x40FA
+#define AC200_TVE_IF_CTL		0x5000
+#define AC200_TVE_IF_TIM0		0x5008
+#define AC200_TVE_IF_TIM1		0x500A
+#define AC200_TVE_IF_TIM2		0x500C
+#define AC200_TVE_IF_TIM3		0x500E
+#define AC200_TVE_IF_SYNC0		0x5010
+#define AC200_TVE_IF_SYNC1		0x5012
+#define AC200_TVE_IF_SYNC2		0x5014
+#define AC200_TVE_IF_TIM4		0x5016
+#define AC200_TVE_IF_STATUS		0x5018
+
+/* EPHY registers */
+#define AC200_EPHY_CTL			0x6000
+#define AC200_EPHY_BIST			0x6002
+
+/* eFuse registers (0x8000 - 0x9FFF, layout unknown) */
+
+/* RTC registers */
+#define AC200_LOSC_CTRL0		0xA000
+#define AC200_LOSC_CTRL1		0xA002
+#define AC200_LOSC_AUTO_SWT_STA		0xA004
+#define AC200_INTOSC_CLK_PRESCAL	0xA008
+#define AC200_RTC_YY_MM_DD0		0xA010
+#define AC200_RTC_YY_MM_DD1		0xA012
+#define AC200_RTC_HH_MM_SS0		0xA014
+#define AC200_RTC_HH_MM_SS1		0xA016
+#define AC200_ALARM0_CUR_VLU0		0xA024
+#define AC200_ALARM0_CUR_VLU1		0xA026
+#define AC200_ALARM0_ENABLE		0xA028
+#define AC200_ALARM0_IRQ_EN		0xA02C
+#define AC200_ALARM0_IRQ_STA		0xA030
+#define AC200_ALARM1_WK_HH_MM_SS0	0xA040
+#define AC200_ALARM1_WK_HH_MM_SS1	0xA042
+#define AC200_ALARM1_ENABLE		0xA044
+#define AC200_ALARM1_IRQ_EN		0xA048
+#define AC200_ALARM1_IRQ_STA		0xA04C
+#define AC200_ALARM_CONFIG		0xA050
+#define AC200_LOSC_OUT_GATING		0xA060
+#define AC200_GP_DATA(x)		(0xA100 + (x) * 2)
+#define AC200_RTC_DEB			0xA170
+#define AC200_GPL_HOLD_OUTPUT		0xA180
+#define AC200_VDD_RTC			0xA190
+#define AC200_IC_CHARA0			0xA1F0
+#define AC200_IC_CHARA1			0xA1F2
+
+struct ac200_dev {
+	struct clk	*clk;
+	struct regmap	*regmap;
+};
+
+#endif /* __LINUX_MFD_AC200_H */
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/net-phy-Add-support-for-AC200-EPHY.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/net-phy-Add-support-for-AC200-EPHY.patch
@@ -0,0 +1,276 @@
+From cbf68fb141747879e2e6c43584c1e1e3b4d77683 Mon Sep 17 00:00:00 2001
+From: Jernej Skrabec <jernej.skrabec@siol.net>
+Date: Fri, 16 Aug 2019 16:38:57 +0200
+Subject: [PATCH 39/44] net: phy: Add support for AC200 EPHY
+
+Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
+---
+ drivers/net/phy/Kconfig  |   7 ++
+ drivers/net/phy/Makefile |   1 +
+ drivers/net/phy/ac200.c  | 234 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 242 insertions(+)
+ create mode 100644 drivers/net/phy/ac200.c
+
+--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
+@@ -63,6 +63,13 @@ config SFP
+ 
+ comment "MII PHY device drivers"
+ 
+config AC200_PHY
+	tristate "AC200 EPHY"
+	depends on NVMEM
+	depends on OF
+	help
+	  Fast ethernet PHY as found in X-Powers AC200 multi-function device.
+
+ config AMD_PHY
+ 	tristate "AMD PHYs"
+ 	help
+--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
+@@ -30,6 +30,7 @@ obj-$(CONFIG_SFP)		+= sfp.o
+ sfp-obj-$(CONFIG_SFP)		+= sfp-bus.o
+ obj-y				+= $(sfp-obj-y) $(sfp-obj-m)
+ 
+obj-$(CONFIG_AC200_PHY)		+= ac200.o
+ obj-$(CONFIG_ADIN_PHY)		+= adin.o
+ obj-$(CONFIG_AMD_PHY)		+= amd.o
+ aquantia-objs			+= aquantia_main.o
+--- /dev/null
+++ b/drivers/net/phy/ac200.c
+@@ -0,0 +1,234 @@
+// SPDX-License-Identifier: GPL-2.0+
+/**
+ * Driver for AC200 Ethernet PHY
+ *
+ * Copyright (c) 2019 Jernej Skrabec <jernej.skrabec@siol.net>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mfd/ac200.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of.h>
+#include <linux/phy.h>
+#include <linux/platform_device.h>
+
+#define AC200_EPHY_ID			0x00441400
+#define AC200_EPHY_ID_MASK		0x0ffffff0
+
+/* macros for system ephy control 0 register */
+#define AC200_EPHY_RESET_INVALID	BIT(0)
+#define AC200_EPHY_SYSCLK_GATING	BIT(1)
+
+/* macros for system ephy control 1 register */
+#define AC200_EPHY_E_EPHY_MII_IO_EN	BIT(0)
+#define AC200_EPHY_E_LNK_LED_IO_EN	BIT(1)
+#define AC200_EPHY_E_SPD_LED_IO_EN	BIT(2)
+#define AC200_EPHY_E_DPX_LED_IO_EN	BIT(3)
+
+/* macros for ephy control register */
+#define AC200_EPHY_SHUTDOWN		BIT(0)
+#define AC200_EPHY_LED_POL		BIT(1)
+#define AC200_EPHY_CLK_SEL		BIT(2)
+#define AC200_EPHY_ADDR(x)		(((x) & 0x1F) << 4)
+#define AC200_EPHY_XMII_SEL		BIT(11)
+#define AC200_EPHY_CALIB(x)		(((x) & 0xF) << 12)
+
+struct ac200_ephy_dev {
+	struct phy_driver	*ephy;
+	struct regmap		*regmap;
+};
+
+static char *ac200_phy_name = "AC200 EPHY";
+
+static void disable_intelligent_ieee(struct phy_device *phydev)
+{
+	unsigned int value;
+
+	phy_write(phydev, 0x1f, 0x0100);	/* switch to page 1 */
+	value = phy_read(phydev, 0x17);
+	value &= ~BIT(3);			/* disable IEEE */
+	phy_write(phydev, 0x17, value);
+	phy_write(phydev, 0x1f, 0x0000);	/* switch to page 0 */
+}
+
+static void disable_802_3az_ieee(struct phy_device *phydev)
+{
+	unsigned int value;
+
+	phy_write(phydev, 0xd, 0x7);
+	phy_write(phydev, 0xe, 0x3c);
+	phy_write(phydev, 0xd, BIT(14) | 0x7);
+	value = phy_read(phydev, 0xe);
+	value &= ~BIT(1);
+	phy_write(phydev, 0xd, 0x7);
+	phy_write(phydev, 0xe, 0x3c);
+	phy_write(phydev, 0xd, BIT(14) | 0x7);
+	phy_write(phydev, 0xe, value);
+
+	phy_write(phydev, 0x1f, 0x0200);	/* switch to page 2 */
+	phy_write(phydev, 0x18, 0x0000);
+}
+
+static int ac200_ephy_config_init(struct phy_device *phydev)
+{
+	const struct ac200_ephy_dev *priv = phydev->drv->driver_data;
+	unsigned int value;
+	int ret;
+
+	phy_write(phydev, 0x1f, 0x0100);	/* Switch to Page 1 */
+	phy_write(phydev, 0x12, 0x4824);	/* Disable APS */
+
+	phy_write(phydev, 0x1f, 0x0200);	/* Switch to Page 2 */
+	phy_write(phydev, 0x18, 0x0000);	/* PHYAFE TRX optimization */
+
+	phy_write(phydev, 0x1f, 0x0600);	/* Switch to Page 6 */
+	phy_write(phydev, 0x14, 0x708f);	/* PHYAFE TX optimization */
+	phy_write(phydev, 0x13, 0xF000);	/* PHYAFE RX optimization */
+	phy_write(phydev, 0x15, 0x1530);
+
+	phy_write(phydev, 0x1f, 0x0800);	/* Switch to Page 6 */
+	phy_write(phydev, 0x18, 0x00bc);	/* PHYAFE TRX optimization */
+
+	disable_intelligent_ieee(phydev);	/* Disable Intelligent IEEE */
+	disable_802_3az_ieee(phydev);		/* Disable 802.3az IEEE */
+	phy_write(phydev, 0x1f, 0x0000);	/* Switch to Page 0 */
+
+	value = (phydev->interface == PHY_INTERFACE_MODE_RMII) ?
+		AC200_EPHY_XMII_SEL : 0;
+	ret = regmap_update_bits(priv->regmap, AC200_EPHY_CTL,
+				 AC200_EPHY_XMII_SEL, value);
+	if (ret)
+		return ret;
+
+	/* FIXME: This is probably H6 specific */
+	value = phy_read(phydev, 0x13);
+	value |= BIT(12);
+	phy_write(phydev, 0x13, value);
+
+	return 0;
+}
+
+static const struct mdio_device_id __maybe_unused ac200_ephy_phy_tbl[] = {
+	{ AC200_EPHY_ID, AC200_EPHY_ID_MASK },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(mdio, ac200_ephy_phy_tbl);
+
+static int ac200_ephy_probe(struct platform_device *pdev)
+{
+	struct ac200_dev *ac200 = dev_get_drvdata(pdev->dev.parent);
+	struct device *dev = &pdev->dev;
+	struct ac200_ephy_dev *priv;
+	struct nvmem_cell *calcell;
+	struct phy_driver *ephy;
+	u16 *caldata, calib;
+	size_t callen;
+	int ret;
+
+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	ephy = devm_kzalloc(dev, sizeof(*ephy), GFP_KERNEL);
+	if (!ephy)
+		return -ENOMEM;
+
+	calcell = devm_nvmem_cell_get(dev, "ephy_calib");
+	if (IS_ERR(calcell)) {
+		dev_err(dev, "Unable to find calibration data!\n");
+		return PTR_ERR(calcell);
+	}
+
+	caldata = nvmem_cell_read(calcell, &callen);
+	if (IS_ERR(caldata)) {
+		dev_err(dev, "Unable to read calibration data!\n");
+		return PTR_ERR(caldata);
+	}
+
+	if (callen != 2) {
+		dev_err(dev, "Calibration data has wrong length: 2 != %lu\n",
+			callen);
+		kfree(caldata);
+		return -EINVAL;
+	}
+
+	calib = *caldata + 3;
+	kfree(caldata);
+
+	ephy->phy_id = AC200_EPHY_ID;
+	ephy->phy_id_mask = AC200_EPHY_ID_MASK;
+	ephy->name = ac200_phy_name;
+	ephy->driver_data = priv;
+	ephy->soft_reset = genphy_soft_reset;
+	ephy->config_init = ac200_ephy_config_init;
+	ephy->suspend = genphy_suspend;
+	ephy->resume = genphy_resume;
+
+	priv->ephy = ephy;
+	priv->regmap = ac200->regmap;
+	platform_set_drvdata(pdev, priv);
+
+	ret = regmap_write(ac200->regmap, AC200_SYS_EPHY_CTL0,
+			   AC200_EPHY_RESET_INVALID |
+			   AC200_EPHY_SYSCLK_GATING);
+	if (ret)
+		return ret;
+
+	ret = regmap_write(ac200->regmap, AC200_SYS_EPHY_CTL1,
+			   AC200_EPHY_E_EPHY_MII_IO_EN |
+			   AC200_EPHY_E_LNK_LED_IO_EN |
+			   AC200_EPHY_E_SPD_LED_IO_EN |
+			   AC200_EPHY_E_DPX_LED_IO_EN);
+	if (ret)
+		return ret;
+
+	ret = regmap_write(ac200->regmap, AC200_EPHY_CTL,
+			   AC200_EPHY_LED_POL |
+			   AC200_EPHY_CLK_SEL |
+			   AC200_EPHY_ADDR(1) |
+			   AC200_EPHY_CALIB(calib));
+	if (ret)
+		return ret;
+
+	ret = phy_driver_register(priv->ephy, THIS_MODULE);
+	if (ret) {
+		dev_err(dev, "Unable to register phy\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+static int ac200_ephy_remove(struct platform_device *pdev)
+{
+	struct ac200_ephy_dev *priv = platform_get_drvdata(pdev);
+
+	phy_driver_unregister(priv->ephy);
+
+	regmap_write(priv->regmap, AC200_EPHY_CTL, AC200_EPHY_SHUTDOWN);
+	regmap_write(priv->regmap, AC200_SYS_EPHY_CTL1, 0);
+	regmap_write(priv->regmap, AC200_SYS_EPHY_CTL0, 0);
+
+	return 0;
+}
+
+static const struct of_device_id ac200_ephy_match[] = {
+	{ .compatible = "x-powers,ac200-ephy" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, ac200_ephy_match);
+
+static struct platform_driver ac200_ephy_driver = {
+	.probe		= ac200_ephy_probe,
+	.remove		= ac200_ephy_remove,
+	.driver		= {
+		.name		= "ac200-ephy",
+		.of_match_table	= ac200_ephy_match,
+	},
+};
+module_platform_driver(ac200_ephy_driver);
+
+MODULE_AUTHOR("Jernej Skrabec <jernej.skrabec@siol.net>");
+MODULE_DESCRIPTION("AC200 Ethernet PHY driver");
+MODULE_LICENSE("GPL");
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/orange-pi-3lts-6_1.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/orange-pi-3lts-6_1.scc
@@ -0,0 +1,8 @@
+# K metadata for orangepi lts
+#  version 6.1 
+
+patch Input-axp20x-pek-allow-wakeup-after-shutdown-6_1.patch
+patch mfd-Add-support-for-AC200.patch                 
+patch net-phy-Add-support-for-AC200-EPHY.patch
+
+include orange-pi-3lts-common.scc
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/orange-pi-3lts-common.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/orange-pi-3lts-common.scc
@@ -2,9 +2,11 @@
 #

 patch clk-Implement-protected-clocks-for-all-OF-clock-prov.patch
+patch Revert-clk-qcom-Support-protected-clocks-property.patch   
 patch rtc-sun6i-Allow-RTC-wakeup-after-shutdown.patch      
 patch firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch
 patch arm64-dts-allwinner-h6-Add-SCPI-protocol.patch   
+patch ASoC-hdmi-codec-fix-channel-allocation.patch               
 patch arm64-dts-h6-deinterlace.patch                               
 patch HACK-h6-Add-HDMI-sound-card.patch                            
 patch arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch    
@@ -14,6 +16,5 @@ patch arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
 patch iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch 
 patch OrangePi-3-LTS-support.patch 
 patch arm64-dts-allwinner-Enforce-consistent-MMC-numbering.patch
-patch 0001-clk-config-fixup-of_property_for_each_u32-after-land.patch

-kconf hardware orange-pi-3lts.cfg
+kconf harware orange-pi-3lts.cfg
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/uwe5622/uwe5622-6_1.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/uwe5622/uwe5622-6_1.scc
@@ -0,0 +1,10 @@
+
+# Kmeta for uwe5622
+# for 6.1 kernel
+# source: armbian misc drivers
+
+
+patch uwe5622-allwinner.patch 
+patch uwe5622-allwinner-bugfix.patch 
+
+include uwe5622-common.scc
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/uwe5622/uwe5622-allwinner-bugfix.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/uwe5622/uwe5622-allwinner-bugfix.patch
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/uwe5622/uwe5622-allwinner.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/uwe5622/uwe5622-allwinner.patch
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/ap6212/ap6212.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/ap6212/ap6212.scc
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: MIT
-define KFEATURE_DESCRIPTION "AMPAK 6212(A) Wifi / Bluetooth module support"
-
-include features/bluetooth/bluetooth-hciuart.scc
-include features/wifi/wifi-sdio.scc
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/bluetooth/bluetooth-hciuart.cfg
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/bluetooth/bluetooth-hciuart.cfg
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-# Dependencies
-CONFIG_SERIAL_DEV_BUS=y
-CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
-
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIUART_BCM=y
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/bluetooth/bluetooth-hciuart.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/bluetooth/bluetooth-hciuart.scc
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-kconf hardware bluetooth-hciuart.cfg
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/wifi/broadcom-sdio.cfg
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/wifi/broadcom-sdio.cfg
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-CONFIG_WLAN_VENDOR_BROADCOM=y
-
-# brcm80211
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_SDIO=y
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/wifi/wifi-sdio.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/features/wifi/wifi-sdio.scc
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: MIT
-define KFEATURE_DESCRIPTION "Enable SDIO WiFi Drivers"
-define KFEATURE_COMPATIBILITY board
-
-kconf hardware broadcom-sdio.cfg
--- a/recipes-kernel/linux/linux-mainline_5.15.91.bb
+++ b/recipes-kernel/linux/linux-mainline_5.15.91.bb
@@ -0,0 +1,7 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+SRC_URI[sha256sum] = "a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80"
--- a/recipes-kernel/linux/linux-mainline_6.1.9.bb
+++ b/recipes-kernel/linux/linux-mainline_6.1.9.bb
@@ -0,0 +1,25 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+SRC_URI[sha256sum] = "d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b"
+
+SRC_URI:append:orange-pi-zero2  = " \
+        file://defconfig \
+        file://0001-drv-wireless-add-uwe5622-wifi-driver.patch \
+        file://0002-drv-wireless-driver-for-uwe5622-allwinner-bugfix.patch \
+        file://0003-drv-fix-incldue-path-for-unisocwcn.patch \
+        file://0004-drv-wireless-adapt-uwe5622-wifi-driver-to-kernel-6.1.patch \
+        file://0005-drv-fix-setting-mac-address-for-netdev-in-uwe5622.patch \
+        file://0006-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch \
+        file://0007-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch \
+        file://0008-drv-add-sunxi-addr-driver.patch \
+        file://0009-dts-add-addr_mgt-device-tree-node.patch \
+        file://0010-dts-add-wifi-power-regulator.patch \
+        file://0011-dts-add-usb-to-h616.patch \
+        file://0012-dts-orange-pi-zero2.patch \
+"
+KERNEL_FEATURES:append:orange-pi-3lts = " bsp/orange-pi-3lts/orange-pi-3lts-6_1.scc bsp/uwe5622/uwe5622-6_1.scc bsp/orange-pi-3lts/fix-rtc.scc"
+
--- a/recipes-kernel/linux/linux-mainline_6.5.11.bb
+++ b/recipes-kernel/linux/linux-mainline_6.5.11.bb
@@ -0,0 +1,12 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+# Board Specific features
+KERNEL_FEATURES:prepend:orange-pi-3lts = " bsp/orange-pi-3lts/orange-pi-3lts-6_5.scc bsp/uwe5622/uwe5622-6_5.scc bsp/orange-pi-3lts/fix-rtc.scc"
+
+
+SRC_URI[sha256sum] = "2ee24af9282b80923b2da56b70aad7df2e8ee4e3f076452e05ba66be2059b519"
+
--- a/recipes-kernel/linux/linux-mainline_6.6.28.bb
+++ b/recipes-kernel/linux/linux-mainline_6.6.28.bb
@@ -0,0 +1,14 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+SRC_URI += "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.tar.xz \
+           file://sunxi-kmeta;type=kmeta;name=sunxi-kmeta;destsuffix=sunxi-kmeta \
+           "
+SRC_URI[sha256sum] = "818716ed13e7dba6aaeae24e3073993e260812ed128d10272e94b922ee6d3394"
+
+
+KERNEL_FEATURES:prepend:orange-pi-3lts = " bsp/orange-pi-3lts/orange-pi-3lts-6_5.scc bsp/uwe5622/uwe5622-6_6.scc bsp/orange-pi-3lts/fix-rtc.scc"
+KERNEL_FEATURES:prepend:orange-pi-zero2 = " bsp/h61x/orangepi-zero2-6_6.scc bsp/uwe5622/uwe5622-6_6.scc "
--- a/recipes-kernel/linux/linux-mainline_6.6.85.bb
+++ b/recipes-kernel/linux/linux-mainline_6.6.85.bb
@@ -1,14 +0,0 @@
-require linux-mainline.inc
-
-DESCRIPTION = "Mainline Longterm Linux kernel"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-SRC_URI += "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.tar.xz \
-           file://sunxi-kmeta;type=kmeta;name=sunxi-kmeta;destsuffix=sunxi-kmeta \
-           "
-SRC_URI[sha256sum] = "5ebaccf4ca3428cd26817bae62171f4efd270eed866a3e3d0a1d9e970b7b7529"
-
-
-KERNEL_FEATURES:append:orange-pi-3lts = " bsp/orange-pi-3lts/orange-pi-3lts-6_5.scc bsp/uwe5622/uwe5622-6_6.scc bsp/orange-pi-3lts/fix-rtc.scc"
-KERNEL_FEATURES:append:orange-pi-zero2 = " bsp/h61x/orangepi-zero2-6_6.scc bsp/uwe5622/uwe5622-6_6.scc"
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -45,8 +45,8 @@ do_configure:prepend() {
    #
    # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
    #
-    if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
-        install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+    if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then
+        install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
        kernel_conf_variable LOGO y
        kernel_conf_variable LOGO_LINUX_CLUT224 y
    fi
--- a/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb
+++ b/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "UWE5622 Wifi firmware"
 LICENSE = "CC0-1.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"

-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"

 COMPATIBLE_MACHINE = "(orange-pi-zero2|orange-pi-3lts)"

--- a/recipes-kernel/xradio-firmware/xradio-firmware.bb
+++ b/recipes-kernel/xradio-firmware/xradio-firmware.bb
@@ -9,7 +9,7 @@ SRCREV = "761658e1701c77a0a84706754e6db1a25ee60b82"

 COMPATIBLE_MACHINE = "orange-pi-zero"

-SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/armbian/firmware.git;protocol=https"

 S = "${WORKDIR}/git"
Author	SHA1	Message	Date
Marek Belisko	42f4ad510d	Merge pull request #411 from ludiazv/new-opizero2 Support for Orange pi zero 2 for 6.6 LTS	2024-06-17 16:05:33 +02:00
Marek Belisko	a83a18e526	Merge pull request #413 from alperak/master recipes: Switch away from S = WORKDIR and use UNPACKDIR instead of WO…	2024-06-17 16:04:33 +02:00
alperak	33d7e2bb51	recipes: Switch away from S = WORKDIR and use UNPACKDIR instead of WORKDIR - The layer compability has also been updated in this PR. * Using S = ${WORKDIR} is no longer supported. * UNPACKDIR is new contruct for do_unpack things in latest master we should be using that instead of WORKDIR for referencing those files. * We don't know yet what changes will be needed to stay compatible with final styhead, but we already know that the last changes for UNPACKDIR aren't compatible with scarthgap, nanbield or others. https://lists.openembedded.org/g/openembedded-architecture/message/2007 https://docs.yoctoproject.org/dev/ref-manual/variables.html?highlight=unpackdir#term-UNPACKDIR Signed-off-by: alperak <alperyasinak1@gmail.com>	2024-06-05 17:25:20 +03:00
ludiazv	2a408a1350	update opi zero 2 with auto load modules for wifi and bt	2024-05-23 14:28:05 +02:00
ludiazv	31519e547e	remove hack for hdmi out	2024-05-23 14:26:00 +02:00
ludiazv	a2e503b82e	fix/improve MAC address management	2024-05-23 09:55:55 +02:00
ludiazv	4a04ddfb3e	h616 and h618 patches	2024-05-22 14:43:59 +02:00
ludiazv	20e638ef5f	add opizero 2 to 6.6	2024-05-22 12:48:55 +02:00
Marek Belisko	322843f576	pya20: Added support for olinuxino-a20lime2-emmc Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-05-13 09:19:55 +02:00
Marek Belisko	f70de55509	Merge pull request #406 from alperak/master Add Orange Pi Prime machine support	2024-05-09 12:04:53 +02:00
alperak	2f84e8ff67	Add Orange Pi Prime machine support - Ethernet, WiFi, Bluetooth, USBs are working fine but HDMI is working until U-Boot loading the kernel. Then it stop working. - Tested with core-image-base and kernel mainline 6.6.28 Signed-off-by: alperak <alperyasinak1@gmail.com>	2024-05-08 22:58:22 +03:00
Marek Belisko	3429331a8c	Merge pull request #409 from SaskatoonTechworks/dankm/issues Fix various Yocto compatibility issues	2024-05-07 22:05:00 +02:00
Dan McGregor	05ff172139	trusted-firmware: Make append machine specific	2024-05-07 10:33:28 -06:00
Dan McGregor	608ae0cc0f	xserver-xorg: don't unconditionally add xshmfence This is only required if dri3 is enabled in the server. It shouldn't be included unconditionally. Arguably this should be put in openembedded-core, but for now it's safe to put here.	2024-05-07 10:26:09 -06:00
Dan McGregor	f8aeeaeddb	linux: change licence name Use SPDX name for the kernel, oe-core changed a long time ago and now we're throwing licence name warnings.	2024-05-07 10:26:09 -06:00
Dan McGregor	b756926593	linux-firmware: Only add firmware to sunxi machines It doesn't make sense to unconditionally include these firmware files on other machines. Gate it on whether we're a sunxi machine.	2024-05-07 10:26:09 -06:00
Marek Belisko	197bc04dac	Merge pull request #405 from ludiazv/new-opi3-lts Basic support for orange pi 3 lts	2024-05-07 13:46:31 +02:00
Marek Belisko	4afe6a0b17	Merge branch 'master' into new-opi3-lts	2024-05-07 13:46:22 +02:00
Marek Belisko	9edbede7bc	u-boot: Fix console for mangopi-mq-r-tt13 board Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-05-07 11:39:54 +02:00
Marek Belisko	2f291239fe	conf/machine: add support for MangoPi MQ-R T113-S3 Signed-off-by: Leo Soares <leojrfs@gmail.com> Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-05-07 11:39:50 +02:00
ludiazv	0c874c99f7	add preferred kernel version to sunxi64	2024-04-28 01:40:51 +02:00
ludiazv	916ecc0e9d	update opi 3lts machine	2024-04-28 01:40:20 +02:00
ludiazv	17b8e40209	add kernel features	2024-04-28 01:39:48 +02:00
ludiazv	c19b5742bd	update uwe5622 patches	2024-04-28 01:39:09 +02:00
ludiazv	0437a1df6b	add kernel patches for orangepi-3lts for 6.1 6.5 kernels(KMETA)	2024-04-25 23:44:57 +02:00
ludiazv	96453886e2	add wifi uwe driver firmware and kernel support(KMETA)	2024-04-25 23:44:57 +02:00
ludiazv	10173513ea	add orange-pi-3lts machine config and u-boot support for this board	2024-04-25 23:44:57 +02:00