Merge pull request #443 from okaestne/chore/kernel-cleanup

chore: clean up old kernel versions and fix KERNEL_DEVICETREE handling

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"

conf/machine/bananapi-m2-berry.conf

@@ -0,0 +1,9 @@
+#@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"

conf/machine/bananapi-m2-zero.conf

@@ -5,6 +5,5 @@
 require conf/machine/include/sun8i.inc
 require conf/machine/include/hardware/ap6212a.inc
 
-KERNEL_DEVICETREE = "sun8i-h2-plus-bananapi-m2-zero.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-bananapi-m2-zero.dtb"
 UBOOT_MACHINE = "bananapi_m2_zero_defconfig"
-

conf/machine/bananapi-m2m.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-r16-bananapi-m2m.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-r16-bananapi-m2m.dtb"
 UBOOT_MACHINE = "Bananapi_m2m_defconfig"
-

conf/machine/bananapi-m2plus.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-bananapi-m2-plus.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-bananapi-m2-plus.dtb"
 UBOOT_MACHINE = "bananapi_m2_plus_h3_defconfig"
-

conf/machine/bananapi.conf

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

conf/machine/cubieboard.conf

@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-cubieboard.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-cubieboard.dtb"
 UBOOT_MACHINE = "Cubieboard_config"
 SUNXI_FEX_FILE = "sys_config/a10/cubieboard.fex"

conf/machine/cubieboard2.conf

@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-cubieboard2.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-cubieboard2.dtb"
 UBOOT_MACHINE = "Cubieboard2_config"
 SUNXI_FEX_FILE = "sys_config/a20/cubieboard2.fex"

conf/machine/cubieboard4.conf

@@ -0,0 +1,11 @@
+#@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"

conf/machine/cubietruck.conf

@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-cubietruck.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-cubietruck.dtb"
 UBOOT_MACHINE = "Cubietruck_config"
 SUNXI_FEX_FILE = "sys_config/a20/cubietruck.fex"

conf/machine/include/hardware/ap6212a.inc

@@ -1,5 +1,9 @@
 # Include for boards with AMPAK 6212A Wifi / Bluetooth module
 # https://linux-sunxi.org/Wifi#Ampak
 
-MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac"
-MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm43430"
+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"

conf/machine/include/hardware/ap6330.inc

@@ -0,0 +1,7 @@
+# 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"

conf/machine/include/sun9i.inc

@@ -0,0 +1,5 @@
+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"

conf/machine/include/sunxi.inc

@@ -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}', '${KERNEL_DEVICETREE}', d)}"
+IMAGE_BOOT_FILES += "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-sunxi', '${SUNXI_FEX_FILE}', d.getVar('KERNEL_DEVICETREE', '').split('/')[-1], 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

conf/machine/include/sunxi64.inc

@@ -4,7 +4,7 @@ include conf/machine/include/soc-family.inc
 MACHINEOVERRIDES =. "sunxi:sunxi64:"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-PREFERRED_VERSION_linux-mainline ?= "6.1.%"
+PREFERRED_VERSION_linux-mainline ?= "6.6.%"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 
@@ -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 ?= "0x400080OB00"
+UBOOT_LOADADDRESS ?= "0x40008000"
 
 #UBOOT_BINARY ?= "u-boot.itb"
 SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
@@ -25,28 +25,8 @@ 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 ${KERNEL_DEVICETREE}"
+IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr ${@d.getVar('KERNEL_DEVICETREE', '').split('/')[-1]}"
 
 WKS_FILES ?= "sunxi-sdcard-image.wks.in"
 WKS_FILE_DEPENDS ?= "virtual/kernel u-boot"

conf/machine/lamobo-r1.conf

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

conf/machine/licheepi-zero.conf

@@ -6,4 +6,4 @@ require conf/machine/include/sun8i.inc
 
 
 UBOOT_MACHINE = "LicheePi_Zero_defconfig"
-KERNEL_DEVICETREE = "sun8i-v3s-licheepi-zero.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-v3s-licheepi-zero.dtb"

conf/machine/mangopi-mq-t-t113.conf

@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: MangoPi MQ-R T113-S3
+#@DESCRIPTION: Machine configuration for the MangoPi MQ-R, based on the Allwinner T113-S3 CPU
+
+require conf/machine/include/sun8i.inc
+
+KERNEL_DEVICETREE = "allwinner/sun8i-t113s-mangopi-mq-r-t113.dtb"
+KERNEL_IMAGETYPE = "zImage"
+
+UBOOT_MACHINE = "mangopi_mq_r_defconfig"

conf/machine/marsboard-a10.conf

@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-marsboard.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-marsboard.dtb"
 UBOOT_MACHINE = "Marsboard_A10_config"
 SUNXI_FEX_FILE = "sys_config/a10/marsboard_a10.fex"

conf/machine/mele.conf

@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-a1000.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-a1000.dtb"
 UBOOT_MACHINE = "Mele_A1000_config"
 SUNXI_FEX_FILE = "sys_config/a10/mele_a1000.fex"

conf/machine/merrii-a80-optimus.conf

@@ -0,0 +1,11 @@
+#@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"

conf/machine/nanopi-m1-plus.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1-plus.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-m1-plus.dtb"
 UBOOT_MACHINE = "nanopi_m1_plus_defconfig"
-

conf/machine/nanopi-m1.conf

@@ -4,5 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-m1.dtb"
 UBOOT_MACHINE = "nanopi_m1_defconfig"

conf/machine/nanopi-neo-air.conf

@@ -5,5 +5,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-neo-air.dtb"
 UBOOT_MACHINE = "nanopi_neo_air_defconfig"

conf/machine/nanopi-neo.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"
-

conf/machine/nanopi-r1.conf

@@ -4,5 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-nanopi-r1.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-nanopi-r1.dtb"
 UBOOT_MACHINE = "nanopi_r1_defconfig"

conf/machine/olinuxino-a10lime.conf

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

conf/machine/olinuxino-a10s.conf

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

conf/machine/olinuxino-a13.conf

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

conf/machine/olinuxino-a20.conf

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

conf/machine/olinuxino-a20lime.conf

@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olinuxino-lime.dtb"
 UBOOT_MACHINE = "A20-OLinuXino-Lime_config"
 SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime.fex"

conf/machine/olinuxino-a20lime2-emmc.conf

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

conf/machine/olinuxino-a20lime2.conf

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

conf/machine/olinuxino-a20som.conf

@@ -5,6 +5,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-olimex-som-evb.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olimex-som-evb.dtb"
 UBOOT_MACHINE = "A20-Olimex-SOM-EVB_config"
 SUNXI_FEX_FILE = "sys_config/a20/olimex_a20_som.fex"

conf/machine/orange-pi-3lts.conf

@@ -1,6 +1,9 @@
 #@TYPE: Machine
 #@NAME: orange-pi-3lts
 #@DESCRIPTION: Machine configuration for the Orange Pi 3 LTS , based on Allwinner H6 CPU
+# Note: Some boards have faulty RTC a fix is included by default
+# a workarround in the dts ins include by default but in can removed adding
+# KERNEL_FEATURES:remove = " bsp/orange-pi-3lts/fix-rtc.scc" to local.conf
 
 require conf/machine/include/sun50i-h6.inc
 
@@ -10,6 +13,16 @@ UBOOT_MACHINE = "orangepi_3_lts_defconfig"
 SPL_BINARY = "u-boot-sunxi-with-spl.bin"
 
 # as for now neither graphics nor audio is supported
-MACHINE_FEATURES:remove = "alsa x11 bluetooth wifi"
-#MACHINE_FEATURES:append = "bluetooth wifi"
+MACHINE_FEATURES:remove = " x11 alsa rtc"
+MACHINE_FEATURES:append = " bluetooth wifi"
+
+# fiwrware needed for wifi + bt
+MACHINE_EXTRA_RRECOMMENDS += " uwe5622-firmware"
+
+# Load modules for wifi & bt
+# Note: fo wifi a custom hci attach userspace sofware is needed that is not included in the layer
+KERNEL_MODULE_AUTOLOAD += " sprdwl_ng sprdbt_tty "
+
+
+
 

conf/machine/orange-pi-lite.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-lite.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-lite.dtb"
 UBOOT_MACHINE = "orangepi_lite_defconfig"
-

conf/machine/orange-pi-one.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"
-

conf/machine/orange-pi-pc-plus.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc-plus.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-pc-plus.dtb"
 UBOOT_MACHINE = "orangepi_pc_plus_defconfig"
-

conf/machine/orange-pi-pc.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-pc.dtb"
 UBOOT_MACHINE = "orangepi_pc_defconfig"
-

conf/machine/orange-pi-prime.conf

@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: orange-pi-prime
+#@DESCRIPTION: Machine configuration for the orange-pi-prime, base on Allwinner H5 CPU
+
+require conf/machine/include/sun50i.inc
+require conf/machine/include/hardware/ap6212a.inc
+
+KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-prime.dtb"
+UBOOT_MACHINE = "orangepi_prime_defconfig"
+
+MACHINE_EXTRA_RRECOMMENDS:append = " linux-firmware-rtl8723"

conf/machine/orange-pi-r1.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-r1.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-orangepi-r1.dtb"
 UBOOT_MACHINE = "orangepi_r1_defconfig"
-

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 = "sun8i-h3-orangepi-zero-plus2.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h3-orangepi-zero-plus2.dtb"
 UBOOT_MACHINE = "orangepi_zero_plus2_h3_defconfig"

conf/machine/orange-pi-zero.conf

@@ -4,6 +4,5 @@
 
 require conf/machine/include/sun8i.inc
 
-KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
+KERNEL_DEVICETREE = "allwinner/sun8i-h2-plus-orangepi-zero.dtb"
 UBOOT_MACHINE = "orangepi_zero_defconfig"
-

conf/machine/orange-pi-zero2.conf

@@ -14,3 +14,8 @@ MACHINE_FEATURES:remove = "alsa x11"
 MACHINE_FEATURES:append = "bluetooth wifi"
 
 MACHINE_EXTRA_RRECOMMENDS = "uwe5622-firmware"
+
+# Load modules for wifi & bt
+# Note: fo wifi a custom hci attach userspace sofware is needed that is not included in the layer
+KERNEL_MODULE_AUTOLOAD += " sprdwl_ng sprdbt_tty "
+

conf/machine/pcduino.conf

@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun4i.inc
 
-KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
+KERNEL_DEVICETREE = "allwinner/sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
 SUNXI_FEX_FILE = "sys_config/a10/pcduino.fex"

conf/machine/pcduino3.conf

@@ -4,6 +4,6 @@
 
 require conf/machine/include/sun7i.inc
 
-KERNEL_DEVICETREE = "sun7i-a20-pcduino3.dtb"
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-pcduino3.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino3_defconfig"
 SUNXI_FEX_FILE = "sys_config/a20/linksprite_pcduino3.fex"

recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend

@@ -1,7 +1,7 @@
-COMPATIBLE_MACHINE = "(sun50i|sun50i-h616|sun50i-h6)"
+COMPATIBLE_MACHINE:sunxi = "(sun50i|sun50i-h616|sun50i-h6)"
 
 TFA_PLATFORM:sun50i = "sun50i_a64"
 TFA_PLATFORM:sun50i-h6 = "sun50i_h6"
 TFA_PLATFORM:sun50i-h616 = "sun50i_h616"
 
-TFA_BUILD_TARGET = "bl31"
+TFA_BUILD_TARGET:sunxi = "bl31"

recipes-bsp/u-boot/files/0001-sunxi-board-Fix-early-PMIC-setup-conditions.patch

@@ -0,0 +1,41 @@
+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
+

recipes-bsp/u-boot/files/0004-OrangePi-3-LTS-support.patch

@@ -3,6 +3,7 @@ From: Juliano Dorigão <jdorigao@gmail.com>
 Date: Fri, 3 Mar 2023 16:11:30 -0400
 Subject: [PATCH] OrangePi 3 LTS support
 
+Upstream-Status: Pending
 ---
  arch/arm/dts/Makefile                     |   1 +
  arch/arm/dts/sun50i-h6-orangepi-3-lts.dts | 361 ++++++++++++++++++++++

recipes-bsp/u-boot/files/0004-mangopi-mq-r-t113-Fix-serial-console.patch

@@ -0,0 +1,30 @@
+From bf813915bf480154c707e0be14016cef94adbd95 Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@gmail.com>
+Date: Tue, 7 May 2024 11:27:08 +0200
+Subject: [PATCH] mangopi-mq-r-t113: Fix serial console
+
+Serial console is on uart3 not on uart0.
+
+Upstream-Status: Inappropriate (for this board only)
+
+Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
+---
+ include/configs/sunxi-common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
+index b8ca77d031..4e4808d2c1 100644
+--- a/include/configs/sunxi-common.h
++++ b/include/configs/sunxi-common.h
+@@ -324,7 +324,7 @@
+ 	MEM_LAYOUT_ENV_EXTRA_SETTINGS \
+ 	DFU_ALT_INFO_RAM \
+ 	"fdtfile=" FDTFILE "\0" \
+-	"console=ttyS0,115200\0" \
++	"console=ttyS3,115200\0" \
+ 	"uuid_gpt_esp=" UUID_GPT_ESP "\0" \
+ 	"uuid_gpt_system=" UUID_GPT_SYSTEM "\0" \
+ 	"partitions=" PARTS_DEFAULT "\0" \
+-- 
+2.25.1
+

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|sun50i)"
+COMPATIBLE_MACHINE:sunxi = "(sun4i|sun5i|sun7i|sun8i|sun9i|sun50i)"
 
 DEFAULT_PREFERENCE:sun4i = "1"
 DEFAULT_PREFERENCE:sun5i = "1"
@@ -12,12 +12,19 @@ DEFAULT_PREFERENCE:sun8i = "1"
 DEFAULT_PREFERENCE:sun50i = "1"
 
 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-OrangePi-3-LTS-support.patch \
-        file://boot.cmd \
+    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-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"
@@ -28,5 +35,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}
 }

recipes-devtools/python/files/olinuxino-a20lime2-emmc

@@ -0,0 +1 @@
+/home/marek/data/projects/kas/sources/meta-sunxi/recipes-devtools/python/files/olinuxino-a20lime2

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 distutils3
+inherit setuptools3
 
 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"

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"

recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend

@@ -1 +1 @@
-DEPENDS += "libxshmfence"
+PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence"

recipes-kernel/armbian-firmware/armbian-firmware_git.bb

@@ -0,0 +1,37 @@
+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))
+}

recipes-kernel/linux-firmware/linux-firmware_%.bbappend

@@ -6,8 +6,21 @@
 # WARNING: The following commit is required for NVRAM files to be included in
 # linux-firmware-bcm43430 package:
 # http://git.openembedded.org/openembedded-core/commit/?id=dde0f79f32fa6bab045ef60199903f74c4cc3393
-do_install:append() {
+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
 }

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-3lts/0001-Input-axp20x-pek-allow-wakeup-after-shutdown.patch

@@ -1,52 +0,0 @@
-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",

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-3lts/0028-mfd-Add-support-for-AC200.patch

@@ -1,406 +0,0 @@
-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 */

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-3lts/0029-net-phy-Add-support-for-AC200-EPHY.patch

@@ -1,276 +0,0 @@
-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");

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-3lts/1004-orange-pi-3-lts-wifi-bt.patch

@@ -1,28 +0,0 @@
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts	2023-07-08 22:25:33.117853247 +0200
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts	2023-07-08 22:26:25.418940556 +0200
-@@ -103,6 +103,25 @@
- 		reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */
- 		post-power-on-delay-ms = <200>;
- 	};
-+
-+	sunxi-info {
-+		compatible = "allwinner,sun50i-h6-sys-info";
-+		status = "okay";
-+	};
-+
-+	addr_mgt: addr-mgt {
-+		compatible = "allwinner,sunxi-addr_mgt";
-+		type_addr_wifi = <0x2>;
-+		type_addr_bt = <0x2>;
-+		type_addr_eth = <0x2>;
-+		status = "okay";
-+	};
-+
-+	dump_reg: dump_reg@20000 {
-+		compatible = "allwinner,sunxi-dump-reg";
-+		reg = <0x0 0x03001000 0x0 0x0f20>;
-+		status = "okay";
-+	};
- };
- 
- &cpu0 {

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0003-drv-fix-incldue-path-for-unisocwcn.patch

@@ -1,45 +0,0 @@
-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
-

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0004-drv-wireless-adapt-uwe5622-wifi-driver-to-kernel-6.1.patch

@@ -1,177 +0,0 @@
-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
-

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0009-dts-add-addr_mgt-device-tree-node.patch

@@ -1,32 +0,0 @@
-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
-

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0011-dts-add-usb-to-h616.patch

@@ -1,184 +0,0 @@
-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
-

recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0012-dts-orange-pi-zero2.patch

@@ -1,84 +0,0 @@
-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
-

recipes-kernel/linux/linux-mainline.inc

@@ -1,29 +1,13 @@
 SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun9i|sun50i)"
 
 inherit kernel
 
 require linux.inc
 
-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")
-}
+LINUX_VERSION = "${PV}"
 
 # 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.
@@ -42,30 +26,30 @@ S = "${WORKDIR}/linux-${PV}"
 KRELEASE = "${@d.getVar('PV', True).split('.')[0]}"
 
 SRC_URI = "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.tar.xz \
-	file://defconfig \
+	   file://defconfig \
+	   file://sunxi-kmeta;type=kmeta;name=sunxi-kmeta;destsuffix=sunxi-kmeta \
 "
 
-# 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 \
+# 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 \
 "
 
 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"
+SRC_URI:append:orange-pi-prime = " \
+	file://0001-dts-sun50i-h5-enable-power-button-for-orange-pi-prime.patch \
+	file://0002-dts-sun50i-h5-orange-pi-prime-add-regulator.patch \
+	file://0003-dts-sun50i-h5-orange-pi-prime-add-rtl8723cs.patch \
+"
 
 FILES_${KERNEL_PACKAGE_NAME}-base:append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"

recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch

@@ -1,87 +0,0 @@
-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";
-+    };
-+};
-+

recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch

@@ -1,101 +0,0 @@
-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;
-+};
-

recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch

@@ -1,28 +0,0 @@
-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
-

recipes-kernel/linux/linux-mainline/6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch

@@ -1,27 +0,0 @@
-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
-

recipes-kernel/linux/linux-mainline/orange-pi-prime/0001-dts-sun50i-h5-enable-power-button-for-orange-pi-prime.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Gunjan Gupta <viraniac@gmail.com>
+Date: Sat, 15 Jul 2023 17:06:17 +0000
+Subject: arm64: dts: sun50i: h5: enable power button for orangepi prime
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+index f430acd8558f..35e09098570f 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+@@ -63,8 +63,9 @@ gpio-keys {
+ 
+ 		key-sw4 {
+ 			label = "sw4";
+-			linux,code = <BTN_0>;
++			linux,code = <KEY_POWER>;
+ 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
++			wakeup-source;
+ 		};
+ 	};
+ 
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/orange-pi-prime/0002-dts-sun50i-h5-orange-pi-prime-add-regulator.patch

@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: The-going <48602507+The-going@users.noreply.github.com>
+Date: Mon, 24 Jan 2022 19:34:31 +0300
+Subject: arm64:dts: sun50i-h5-orangepi-prime add regulator
+
+---
+ .../allwinner/sun50i-h5-orangepi-prime.dts    | 30 +++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+index 998396bc0..6dc6850c1 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+@@ -8,6 +8,7 @@
+ 
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
++#include <dt-bindings/pinctrl/sun4i-a10.h>
+ 
+ / {
+ 	model = "Xunlong Orange Pi Prime";
+@@ -93,6 +94,10 @@ wifi_pwrseq: wifi_pwrseq {
+ 	};
+ };
+ 
++&cpu0 {
++	cpu-supply = <&reg_vdd_cpux>;
++};
++
+ &codec {
+ 	allwinner,audio-routing =
+ 		"Line Out", "LINEOUT",
+@@ -188,6 +193,31 @@ &ohci3 {
+ 	status = "okay";
+ };
+ 
++&r_i2c {
++	status = "okay";
++
++	reg_vdd_cpux: regulator@65 {
++		compatible = "silergy,sy8106a";
++		reg = <0x65>;
++		regulator-name = "vdd-cpux";
++		silergy,fixed-microvolt = <1200000>;
++		/*
++		 * The datasheet uses 1.1V as the minimum value of VDD-CPUX,
++		 * however both the Armbian DVFS table and the official one
++		 * have operating points with voltage under 1.1V, and both
++		 * DVFS table are known to work properly at the lowest
++		 * operating point.
++		 *
++		 * Use 1.0V as the minimum voltage instead.
++		 */
++		regulator-min-microvolt = <1000000>;
++		regulator-max-microvolt = <1400000>;
++		regulator-ramp-delay = <200>;
++		regulator-boot-on;
++		regulator-always-on;
++	};
++};
++
+ &uart0 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&uart0_pa_pins>;
+-- 
+2.25.1

recipes-kernel/linux/linux-mainline/orange-pi-prime/0003-dts-sun50i-h5-orange-pi-prime-add-rtl8723cs.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: The-going <48602507+The-going@users.noreply.github.com>
+Date: Mon, 7 Feb 2022 19:11:07 +0300
+Subject: arm64:dts: sun50i-h5-orangepi-prime add rtl8723cs
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+index 8b92d5e77220..f430acd8558f 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+@@ -25,6 +25,7 @@ reg_vcc3v3: vcc3v3 {
+ 	aliases {
+ 		ethernet0 = &emac;
+ 		serial0 = &uart0;
++		ethernet1 = &rtl8723cs;
+ 	};
+ 
+ 	chosen {
+@@ -174,6 +175,10 @@ &mmc1 {
+ 	bus-width = <4>;
+ 	non-removable;
+ 	status = "okay";
++
++	rtl8723cs: sdio_wifi@1 {
++		reg = <1>;
++	};
+ };
+ 
+ &ohci0 {
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/patches/0001-dts-orangepi-zero-Add-wifi-support.patch

@@ -3,6 +3,8 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
 Date: Tue, 24 Oct 2023 10:40:52 +0200
 Subject: [PATCH] dts: orangepi-zero: Add wifi support
 
+Upstream-Status: Pending
+
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
  .../allwinner/sun8i-h2-plus-orangepi-zero.dts | 46 +++++++++++++++----

recipes-kernel/linux/linux-mainline/patches/0002-dts-nanopi-neo-air-Add-camera-support.patch

@@ -3,6 +3,8 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
 Date: Tue, 24 Oct 2023 10:42:36 +0200
 Subject: [PATCH] dts:nanopi-neo-air: Add camera support
 
+Upstream-Status: Pending
+
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
  .../dts/allwinner/sun8i-h3-nanopi-neo-air.dts | 85 +++++++++++++++++++

recipes-kernel/linux/linux-mainline/patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch

@@ -6,6 +6,8 @@ Subject: [PATCH] dts: allwinner: bananapi-m2-zero: Enforce consistent MMC
 
 Enforce MMC number (sometimes the order was wrong and the device does not boot).
 
+Upstream-Status: Pending
+
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
  arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +++

recipes-kernel/linux/linux-mainline/patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch

@@ -3,6 +3,8 @@ 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
 
+Upstream-Status: Pending
+
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
  arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 3 +++

recipes-kernel/linux/linux-mainline/patches/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch

@@ -0,0 +1,31 @@
+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
+

recipes-kernel/linux/linux-mainline/patches/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch

@@ -0,0 +1,32 @@
+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 {

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/add-nodes-for-sunxi-info-addr-dump-reg.patch

@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: The-going <48602507+The-going@users.noreply.github.com>
+Date: Sat, 16 Apr 2022 11:51:35 +0300
+Subject: add nodes for sunxi-info, sunxi-addr and sunxi-dump-reg
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 19 ++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+index 538c90663602..6365cce07304 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+@@ -1243,6 +1243,25 @@ ths: thermal-sensor@5070400 {
+ 			nvmem-cell-names = "calibration";
+ 			#thermal-sensor-cells = <1>;
+ 		};
++
++		sunxi-info {
++			compatible = "allwinner,sun50i-h6-sys-info";
++			status = "okay";
++		};
++
++		addr_mgt: addr-mgt {
++			compatible = "allwinner,sunxi-addr_mgt";
++			type_addr_wifi = <0x2>;
++			type_addr_bt = <0x2>;
++			type_addr_eth = <0x2>;
++			status = "okay";
++		};
++
++		dump_reg: dump_reg@20000 {
++			compatible = "allwinner,sunxi-dump-reg";
++			reg = <0x0 0x03001000 0x0 0x0f20>;
++			status = "okay";
++		};
+ 	};
+ 
+ 	thermal-zones {
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 98735d39e6e8..5ff1b357a25b 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -1053,6 +1053,25 @@ ths: thermal-sensor@5070400 {
+ 			nvmem-cell-names = "calibration";
+ 			#thermal-sensor-cells = <1>;
+ 		};
++
++		dump_reg: dump_reg@20000 {
++			compatible = "allwinner,sunxi-dump-reg";
++			reg = <0x0 0x03001000 0x0 0x0f20>;
++			status = "okay";
++		};
++
++		sunxi-info {
++			compatible = "allwinner,sun50i-h616-sys-info";
++			status = "okay";
++		};
++
++		addr_mgt: addr-mgt {
++			compatible = "allwinner,sunxi-addr_mgt";
++			type_addr_wifi = <0x2>;
++			type_addr_bt = <0x2>;
++			type_addr_eth = <0x2>;
++			status = "okay";
++		};
+ 	};
+ 
+ 	thermal-zones {
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-device-node-for-SID.patch

@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kali Prasad <kprasadvnsi@protonmail.com>
+Date: Sun, 19 Sep 2021 08:02:27 +0000
+Subject: arm64: dts: allwinner: h616: Add device node for SID
+
+The device tree binding for H616's SID controller.
+
+Signed-off-by: Kali Prasad <kprasadvnsi@protonmail.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 15 ++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 45359b0d317a..7ad1982fb47f 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -171,6 +171,21 @@ ccu: clock@3001000 {
+ 			#reset-cells = <1>;
+ 		};
+ 
++		sid: efuse@3006000 {
++			compatible = "allwinner,sun50i-h616-sid";
++			reg = <0x03006000 0x1000>;
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			cpu_speed_grade: cpu-speed-grade@0 {
++				reg = <0x00 0x02>;
++			};
++
++			ths_calibration: thermal-sensor-calibration@14 {
++				reg = <0x14 0x8>;
++			};
++		};
++
+ 		watchdog: watchdog@30090a0 {
+ 			compatible = "allwinner,sun50i-h616-wdt",
+ 				     "allwinner,sun6i-a31-wdt";
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch

@@ -0,0 +1,473 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AGM1968 <AGM1968@users.noreply.github.com>
+Date: Tue, 23 May 2023 16:43:00 +0000
+Subject: arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2
+ arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi
+ arch/arm64/boot/dts/allwinner/sun50i-h618-cpu-dvfs.dtsi
+ arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+ drivers/cpufreq/cpufreq-dt-platdev.c drivers/cpufreq/sun50i-cpufreq-nvmem.c
+
+Signed-off-by: AGM1968 <AGM1968@users.noreply.github.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi       | 75 ++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-h618-cpu-dvfs.dtsi      | 64 +++++++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi |  1 +
+ arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts |  5 +
+ arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts | 62 ++-----------
+ drivers/cpufreq/cpufreq-dt-platdev.c                         |  2 +
+ drivers/cpufreq/sun50i-cpufreq-nvmem.c                       | 92 +++++++---
+ 7 files changed, 221 insertions(+), 80 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-cpu-dvfs.dtsi
+ 
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi
+new file mode 100644
+index 000000000000..36f2950367c6
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi
+@@ -0,0 +1,75 @@
++//SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++//Testing Version 1  from: AGM1968 <AGM1968@users.noreply.github.com>
++//Noted: PLL_CPUX = 24 MHz*N/P (WIP)
++
++/ {
++	cpu_opp_table: opp-table-cpu {
++		compatible = "allwinner,sun50i-h616-operating-points";
++		nvmem-cells = <&cpu_speed_grade>;
++		opp-shared;
++ 
++		opp-480000000 {
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			opp-hz = /bits/ 64 <480000000>;
++			opp-microvolt-speed0 = <820000 820000 1100000>; 
++			opp-microvolt-speed1 = <880000 880000 1100000>;
++			opp-microvolt-speed2 = <880000 880000 1100000>;
++		};
++	
++		opp-600000000 {
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			opp-hz = /bits/ 64 <600000000>;
++			opp-microvolt-speed0 = <820000 820000 1100000>;
++			opp-microvolt-speed1 = <880000 880000 1100000>;
++			opp-microvolt-speed2 = <880000 880000 1100000>;
++		};
++
++		opp-792000000 {
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			opp-hz = /bits/ 64 <792000000>;
++		        opp-microvolt-speed0 = <860000 860000 1100000>;
++			opp-microvolt-speed1 = <940000 940000 1100000>;
++			opp-microvolt-speed2 = <940000 940000 1100000>;
++		};
++
++		opp-1008000000 {
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			opp-hz = /bits/ 64 <1008000000>;
++			opp-microvolt-speed0 = <900000 900000 1100000>;
++			opp-microvolt-speed1 = <1020000 1020000 1100000>;
++			opp-microvolt-speed2 = <1020000 1020000 1100000>;
++		};
++
++		opp-1200000000 {
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			opp-hz = /bits/ 64 <1200000000>;
++			opp-microvolt-speed0 = <960000 960000 1100000>;
++			opp-microvolt-speed1 = <1100000 1100000 1100000>;
++			opp-microvolt-speed2 = <1100000 1100000 1100000>;
++		};
++
++		opp-1512000000 {
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			opp-hz = /bits/ 64 <1512000000>;
++			opp-microvolt-speed0 = <1100000 1100000 1100000>;
++			opp-microvolt-speed1 = <1100000 1100000 1100000>;
++			opp-microvolt-speed2 = <1100000 1100000 1100000>;
++		};
++	};
++};
++
++&cpu0 {
++	operating-points-v2 = <&cpu_opp_table>;
++};
++ 
++&cpu1 {
++	operating-points-v2 = <&cpu_opp_table>;
++};
++ 
++&cpu2 {
++	operating-points-v2 = <&cpu_opp_table>;
++};
++ 
++&cpu3 {
++	operating-points-v2 = <&cpu_opp_table>;
++};
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+index 0666d16ba7d0..54d706286554 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include "sun50i-h616.dtsi"
++#include "sun50i-h616-cpu-opp.dtsi"
+ 
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+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 8d8009c7f9a3..41a5a4013091 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+@@ -12,6 +12,11 @@ / {
+ 	compatible = "xunlong,orangepi-zero2", "allwinner,sun50i-h616";
+ };
+ 
++&cpu0  {
++	cpu-supply = <&reg_dcdca>;
++	status = "okay";
++};
++
+ &emac0 {
+ 	phy-supply = <&reg_dcdce>;
+ };
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-cpu-dvfs.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h618-cpu-dvfs.dtsi
+new file mode 100644
+index 0000000000000..0509e3fb22e26
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-cpu-dvfs.dtsi
+@@ -0,0 +1,64 @@
++
++
++&r_i2c {
++	status = "okay";
++
++	axp313: pmic@36 {
++		compatible = "x-powers,axp313a";
++		reg = <0x36>;
++		#interrupt-cells = <1>;
++		interrupt-controller;
++		interrupt-parent = <&pio>;
++		interrupts = <2 9 IRQ_TYPE_LEVEL_LOW>;	/* PC9 */
++
++		vin1-supply = <&reg_vcc5v>;
++		vin2-supply = <&reg_vcc5v>;
++		vin3-supply = <&reg_vcc5v>;
++
++		regulators {
++			/* Supplies VCC-PLL and DRAM */
++			reg_aldo1: aldo1 {
++				regulator-always-on;
++				regulator-min-microvolt = <1800000>;
++				regulator-max-microvolt = <1800000>;
++				regulator-name = "vcc1v8";
++			};
++
++			/* Supplies VCC-IO, so needs to be always on. */
++			reg_dldo1: dldo1 {
++				regulator-always-on;
++				regulator-min-microvolt = <3300000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-name = "vcc3v3";
++			};
++
++			reg_dcdc1: dcdc1 {
++				regulator-always-on;
++				regulator-min-microvolt = <810000>;
++				regulator-max-microvolt = <990000>;
++				regulator-step-delay-us = <25>;
++				regulator-final-delay-us = <50>;
++				regulator-name = "vdd-gpu-sys";
++			};
++
++			reg_dcdc2: dcdc2 {
++				regulator-always-on;
++				regulator-min-microvolt = <500000>;
++				regulator-max-microvolt = <1100000>;
++				regulator-step-delay-us = <25>;
++				regulator-final-delay-us = <50>;
++				regulator-ramp-delay = <200>;
++				regulator-name = "vdd-cpu";
++			};
++
++			reg_dcdc3: dcdc3 {
++				regulator-always-on;
++				regulator-min-microvolt = <1100000>;
++				regulator-max-microvolt = <1100000>;
++				regulator-step-delay-us = <25>;
++				regulator-final-delay-us = <50>;
++				regulator-name = "vdd-dram";
++			};
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts
+index 00fe28caac93..edbfc83f390a 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts
+@@ -6,12 +6,18 @@
+ /dts-v1/;
+ 
+ #include "sun50i-h616-orangepi-zero.dtsi"
++#include "sun50i-h618-cpu-dvfs.dtsi"
+ 
+ / {
+ 	model = "OrangePi Zero3";
+ 	compatible = "xunlong,orangepi-zero3", "allwinner,sun50i-h618";
+ };
+ 
++&cpu0 {
++	cpu-supply = <&reg_dcdc2>;
++	status = "okay";
++};
++
+ &emac0 {
+ 	phy-supply = <&reg_dldo1>;
+ };
+@@ -31,62 +37,6 @@ &mmc0 {
+ 	vmmc-supply = <&reg_dldo1>;
+ };
+ 
+-&r_i2c {
+-	status = "okay";
+-
+-	axp313: pmic@36 {
+-		compatible = "x-powers,axp313a";
+-		reg = <0x36>;
+-		#interrupt-cells = <1>;
+-		interrupt-controller;
+-		interrupt-parent = <&pio>;
+-		interrupts = <2 9 IRQ_TYPE_LEVEL_LOW>;	/* PC9 */
+-
+-		vin1-supply = <&reg_vcc5v>;
+-		vin2-supply = <&reg_vcc5v>;
+-		vin3-supply = <&reg_vcc5v>;
+-
+-		regulators {
+-			/* Supplies VCC-PLL, so needs to be always on. */
+-			reg_aldo1: aldo1 {
+-				regulator-always-on;
+-				regulator-min-microvolt = <1800000>;
+-				regulator-max-microvolt = <1800000>;
+-				regulator-name = "vcc1v8";
+-			};
+-
+-			/* Supplies VCC-IO, so needs to be always on. */
+-			reg_dldo1: dldo1 {
+-				regulator-always-on;
+-				regulator-min-microvolt = <3300000>;
+-				regulator-max-microvolt = <3300000>;
+-				regulator-name = "vcc3v3";
+-			};
+-
+-			reg_dcdc1: dcdc1 {
+-				regulator-always-on;
+-				regulator-min-microvolt = <810000>;
+-				regulator-max-microvolt = <990000>;
+-				regulator-name = "vdd-gpu-sys";
+-			};
+-
+-			reg_dcdc2: dcdc2 {
+-				regulator-always-on;
+-				regulator-min-microvolt = <810000>;
+-				regulator-max-microvolt = <1100000>;
+-				regulator-name = "vdd-cpu";
+-			};
+-
+-			reg_dcdc3: dcdc3 {
+-				regulator-always-on;
+-				regulator-min-microvolt = <1100000>;
+-				regulator-max-microvolt = <1100000>;
+-				regulator-name = "vdd-dram";
+-			};
+-		};
+-	};
+-};
+-
+ &pio {
+ 	vcc-pc-supply = <&reg_dldo1>;
+ 	vcc-pf-supply = <&reg_dldo1>;
+diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
+index fb2875ce1fdd..e63d36839769 100644
+--- a/drivers/cpufreq/cpufreq-dt-platdev.c
++++ b/drivers/cpufreq/cpufreq-dt-platdev.c
+@@ -104,6 +104,8 @@ static const struct of_device_id allowlist[] __initconst = {
+  */
+ static const struct of_device_id blocklist[] __initconst = {
+ 	{ .compatible = "allwinner,sun50i-h6", },
++	{ .compatible = "allwinner,sun50i-h616", },
++	{ .compatible = "allwinner,sun50i-h618", },
+ 
+ 	{ .compatible = "apple,arm-platform", },
+ 
+diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
+index 6845ab5034ec..5d85bfe475de 100644
+--- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c
++++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
+@@ -6,6 +6,9 @@
+  * provide the OPP framework with required information.
+  *
+  * Copyright (C) 2019 Yangtao Li <tiny.windzz@gmail.com>
++ *
++ * ADD efuse_xlate to extract SoC version so that h6 and h616 can coexist.
++ * Version 1 AGM1968 <AGM1968@users.noreply.github.com>
+  */
+ 
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+@@ -20,25 +23,62 @@
+ 
+ #define MAX_NAME_LEN	7
+ 
+-#define NVMEM_MASK	0x7
+-#define NVMEM_SHIFT	5
++#define SUN50I_H616_NVMEM_MASK 0x22
++#define SUN50I_H616_NVMEM_SHIFT 5
++#define SUN50I_H6_NVMEM_MASK 0x7
++#define SUN50I_H6_NVMEM_SHIFT 5
++
++struct sunxi_cpufreq_soc_data {
++	u32 (*efuse_xlate) (void *efuse);
++};
+ 
+ static struct platform_device *cpufreq_dt_pdev, *sun50i_cpufreq_pdev;
+ 
++static u32 sun50i_h616_efuse_xlate(void *efuse)
++{
++   u32 efuse_value = (*(u32 *)efuse >> SUN50I_H616_NVMEM_SHIFT) &
++             SUN50I_H616_NVMEM_MASK;
++
++   /* Tested as V1 h616 soc. Expected efuse values are 1 - 3,
++      slowest to fastest */
++   if (efuse_value >=1 && efuse_value <= 3)
++       return efuse_value - 1;
++   else
++       return 0;
++};
++
++static u32 sun50i_h6_efuse_xlate(void *efuse)
++{
++   u32 efuse_value = (*(u32 *)efuse >> SUN50I_H6_NVMEM_SHIFT) &
++             SUN50I_H6_NVMEM_MASK;
++
++   /*
++    * We treat unexpected efuse values as if the SoC was from
++    * the slowest bin. Expected efuse values are 1 - 3, slowest
++    * to fastest.
++   */
++   if (efuse_value >= 1 && efuse_value <= 3)
++       return efuse_value - 1;
++   else
++       return 0;
++};
++
++
+ /**
+  * sun50i_cpufreq_get_efuse() - Determine speed grade from efuse value
++ * @soc_data: pointer to sunxi_cpufreq_soc_data context
+  * @versions: Set to the value parsed from efuse
+  *
+  * Returns 0 if success.
+  */
+-static int sun50i_cpufreq_get_efuse(u32 *versions)
++static int sun50i_cpufreq_get_efuse(const struct sunxi_cpufreq_soc_data *soc_data,
++		u32 *versions)
+ {
+ 	struct nvmem_cell *speedbin_nvmem;
+ 	struct device_node *np;
+ 	struct device *cpu_dev;
+-	u32 *speedbin, efuse_value;
++	u32 *speedbin;
+ 	size_t len;
+-	int ret;
+ 
+ 	cpu_dev = get_cpu_device(0);
+ 	if (!cpu_dev)
+@@ -47,10 +87,9 @@ static int sun50i_cpufreq_get_efuse(u32 *versions)
+ 	np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
+ 	if (!np)
+ 		return -ENOENT;
+-
+-	ret = of_device_is_compatible(np,
+-				      "allwinner,sun50i-h6-operating-points");
+-	if (!ret) {
++	if (of_device_is_compatible(np, "allwinner,sun50i-h6-operating-points")) {}
++	else if (of_device_is_compatible(np, "allwinner,sun50i-h616-operating-points")) {}
++	else {
+ 		of_node_put(np);
+ 		return -ENOENT;
+ 	}
+@@ -66,17 +105,7 @@ static int sun50i_cpufreq_get_efuse(u32 *versions)
+ 	if (IS_ERR(speedbin))
+ 		return PTR_ERR(speedbin);
+ 
+-	efuse_value = (*speedbin >> NVMEM_SHIFT) & NVMEM_MASK;
+-
+-	/*
+-	 * We treat unexpected efuse values as if the SoC was from
+-	 * the slowest bin. Expected efuse values are 1-3, slowest
+-	 * to fastest.
+-	 */
+-	if (efuse_value >= 1 && efuse_value <= 3)
+-		*versions = efuse_value - 1;
+-	else
+-		*versions = 0;
++	*versions = soc_data->efuse_xlate(speedbin);
+ 
+ 	kfree(speedbin);
+ 	return 0;
+@@ -84,18 +113,23 @@ static int sun50i_cpufreq_get_efuse(u32 *versions)
+ 
+ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev)
+ {
++	const struct of_device_id *match;
+ 	int *opp_tokens;
+ 	char name[MAX_NAME_LEN];
+ 	unsigned int cpu;
+ 	u32 speed = 0;
+ 	int ret;
+ 
++	match = dev_get_platdata(&pdev->dev);
++	if (!match)
++		return -EINVAL;
++
+ 	opp_tokens = kcalloc(num_possible_cpus(), sizeof(*opp_tokens),
+ 			     GFP_KERNEL);
+ 	if (!opp_tokens)
+ 		return -ENOMEM;
+ 
+-	ret = sun50i_cpufreq_get_efuse(&speed);
++	ret = sun50i_cpufreq_get_efuse(match-> data, &speed);
+ 	if (ret) {
+ 		kfree(opp_tokens);
+ 		return ret;
+@@ -159,8 +193,18 @@ static struct platform_driver sun50i_cpufreq_driver = {
+ 	},
+ };
+ 
++static const struct sunxi_cpufreq_soc_data sun50i_h616_data = {
++    .efuse_xlate = sun50i_h616_efuse_xlate,
++};
++
++static const struct sunxi_cpufreq_soc_data sun50i_h6_data = {
++    .efuse_xlate = sun50i_h6_efuse_xlate,
++};
++
+ static const struct of_device_id sun50i_cpufreq_match_list[] = {
+-	{ .compatible = "allwinner,sun50i-h6" },
++	{ .compatible = "allwinner,sun50i-h6", .data = &sun50i_h6_data },
++        { .compatible = "allwinner,sun50i-h616", .data = &sun50i_h616_data },
++        { .compatible = "allwinner,sun50i-h618", .data = &sun50i_h616_data },
+ 	{}
+ };
+ MODULE_DEVICE_TABLE(of, sun50i_cpufreq_match_list);
+@@ -196,8 +239,8 @@ static int __init sun50i_cpufreq_init(void)
+ 		return ret;
+ 
+ 	sun50i_cpufreq_pdev =
+-		platform_device_register_simple("sun50i-cpufreq-nvmem",
+-						-1, NULL, 0);
++		platform_device_register_data(NULL,
++		"sun50i-cpufreq-nvmem", -1, match, sizeof(*match));
+ 	ret = PTR_ERR_OR_ZERO(sun50i_cpufreq_pdev);
+ 	if (ret == 0)
+ 		return 0;
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-thermal-sensor-and-thermal-zones.patch

@@ -0,0 +1,135 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kali Prasad <kprasadvnsi@protonmail.com>
+Date: Sun, 19 Sep 2021 08:02:27 +0000
+Subject: arm64: dts: allwinner: h616: Add thermal sensor and thermal zones
+
+There are four sensors, CPU, GPU, VE, and DDR.
+
+Signed-off-by: Kali Prasad <kprasadvnsi@protonmail.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 75 ++++++++++
+ 1 file changed, 75 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 7ad1982fb47f..8628a9e3dfca 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -9,6 +9,7 @@
+ #include <dt-bindings/clock/sun6i-rtc.h>
+ #include <dt-bindings/reset/sun50i-h616-ccu.h>
+ #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
++#include <dt-bindings/thermal/thermal.h>
+ 
+ / {
+ 	interrupt-parent = <&gic>;
+@@ -25,6 +26,8 @@ cpu0: cpu@0 {
+ 			reg = <0>;
+ 			enable-method = "psci";
+ 			clocks = <&ccu CLK_CPUX>;
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			#cooling-cells = <2>;
+ 		};
+ 
+ 		cpu1: cpu@1 {
+@@ -33,6 +36,8 @@ cpu1: cpu@1 {
+ 			reg = <1>;
+ 			enable-method = "psci";
+ 			clocks = <&ccu CLK_CPUX>;
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			#cooling-cells = <2>;
+ 		};
+ 
+ 		cpu2: cpu@2 {
+@@ -41,6 +46,8 @@ cpu2: cpu@2 {
+ 			reg = <2>;
+ 			enable-method = "psci";
+ 			clocks = <&ccu CLK_CPUX>;
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			#cooling-cells = <2>;
+ 		};
+ 
+ 		cpu3: cpu@3 {
+@@ -49,6 +56,8 @@ cpu3: cpu@3 {
+ 			reg = <3>;
+ 			enable-method = "psci";
+ 			clocks = <&ccu CLK_CPUX>;
++			clock-latency-ns = <244144>; /* 8 32k periods */
++			#cooling-cells = <2>;
+ 		};
+ 	};
+ 
+@@ -833,5 +842,71 @@ r_rsb: rsb@7083000 {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 		};
++
++		ths: thermal-sensor@5070400 {
++			compatible = "allwinner,sun50i-h616-ths";
++			reg = <0x05070400 0x400>;
++			interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
++			clocks = <&ccu CLK_BUS_THS>;
++			clock-names = "bus";
++			resets = <&ccu RST_BUS_THS>;
++			nvmem-cells = <&ths_calibration>;
++			nvmem-cell-names = "calibration";
++			#thermal-sensor-cells = <1>;
++		};
++	};
++
++	thermal-zones {
++		cpu-thermal {
++			polling-delay-passive = <500>;
++			polling-delay = <1000>;
++			thermal-sensors = <&ths 2>;
++			sustainable-power = <1000>;
++			k_po = <20>;
++			k_pu = <40>;
++			k_i = <0>;
++
++			trips {
++				cpu_threshold: trip-point@0 {
++					temperature = <60000>;
++					type = "passive";
++					hysteresis = <0>;
++				};
++				cpu_target: trip-point@1 {
++					temperature = <70000>;
++					type = "passive";
++					hysteresis = <0>;
++				};
++			};
++
++			cooling-maps {
++				map0 {
++					trip = <&cpu_target>;
++					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++							 <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++							 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++				};
++			};
++		};
++
++		gpu-thermal {
++			polling-delay-passive = <500>;
++			polling-delay = <1000>;
++			thermal-sensors = <&ths 0>;
++			sustainable-power = <1100>;
++		};
++
++		ve-thermal {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&ths 1>;
++		};
++
++		ddr-thermal {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&ths 3>;
++		};
+ 	};
+ };
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Fix-thermal-zones-missing-trips.patch

@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
+ <michal.dziekonski+github@gmail.com>
+Date: Wed, 3 May 2023 12:17:28 +0000
+Subject: arm64: dts: allwinner: h616: Fix thermal zones (add missing trips)
+
+Signed-off-by: Michal Dziekonski <michal.dziekonski+github@gmail.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 29 ++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 8628a9e3dfca..17b13d3193cc 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -877,6 +877,11 @@ cpu_target: trip-point@1 {
+ 					type = "passive";
+ 					hysteresis = <0>;
+ 				};
++				cpu_temp_critical: trip-point@2 {
++					temperature = <110000>;
++					type = "critical";
++					hysteresis = <0>;
++				};
+ 			};
+ 
+ 			cooling-maps {
+@@ -895,18 +900,42 @@ gpu-thermal {
+ 			polling-delay = <1000>;
+ 			thermal-sensors = <&ths 0>;
+ 			sustainable-power = <1100>;
++
++			trips {
++				gpu_temp_critical: trip-point@0 {
++					temperature = <110000>;
++					type = "critical";
++					hysteresis = <0>;
++				};
++			};
+ 		};
+ 
+ 		ve-thermal {
+ 			polling-delay-passive = <0>;
+ 			polling-delay = <0>;
+ 			thermal-sensors = <&ths 1>;
++
++			trips {
++				ve_temp_critical: trip-point@0 {
++					temperature = <110000>;
++					type = "critical";
++					hysteresis = <0>;
++				};
++			};
+ 		};
+ 
+ 		ddr-thermal {
+ 			polling-delay-passive = <0>;
+ 			polling-delay = <0>;
+ 			thermal-sensors = <&ths 3>;
++
++			trips {
++				ddr_temp_critical: trip-point@0 {
++					temperature = <110000>;
++					type = "critical";
++					hysteresis = <0>;
++				};
++			};
+ 		};
+ 	};
+ };
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch

@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AGM1968 <AGM1968@users.noreply.github.com>
+Date: Wed, 31 May 2023 08:12:00 +0000
+Subject: LED-green_power_on-red_status_heartbeat
+ arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+
+Signed-off-by: AGM1968 <AGM1968@users.noreply.github.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+index 0666d16ba7d0..19451a0c85ae 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+@@ -26,16 +26,17 @@ leds {
+ 		compatible = "gpio-leds";
+ 
+ 		led-0 {
+-			function = LED_FUNCTION_POWER;
++			function = LED_FUNCTION_STATUS;
+ 			color = <LED_COLOR_ID_RED>;
+ 			gpios = <&pio 2 12 GPIO_ACTIVE_HIGH>; /* PC12 */
+-			default-state = "on";
++			linux,default-trigger = "heartbeat";
+ 		};
+ 
+ 		led-1 {
+-			function = LED_FUNCTION_STATUS;
++			function = LED_FUNCTION_POWER;
+ 			color = <LED_COLOR_ID_GREEN>;
+ 			gpios = <&pio 2 13 GPIO_ACTIVE_HIGH>; /* PC13 */
++			default-state = "on";
+ 		};
+ 	};
+ 
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch

@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jernej Skrabec <jernej.skrabec@gmail.com>
+Date: Fri, 15 Oct 2021 21:07:46 +0200
+Subject: arm64:dts: allwinner: sun50i-h616 Add GPU node
+
+Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 14 ++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 44f8ae11ca16..26ef79c5d895 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -108,6 +108,20 @@ soc {
+ 		#size-cells = <1>;
+ 		ranges = <0x0 0x0 0x0 0x40000000>;
+ 
++		gpu: gpu@1800000 {
++			compatible = "allwinner,sun50i-h616-mali",
++				     "arm,mali-bifrost";
++			reg = <0x1800000 0x40000>;
++			interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
++				     <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,
++				     <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "job", "mmu", "gpu";
++			clocks = <&ccu CLK_GPU0>, <&ccu CLK_BUS_GPU>;
++			clock-names = "core", "bus";
++			resets = <&ccu RST_BUS_GPU>;
++			status = "disabled";
++		};
++
+ 		syscon: syscon@3000000 {
+ 			compatible = "allwinner,sun50i-h616-system-control";
+ 			reg = <0x03000000 0x1000>;
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch

@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jernej Skrabec <jernej.skrabec@gmail.com>
+Date: Fri, 15 Oct 2021 21:14:55 +0200
+Subject: arm64:dts:allwinner: sun50i-h616 Add VPU node
+
+Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 24 ++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 26ef79c5d895..944ff2747d27 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -122,6 +122,17 @@ gpu: gpu@1800000 {
+ 			status = "disabled";
+ 		};
+ 
++		video-codec@1c0e000 {
++			compatible = "allwinner,sun50i-h616-video-engine";
++			reg = <0x01c0e000 0x2000>;
++			clocks = <&ccu CLK_BUS_VE>, <&ccu CLK_VE>,
++				 <&ccu CLK_MBUS_VE>;
++			clock-names = "ahb", "mod", "ram";
++			resets = <&ccu RST_BUS_VE>;
++			interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
++			allwinner,sram = <&ve_sram 1>;
++		};
++
+ 		syscon: syscon@3000000 {
+ 			compatible = "allwinner,sun50i-h616-system-control";
+ 			reg = <0x03000000 0x1000>;
+@@ -136,6 +147,19 @@ sram_c: sram@28000 {
+ 				#size-cells = <1>;
+ 				ranges = <0 0x00028000 0x30000>;
+ 			};
++
++			sram_c1: sram@1a00000 {
++				compatible = "mmio-sram";
++				reg = <0x01a00000 0x200000>;
++				#address-cells = <1>;
++				#size-cells = <1>;
++				ranges = <0 0x01a00000 0x200000>;
++
++				ve_sram: sram-section@0 {
++					compatible = "allwinner,sun50i-h616-sram-c1";
++					reg = <0x000000 0x200000>;
++				};
++			};
+ 		};
+ 
+ 		ccu: clock@3001000 {
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch

@@ -0,0 +1,39 @@
+From a3e54a502cf754b148a8ad06580a3c256bc42b09 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <pyavitz@xxxxx.com>
+Date: Thu, 22 Feb 2024 19:31:11 -0500
+Subject: [PATCH] arch: arm64: dts: allwinner: sun50i-h616: PG 12c pins
+
+pins = "PG17", "PG18";
+pins = "PG15", "PG16";
+
+Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 17df57e2db0a..e5ce4214a43b 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -334,6 +334,18 @@ i2c4_ph_pins: i2c4-ph-pins {
+ 				function = "i2c4";
+ 			};
+ 
++			/omit-if-no-ref/
++			i2c3_pg_pins: i2c3-pg-pins {
++				pins = "PG17", "PG18";
++				function = "i2c3";
++			};
++
++			/omit-if-no-ref/
++			i2c4_pg_pins: i2c4-pg-pins {
++				pins = "PG15", "PG16";
++				function = "i2c4";
++			};
++
+ 			ir_rx_pin: ir-rx-pin {
+ 				pins = "PH10";
+ 				function = "ir_rx";
+-- 
+2.39.2
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch

@@ -0,0 +1,30 @@
+From 64b0221e526f6359a39ab3beb9a693dc964b1112 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <pyavitz@xxxxx.com>
+Date: Wed, 6 Mar 2024 06:51:01 -0500
+Subject: [PATCH] arch: arm64: dts: allwinner: sun50i-h616: spi1 cs1 pin
+
+Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 33f8c758b9e6..1354dca01e78 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -397,6 +397,12 @@ spi1_cs0_pin: spi1-cs0-pin {
+ 				function = "spi1";
+ 			};
+ 
++			/omit-if-no-ref/
++			spi1_cs1_pin: spi1-cs1-pin {
++				pins = "PH9";
++				function = "spi1";
++			};
++
+ 			uart0_ph_pins: uart0-ph-pins {
+ 				pins = "PH0", "PH1";
+ 				function = "uart0";
+-- 
+2.39.2
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch

@@ -1,19 +1,20 @@
-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
+From 8e36084386d07a07f755bda978875b1354162019 Mon Sep 17 00:00:00 2001
+From: Gunjan Gupta <viraniac@gmail.com>
+Date: Wed, 13 Dec 2023 19:15:45 +0000
+Subject: [PATCH] arm64: dts: h616: add wifi support for orange pi zero 2 and
+ zero3
 
 ---
- .../allwinner/sun50i-h616-orangepi-zero2.dts  | 47 +++++++++++++++++++
- 1 file changed, 47 insertions(+)
+ .../allwinner/sun50i-h616-orangepi-zero.dtsi  | 38 +++++++++++++++++++
+ 1 file changed, 38 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;
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+index 19451a0c85ae..400966667d1e 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+@@ -59,6 +59,34 @@ reg_usb1_vbus: regulator-usb1-vbus {
+ 		gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>; /* PC16 */
+ 		status = "okay";
  	};
 +
 +	reg_vcc33_wifi: vcc33-wifi {
@@ -43,8 +44,13 @@ index 02893f3ac..88234a139 100644
 +		reset-gpios = <&pio 6 18 GPIO_ACTIVE_LOW>; /* PG18 */
 +		post-power-on-delay-ms = <200>;
 +	};
-+};
-+
+ };
+ 
+ &ehci1 {
+@@ -90,6 +118,16 @@ &mmc0 {
+ 	status = "okay";
+ };
+ 
 +&mmc1 {
 +	vmmc-supply = <&reg_vcc33_wifi>;
 +	vqmmc-supply = <&reg_vcc_wifi_io>;
@@ -53,18 +59,11 @@ index 02893f3ac..88234a139 100644
 +	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";
-+	};
++};
++
+ &ohci1 {
+ 	status = "okay";
  };
- 
- &emac0 {
 -- 
 2.34.1
 

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-Add-dma-node.patch

@@ -0,0 +1,53 @@
+From 8cdd9309fce75995cf3068be5c7ffb65cec51cff Mon Sep 17 00:00:00 2001
+From: Gunjan Gupta <viraniac@gmail.com>
+Date: Wed, 3 Jan 2024 09:53:55 +0000
+Subject: [PATCH] arm64: dts: sun50i-h616: Add dma node
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index 2424a2827455..e71b79ebced8 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -170,6 +170,18 @@ mixer0_out_tcon_top_mixer0: endpoint {
+ 			};
+ 		};
+ 
++		dma: dma-controller@3002000 {
++			compatible = "allwinner,sun50i-h6-dma";
++			reg = <0x03002000 0x1000>;
++			interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
++			clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>;
++			clock-names = "bus", "mbus";
++			dma-channels = <16>;
++			dma-requests = <49>;
++			resets = <&ccu RST_BUS_DMA>;
++			#dma-cells = <1>;
++		};
++
+ 		gpu: gpu@1800000 {
+ 			compatible = "allwinner,sun50i-h616-mali",
+ 				     "arm,mali-bifrost";
+@@ -606,6 +618,8 @@ spi0: spi@5010000 {
+ 			interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>;
+ 			clock-names = "ahb", "mod";
++			dmas = <&dma 22>, <&dma 22>;
++			dma-names = "rx", "tx";
+ 			resets = <&ccu RST_BUS_SPI0>;
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&spi0_pins>;
+@@ -621,6 +635,8 @@ spi1: spi@5011000 {
+ 			interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>;
+ 			clock-names = "ahb", "mod";
++			dmas = <&dma 23>, <&dma 23>;
++			dma-names = "rx", "tx";
+ 			resets = <&ccu RST_BUS_SPI1>;
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&spi1_pins>;
+-- 
+2.34.1
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch

@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jernej Skrabec <jernej.skrabec@gmail.com>
+Date: Fri, 15 Oct 2021 21:09:42 +0200
+Subject: arm64:dts: sun50i-h616-orangepi-zero2 Enable GPU mali
+
+Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 5 +++++
+ 1 file changed, 5 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 d83852e72f06..8d8009c7f9a3 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+@@ -16,6 +16,11 @@ &emac0 {
+ 	phy-supply = <&reg_dcdce>;
+ };
+ 
++&gpu {
++	mali-supply = <&reg_dcdcc>;
++	status = "okay";
++};
++
+ &mmc0 {
+ 	vmmc-supply = <&reg_dcdce>;
+ };
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: The-going <48602507+The-going@users.noreply.github.com>
+Date: Wed, 14 Dec 2022 20:15:41 +0300
+Subject: arm64: dts: sun50i-h616-orangepi-zero2: reg_usb1_vbus status ok
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+index 15290e6892fc..0666d16ba7d0 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+@@ -56,6 +56,7 @@ reg_usb1_vbus: regulator-usb1-vbus {
+ 		vin-supply = <&reg_vcc5v>;
+ 		enable-active-high;
+ 		gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>; /* PC16 */
++		status = "okay";
+ 	};
+ };
+ 
+-- 
+Armbian
+

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch

@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kali Prasad <kprasadvnsi@protonmail.com>
+Date: Sun, 19 Sep 2021 08:02:27 +0000
+Subject: drv:nvmem:sunxi_sid: Support SID on H616
+
+Add support for H616's SID controller. It supports 4K-bit
+EFUSE.
+
+Signed-off-by: Kali Prasad <kprasadvnsi@protonmail.com>
+---
+ drivers/nvmem/sunxi_sid.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
+index 5d364d85347f..c526fe4abe22 100644
+--- a/drivers/nvmem/sunxi_sid.c
++++ b/drivers/nvmem/sunxi_sid.c
+@@ -204,6 +204,12 @@ static const struct sunxi_sid_cfg sun50i_h6_cfg = {
+ 	.size = 0x200,
+ };
+ 
++static const struct sunxi_sid_cfg sun50i_h616_cfg = {
++	.value_offset = 0x200,
++	.size = 0x100,
++	.need_register_readout = true,
++};
++
+ static const struct of_device_id sunxi_sid_of_match[] = {
+ 	{ .compatible = "allwinner,sun4i-a10-sid", .data = &sun4i_a10_cfg },
+ 	{ .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg },
+@@ -213,6 +219,7 @@ static const struct of_device_id sunxi_sid_of_match[] = {
+ 	{ .compatible = "allwinner,sun50i-a64-sid", .data = &sun50i_a64_cfg },
+ 	{ .compatible = "allwinner,sun50i-h5-sid", .data = &sun50i_a64_cfg },
+ 	{ .compatible = "allwinner,sun50i-h6-sid", .data = &sun50i_h6_cfg },
++	{ .compatible = "allwinner,sun50i-h616-sid", .data = &sun50i_h616_cfg },
+ 	{/* sentinel */},
+ };
+ MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);
+-- 
+Armbian
+