linux-mainline: Added LINUX_VERSION variable

Fixes: File "/home/retpolanne/Dev/orange-pi-one-plus-image/poky/scripts/lib/devtool/standard.py", line 839, in modify if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TypeError: 'in ' requires string as left operand, not NoneType While running devtool modify virtual/kernel. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Merge pull request #404 from linux-sunxi/kirkstone-nanopi-r1
2025-07-29 20:20:32 +02:00 · 2024-04-25 08:54:39 +02:00 · 2024-04-25 08:08:37 +02:00 · 2024-04-24 15:34:27 +02:00 · 2024-01-10 09:19:42 +01:00 · 2023-11-20 13:30:09 +01:00
148 changed files with 4338 additions and 463691 deletions
--- a/README.md
+++ b/README.md
@ -6,7 +6,6 @@ Official sunxi OpenEmbedded layer for Allwinner-based boards.
 This layer depends on the additional layers:

 * [meta-openembedded/meta-oe](http://git.openembedded.org/meta-openembedded/tree/meta-oe)
-* [meta-arm](https://git.yoctoproject.org/meta-arm)

 Tested with core-image-base.

@ -17,11 +16,6 @@ Maintainers:
 * Sergey Lapin <slapin@ossfans.org>
 * Marek Belisko <marek.belisko@gmail.com>

-Community
-===========
-
-You can reach community + ask your question on gitter: https://matrix.to/#/#meta-sunxi:gitter.im
-
 Kernel / U-Boot Version
 ===========
 Most Allwinner devices and hardware are supported in mainline kernel and U-Boot, so this layer builds mainline by default.
--- a/classes/sdcard_image-sunxi.bbclass
+++ b/classes/sdcard_image-sunxi.bbclass
@ -0,0 +1,129 @@
+inherit image_types
+
+#
+# Create an image that can by written onto a SD card using dd.
+# Originally written for rasberrypi adapt for the needs of allwinner sunxi based boards
+#
+# The disk layout used is:
+#
+#    0                      -> 8*1024                           - reserverd
+#    8*1024                 ->                                  - arm combined spl/u-boot or aarch64 spl
+#    40*1024                ->                                  - aarch64 u-boot
+#    2048*1024              -> BOOT_SPACE                       - bootloader and kernel
+#
+#
+
+# Use an uncompressed ext4 by default as rootfs
+SDIMG_ROOTFS_TYPE ?= "ext4"
+
+# This image depends on the rootfs image
+IMAGE_TYPEDEP:sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}"
+
+# Boot partition volume id
+BOOTDD_VOLUME_ID ?= "boot"
+
+# Boot partition size [in KiB]
+BOOT_SPACE ?= "40960"
+
+# First partition begin at sector 2048 : 2048*1024 = 2097152
+IMAGE_ROOTFS_ALIGNMENT = "2048"
+
+SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
+
+do_image_sunxi_sdimg[depends] += " \
+			parted-native:do_populate_sysroot \
+			mtools-native:do_populate_sysroot \
+			dosfstools-native:do_populate_sysroot \
+			virtual/kernel:do_deploy \
+			virtual/bootloader:do_deploy \
+			"
+
+# SD card image name
+SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sunxi-sdimg"
+
+IMAGE_CMD:sunxi-sdimg () {
+
+	# Align partitions
+	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
+	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
+	SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT})
+
+	# Initialize sdcard image file
+	dd if=/dev/zero of=${SDIMG} bs=1 count=0 seek=$(expr 1024 \* ${SDIMG_SIZE})
+
+	# Create partition table
+	parted -s ${SDIMG} mklabel msdos
+	# Create boot partition and mark it as bootable
+	parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
+	parted -s ${SDIMG} set 1 boot on
+	# Create rootfs partition
+	parted -s ${SDIMG} unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT} \+ ${ROOTFS_SIZE})
+	parted ${SDIMG} print
+
+	# Create a vfat image with boot files
+	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
+	rm -f ${WORKDIR}/boot.img
+	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
+
+	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::${KERNEL_IMAGETYPE}
+
+	# Copy device tree file
+	if test -n "${KERNEL_DEVICETREE}"; then
+		for DTS_FILE in ${KERNEL_DEVICETREE}; do
+			DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+			DTS_DIR_NAME=`dirname ${DTS_FILE}`
+			if [ -e ${DEPLOY_DIR_IMAGE}/"${DTS_BASE_NAME}.dtb" ]; then
+
+				if [ ${DTS_FILE} != ${DTS_BASE_NAME}.dtb ]; then
+					mmd -i ${WORKDIR}/boot.img ::/${DTS_DIR_NAME}
+				fi
+
+				kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`"
+				kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${KERNEL_IMAGETYPE},g;s,\.dtb$,.bin,g"`"
+				if [ $kernel_bin = $kernel_bin_for_dtb ]; then
+					mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${DTS_BASE_NAME}.dtb ::/${DTS_FILE}
+				fi
+			fi
+		done
+	fi
+
+	if [ -e "${DEPLOY_DIR_IMAGE}/fex.bin" ]
+	then
+		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/fex.bin ::script.bin
+	fi
+	if [ -e "${DEPLOY_DIR_IMAGE}/boot.scr" ]
+	then
+		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr
+	fi
+        if [ -e "${DEPLOY_DIR_IMAGE}/splash.bmp" ]
+        then
+                mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/splash.bmp ::splash.bmp
+        fi
+
+
+	# Add stamp file
+	echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
+	mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}/image-version-info ::
+
+	# Burn Partitions
+	dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+	# If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
+	if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
+	then
+		xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+	else
+		dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+	fi
+
+	# write u-boot-spl at the begining of sdcard in one shot
+	SPL_FILE=$(basename ${SPL_BINARY})
+	dd if=${DEPLOY_DIR_IMAGE}/${SPL_FILE} of=${SDIMG} bs=1024 seek=8 conv=notrunc
+}
+
+# write uboot.itb for arm64 boards
+IMAGE_CMD_sunxi-sdimg:append:sun50i () {
+	if [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY}" ]
+	then
+		dd if=${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY} of=${SDIMG} bs=1024 seek=40 conv=notrunc
+	fi
+}
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -4,14 +4,14 @@ BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"

-BBFILE_COLLECTIONS += "sunxi"
-BBFILE_PATTERN_sunxi := "^${LAYERDIR}/"
-BBFILE_PRIORITY_sunxi = "10"
+BBFILE_COLLECTIONS += "meta-sunxi"
+BBFILE_PATTERN_meta-sunxi := "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-sunxi = "10"

 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
-LAYERVERSION_sunxi = "1"
+LAYERVERSION_meta-sunxi = "1"

-LAYERDEPENDS_sunxi = "core meta-python meta-arm"
+LAYERDEPENDS_meta-sunxi = "core meta-python"

-LAYERSERIES_COMPAT_sunxi = "styhead"
+LAYERSERIES_COMPAT_meta-sunxi = "honister kirkstone"
--- a/conf/machine/include/sun50i-h6.inc
+++ b/conf/machine/include/sun50i-h6.inc
@ -1,8 +0,0 @@
-require conf/machine/include/sunxi64.inc
-
-DEFAULTTUNE ?= "cortexa53-crypto"
-require conf/machine/include/arm/armv8a/tune-cortexa53.inc
-
-MACHINEOVERRIDES =. "sun50i:"
-
-SOC_FAMILY = "sun50i-h6"
--- a/conf/machine/include/sun50i-h616.inc
+++ b/conf/machine/include/sun50i-h616.inc
@ -6,3 +6,4 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 MACHINEOVERRIDES =. "sun50i:"

 SOC_FAMILY = "sun50i-h616"
+
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@ -14,13 +14,14 @@ XSERVER = "xserver-xorg \
           xf86-input-keyboard"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-PREFERRED_VERSION_linux-mainline ?= "6.6.%"
+PREFERRED_VERSION_linux-mainline ?= "5.15.%"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"

 KERNEL_IMAGETYPE ?= "uImage"

-IMAGE_FSTYPES += "ext3 tar.gz wic.gz wic.bmap"
+IMAGE_CLASSES += "sdcard_image-sunxi"
+IMAGE_FSTYPES += "ext3 tar.gz sunxi-sdimg wic.gz wic.bmap"

 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"

@ -30,7 +31,7 @@ UBOOT_ENTRYPOINT ?= "0x40008000"

 SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"

-SERIAL_CONSOLES ?= "115200;ttyS0"
+SERIAL_CONSOLE ?= "115200 ttyS0"
 MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"

 # Mimic the sdcard_image-sunxi.bbclass
--- a/conf/machine/include/sunxi64.inc
+++ b/conf/machine/include/sunxi64.inc
@ -4,13 +4,13 @@ include conf/machine/include/soc-family.inc
 MACHINEOVERRIDES =. "sunxi:sunxi64:"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-PREFERRED_VERSION_linux-mainline ?= "6.6.%"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"

 KERNEL_IMAGETYPE ?= "Image"

-IMAGE_FSTYPES += "ext4 tar.gz wic.gz wic.bmap"
+IMAGE_CLASSES += "sdcard_image-sunxi"
+IMAGE_FSTYPES += "ext4 tar.gz sunxi-sdimg"

 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"

@ -20,33 +20,7 @@ UBOOT_ENTRYPOINT ?= "0x40008000"
 UBOOT_LOADADDRESS ?= "0x400080OB00"

 #UBOOT_BINARY ?= "u-boot.itb"
-SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
+SPL_BINARY ?= "spl/sunxi-spl.bin"

-SERIAL_CONSOLES ?= "115200;ttyS0"
+SERIAL_CONSOLE ?= "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}"
-
-WKS_FILES ?= "sunxi-sdcard-image.wks.in"
-WKS_FILE_DEPENDS ?= "virtual/kernel u-boot"
--- a/conf/machine/lamobo-r1.conf
+++ b/conf/machine/lamobo-r1.conf
@ -1,10 +0,0 @@
-#@TYPE: Machine
-#@NAME: Lamobo R1
-#@DESCRIPTION: Machine configuration for the lamobo r1, based on allwinner A20 CPU http://bananapi.org/
-
-require conf/machine/include/sun7i.inc
-
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
-KERNEL_DEVICETREE = "sun7i-a20-lamobo-r1.dtb"
-UBOOT_MACHINE = "Lamobo_R1_config"
-SUNXI_FEX_FILE = "sys_config/a20/lamobo-r1.fex"
--- a/conf/machine/mangopi-mq-t-t113.conf
+++ b/conf/machine/mangopi-mq-t-t113.conf
@ -1,10 +0,0 @@
-#@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 = "sun8i-t113s-mangopi-mq-r-t113.dtb"
-KERNEL_IMAGETYPE = "zImage"
-
-UBOOT_MACHINE = "mangopi_mq_r_defconfig"
--- a/conf/machine/nanopi-duo2.conf
+++ b/conf/machine/nanopi-duo2.conf
@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: nanopi-duo2
+#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Duo2, based on the Allwinner H3 CPU
+
+require conf/machine/include/sun8i.inc
+
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-duo2.dtb"
+UBOOT_MACHINE = "nanopi_duo2_defconfig"
+
--- a/conf/machine/orange-pi-3lts.conf
+++ b/conf/machine/orange-pi-3lts.conf
@ -1,28 +0,0 @@
-#@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
-
-KERNEL_DEVICETREE = "allwinner/sun50i-h6-orangepi-3-lts.dtb"
-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 = " 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 "
-
-
-
-
--- a/conf/machine/orange-pi-lite.conf
+++ b/conf/machine/orange-pi-lite.conf
@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: orange-pi-lite
-#@DESCRIPTION: Machine configuration for the orange-pi-lite, based on Allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-
-KERNEL_DEVICETREE = "sun8i-h3-orangepi-lite.dtb"
-UBOOT_MACHINE = "orangepi_lite_defconfig"
-
--- a/conf/machine/orange-pi-one-plus.conf
+++ b/conf/machine/orange-pi-one-plus.conf
@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Orange Pi One Plus, based on Allwinner H6 CPU


-require conf/machine/include/sun50i-h6.inc
+require conf/machine/include/sun50i.inc

 KERNEL_DEVICETREE = "allwinner/sun50i-h6-orangepi-one-plus.dtb"
 UBOOT_MACHINE = "orangepi_one_plus_defconfig"
--- a/conf/machine/orange-pi-prime.conf
+++ b/conf/machine/orange-pi-prime.conf
@ -1,12 +0,0 @@
-#@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_FEATURES:append = " bluetooth wifi"
-MACHINE_EXTRA_RRECOMMENDS:append = " linux-firmware-rtl8723"
--- a/conf/machine/orange-pi-zero.conf
+++ b/conf/machine/orange-pi-zero.conf
@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: orange-pi-zero
-#@DESCRIPTION: Machine configuration for the orange-pi-zero, based on Allwinner H2 CPU
+#@NAME: orange-pi-one
+#@DESCRIPTION: Machine configuration for the orange-pi-one, base on allwinner H3 CPU

 require conf/machine/include/sun8i.inc

--- a/conf/machine/orange-pi-zero2.conf
+++ b/conf/machine/orange-pi-zero2.conf
@ -13,9 +13,4 @@ SPL_BINARY = "u-boot-sunxi-with-spl.bin"
 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 "
-
+MACHINE_EXTRA_RRECOMMENDS = "uwe5622-firmware"
--- a/recipes-bsp/atf/atf-sunxi/0001-Use-same-type-as-in-declaration.patch
+++ b/recipes-bsp/atf/atf-sunxi/0001-Use-same-type-as-in-declaration.patch
@ -0,0 +1,26 @@
+From 087b9306659effac870b4794c0f775ce3d7208c5 Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@open-nandra.com>
+Date: Wed, 13 Apr 2022 08:09:29 +0200
+Subject: [PATCH] Use same type as in declaration
+
+Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
+---
+ services/std_svc/psci/psci_common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/std_svc/psci/psci_common.c b/services/std_svc/psci/psci_common.c
+index 75f52f538..918a719f6 100644
+--- a/services/std_svc/psci/psci_common.c
+++ b/services/std_svc/psci/psci_common.c
+@@ -261,7 +261,7 @@ void psci_acquire_afflvl_locks(int start_afflvl,
+  ******************************************************************************/
+ void psci_release_afflvl_locks(int start_afflvl,
+ 			       int end_afflvl,
+-			       aff_map_node_t *mpidr_nodes[])
+			       mpidr_aff_map_nodes_t mpidr_nodes)
+ {
+ 	int level;
+ 
+-- 
+2.25.1
+
--- a/recipes-bsp/atf/atf-sunxi_git.bb
+++ b/recipes-bsp/atf/atf-sunxi_git.bb
@ -0,0 +1,35 @@
+DESCRIPTION = "ARM Trusted Firmware Allwinner"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://license.md;md5=829bdeb34c1d9044f393d5a16c068371"
+LIC_FILES_CHKSUM:sun50i-h616 = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
+
+SRC_URI = " \
+git://github.com/apritzel/arm-trusted-firmware;nobranch=1;protocol=https \
+file://0001-Use-same-type-as-in-declaration.patch \
+"
+SRCREV = "aa75c8da415158a94b82a430b2b40000778e851f"
+
+SRC_URI:sun50i-h616 = "git://github.com/ARM-software/arm-trusted-firmware;nobranch=1;protocol=https"
+SRCREV:sun50i-h616 = "f04dfbb297f03d7f8d7f7c00ce8712e1a10295cf"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+COMPATIBLE_MACHINE = "(sun50i|sun50i-h616)"
+
+PLATFORM:sun50i = "sun50iw1p1"
+PLATFORM:sun50i-h616 = "sun50i_h616"
+
+LDFLAGS[unexport] = "1"
+
+do_compile() {
+    oe_runmake -C ${S} BUILD_BASE=${B} \
+      CROSS_COMPILE=${TARGET_PREFIX} \
+      PLAT=${PLATFORM} \
+      bl31 \
+      all
+}
+
+do_install() {
+    install -D -p -m 0644 ${B}/${PLATFORM}/release/bl31.bin ${DEPLOY_DIR_IMAGE}/bl31.bin
+}
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@ -1,7 +0,0 @@
-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:sunxi = "bl31"
--- a/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
+++ b/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
@ -3,7 +3,7 @@ From: Florin Sarbu <florin@resin.io>
 Date: Wed, 12 Sep 2018 14:22:49 +0200
 Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support

-Upstream-Status: Pending
+Upstream-status: Pending
 Signed-off-by: Florin Sarbu <florin@resin.io>

 ---
--- a/recipes-bsp/u-boot/files/0002-Added-nanopi-r1-board-support.patch
+++ b/recipes-bsp/u-boot/files/0002-Added-nanopi-r1-board-support.patch
@ -5,8 +5,6 @@ Subject: [PATCH] Added nanopi-r1 board support

 Patch taken from : https://github.com/armbian/build/blob/master/patch/u-boot/u-boot-sunxi/add-nanopi-r1-and-duo2.patch

-Upstream-Status: Pending
-
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
 diff --git a/configs/nanopi_r1_defconfig b/configs/nanopi_r1_defconfig
--- a/recipes-bsp/u-boot/files/0003-Add-nanopi-duo2-board-support.patch
+++ b/recipes-bsp/u-boot/files/0003-Add-nanopi-duo2-board-support.patch
@ -0,0 +1,28 @@
+diff --git a/configs/nanopi_duo2_defconfig b/configs/nanopi_duo2_defconfig
+new file mode 100644
+index 0000000..1e51018
+--- /dev/null
+++ b/configs/nanopi_duo2_defconfig
+@@ -0,0 +1,21 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_SYS_TEXT_BASE=0x4a000000
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_MACH_SUN8I_H3=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+# CONFIG_VIDEO_DE2 is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-duo2"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
+CONFIG_SPL=y
+CONFIG_SYS_CLK_FREQ=480000000
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_SPL_SPI_SUNXI=y
+CONFIG_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+
--- a/recipes-bsp/u-boot/files/0003-sunxi-H6-Enable-Ethernet-on-Orange-Pi-One-Plus.patch
+++ b/recipes-bsp/u-boot/files/0003-sunxi-H6-Enable-Ethernet-on-Orange-Pi-One-Plus.patch
@ -1,58 +0,0 @@
-From: Anne Macedo <retpolanne@posteo.net>
-Date: Tue, 11 Jul 2023 00:39:58 +0000
-Subject: [PATCH] sunxi: H6: Enable Ethernet on Orange Pi One Plus
-
-Enable Ethernet on Orange Pi One Plus by using the correct phy for
-Realtek RTL8211E instead of the Generic One. Also use CONFIG_MACPWR to
-turn on ethernet on startup.
-
-After this patch is applied, a few issues can be seen:
-
- there's still a PHY reset timed out error that doesn't seem to cause
-  any impacts to the overall connection
-
- sometimes the emac driver times out after reset (yellow LED turns on
-  and never blinks)
-
-For future patches: for now, CONFIG_MACPWR is the only way to enable
-Ethernet on boot. There's already code on the dts for using the 3v3-gmac
-regulator. However, it is not probed on boot, so it only starts after a
-"regulator status" command is issued.
-
-More details about the troubleshooting on [1].
-
-Upstream-Status: Submitted
-
-[1] https://lore.kernel.org/u-boot/4wsvwgy56e2xfgtvioru2tf2ofkqprlts36qggivxogww6pn5j@4jk63zxhzhag/
-
-Signed-off-by: Anne Macedo <retpolanne@posteo.net>
---
- arch/arm/dts/sun50i-h6-orangepi-one-plus.dts | 2 +-
- configs/orangepi_one_plus_defconfig          | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/dts/sun50i-h6-orangepi-one-plus.dts b/arch/arm/dts/sun50i-h6-orangepi-one-plus.dts
-index 29a081e72a..6427c58f8a 100644
--- a/arch/arm/dts/sun50i-h6-orangepi-one-plus.dts
-+++ b/arch/arm/dts/sun50i-h6-orangepi-one-plus.dts
-@@ -37,7 +37,7 @@
- 
- &mdio {
- 	ext_rgmii_phy: ethernet-phy@1 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-+		compatible = "ethernet-phy-id001c.c915", "ethernet-phy-ieee802.3-c22" ;
- 		reg = <1>;
- 	};
- };
-diff --git a/configs/orangepi_one_plus_defconfig b/configs/orangepi_one_plus_defconfig
-index aa5f540eb1..a1835492db 100644
--- a/configs/orangepi_one_plus_defconfig
-+++ b/configs/orangepi_one_plus_defconfig
-@@ -8,3 +8,7 @@ CONFIG_SUNXI_DRAM_H6_LPDDR3=y
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
- CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_OHCI_HCD=y
-+CONFIG_SUN8I_EMAC=y
-+CONFIG_PHY_REALTEK=y
-+CONFIG_PHY_ETHERNET_ID=y
-+CONFIG_MACPWR="PD6"
--- a/recipes-bsp/u-boot/files/0004-OrangePi-3-LTS-support.patch
+++ b/recipes-bsp/u-boot/files/0004-OrangePi-3-LTS-support.patch
@ -1,421 +0,0 @@
-From 9966dda20246285abf8b417bd251d5a4bea3e423 Mon Sep 17 00:00:00 2001
-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 ++++++++++++++++++++++
- configs/orangepi_3_lts_defconfig          |  19 ++
- 3 files changed, 381 insertions(+)
- create mode 100644 arch/arm/dts/sun50i-h6-orangepi-3-lts.dts
- create mode 100644 configs/orangepi_3_lts_defconfig
-
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 43951a77..8dbbb6f4 100644
--- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -710,6 +710,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
- dtb-$(CONFIG_MACH_SUN50I_H6) += \
- 	sun50i-h6-beelink-gs1.dtb \
- 	sun50i-h6-orangepi-3.dtb \
-+	sun50i-h6-orangepi-3-lts.dtb \
- 	sun50i-h6-orangepi-lite2.dtb \
- 	sun50i-h6-orangepi-one-plus.dtb \
- 	sun50i-h6-pine-h64.dtb \
-diff --git a/arch/arm/dts/sun50i-h6-orangepi-3-lts.dts b/arch/arm/dts/sun50i-h6-orangepi-3-lts.dts
-new file mode 100644
-index 00000000..67f38b8a
--- /dev/null
-+++ b/arch/arm/dts/sun50i-h6-orangepi-3-lts.dts
-@@ -0,0 +1,361 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+// Copyright (C) 2023 Jernej Skrabec <jernej.skrabec@gmail.com>
-+// Based on sun50i-h6-orangepi-3.dts, which is:
-+// Copyright (C) 2019 Ondřej Jirman <megous@megous.com>
-+
-+/dts-v1/;
-+
-+#include "sun50i-h6.dtsi"
-+#include "sun50i-h6-cpu-opp.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	model = "OrangePi 3 LTS";
-+	compatible = "xunlong,orangepi-3-lts", "allwinner,sun50i-h6";
-+
-+	aliases {
-+		ethernet0 = &emac;
-+		serial0 = &uart0;
-+	};
-+
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
-+	connector {
-+		compatible = "hdmi-connector";
-+		ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
-+		type = "a";
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+
-+	ext_osc32k: ext_osc32k_clk {
-+		#clock-cells = <0>;
-+		compatible = "fixed-clock";
-+		clock-frequency = <32768>;
-+		clock-output-names = "ext_osc32k";
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led-0 {
-+			label = "orangepi:red:power";
-+			gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
-+		};
-+
-+		led-1 {
-+			label = "orangepi:green:status";
-+			gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
-+			default-state = "on";
-+		};
-+	};
-+
-+	reg_vcc5v: vcc5v {
-+		/* board wide 5V supply directly from the DC jack */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-5v";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-always-on;
-+	};
-+
-+	reg_gmac_3v3: gmac-3v3 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "gmac-3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		startup-delay-us = <150000>;
-+		enable-active-high;
-+		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
-+	};
-+
-+	reg_vcc33_wifi: vcc33-wifi {
-+		/* Always on 3.3V regulator for WiFi and BT */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc33-wifi";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		enable-active-high;
-+		gpio = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
-+	};
-+
-+	reg_vcc_wifi_io: vcc-wifi-io {
-+		/* Always on 1.8V/300mA regulator for WiFi and BT IO */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-wifi-io";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		regulator-always-on;
-+		vin-supply = <&reg_vcc33_wifi>;
-+	};
-+
-+	wifi_pwrseq: wifi-pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		clocks = <&rtc 1>;
-+		clock-names = "ext_clock";
-+		reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */
-+		post-power-on-delay-ms = <200>;
-+	};
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&reg_dcdca>;
-+};
-+
-+&de {
-+	status = "okay";
-+};
-+
-+&dwc3 {
-+	status = "okay";
-+};
-+
-+&ehci0 {
-+	status = "okay";
-+};
-+
-+&ehci3 {
-+	status = "okay";
-+};
-+
-+&emac {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&ext_rgmii_pins>;
-+	phy-mode = "rgmii";
-+	phy-handle = <&ext_rgmii_phy>;
-+	phy-supply = <&reg_gmac_3v3>;
-+	allwinner,rx-delay-ps = <1500>;
-+	allwinner,tx-delay-ps = <700>;
-+	status = "okay";
-+};
-+
-+&gpu {
-+	mali-supply = <&reg_dcdcc>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	hvcc-supply = <&reg_bldo2>;
-+	status = "okay";
-+};
-+
-+&hdmi_out {
-+	hdmi_out_con: endpoint {
-+		remote-endpoint = <&hdmi_con_in>;
-+	};
-+};
-+
-+&mdio {
-+	ext_rgmii_phy: ethernet-phy@1 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <1>;
-+
-+		reset-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
-+		reset-assert-us = <15000>;
-+		reset-deassert-us = <40000>;
-+	};
-+};
-+
-+&mmc0 {
-+	vmmc-supply = <&reg_cldo1>;
-+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
-+	bus-width = <4>;
-+	status = "okay";
-+};
-+
-+&mmc1 {
-+	vmmc-supply = <&reg_vcc33_wifi>;
-+	vqmmc-supply = <&reg_vcc_wifi_io>;
-+	mmc-pwrseq = <&wifi_pwrseq>;
-+	bus-width = <4>;
-+	non-removable;
-+	status = "okay";
-+};
-+
-+&mmc2 {
-+	vmmc-supply = <&reg_cldo1>;
-+	vqmmc-supply = <&reg_bldo2>;
-+	cap-mmc-hw-reset;
-+	non-removable;
-+	bus-width = <8>;
-+	status = "okay";
-+};
-+
-+&ohci0 {
-+	status = "okay";
-+};
-+
-+&ohci3 {
-+	status = "okay";
-+};
-+
-+&pio {
-+	vcc-pc-supply = <&reg_bldo2>;
-+	vcc-pd-supply = <&reg_cldo1>;
-+	vcc-pg-supply = <&reg_bldo3>;
-+};
-+
-+&r_ir {
-+	status = "okay";
-+};
-+
-+&r_rsb {
-+	clock-frequency = <100000>;
-+	status = "okay";
-+
-+	axp805: pmic@745 {
-+		compatible = "x-powers,axp805", "x-powers,axp806";
-+		reg = <0x745>;
-+		interrupt-parent = <&r_intc>;
-+		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
-+		interrupt-controller;
-+		#interrupt-cells = <1>;
-+		x-powers,self-working-mode;
-+		vina-supply = <&reg_vcc5v>;
-+		vinb-supply = <&reg_vcc5v>;
-+		vinc-supply = <&reg_vcc5v>;
-+		vind-supply = <&reg_vcc5v>;
-+		vine-supply = <&reg_vcc5v>;
-+		aldoin-supply = <&reg_vcc5v>;
-+		bldoin-supply = <&reg_vcc5v>;
-+		cldoin-supply = <&reg_vcc5v>;
-+
-+		regulators {
-+			reg_aldo1: aldo1 {
-+				regulator-always-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc-pl-led-ir";
-+			};
-+
-+			reg_aldo2: aldo2 {
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc33-audio-tv-ephy-mac";
-+			};
-+
-+			/* ALDO3 is shorted to CLDO1 */
-+			reg_aldo3: aldo3 {
-+				regulator-always-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-1";
-+			};
-+
-+			reg_bldo1: bldo1 {
-+				regulator-always-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc18-dram-bias-pll";
-+			};
-+
-+			reg_bldo2: bldo2 {
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc-efuse-pcie-hdmi-pc";
-+			};
-+
-+			reg_bldo3: bldo3 {
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc-pm-pg-dcxoio-wifi";
-+			};
-+
-+			bldo4 {
-+				/* unused */
-+			};
-+
-+			reg_cldo1: cldo1 {
-+				regulator-always-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-2";
-+			};
-+
-+			cldo2 {
-+				/* unused */
-+			};
-+
-+			cldo3 {
-+				/* unused */
-+			};
-+
-+			reg_dcdca: dcdca {
-+				regulator-always-on;
-+				regulator-min-microvolt = <800000>;
-+				regulator-max-microvolt = <1160000>;
-+				regulator-ramp-delay = <2500>;
-+				regulator-name = "vdd-cpu";
-+			};
-+
-+			reg_dcdcc: dcdcc {
-+				regulator-enable-ramp-delay = <32000>;
-+				regulator-min-microvolt = <810000>;
-+				regulator-max-microvolt = <1080000>;
-+				regulator-ramp-delay = <2500>;
-+				regulator-name = "vdd-gpu";
-+			};
-+
-+			reg_dcdcd: dcdcd {
-+				regulator-always-on;
-+				regulator-min-microvolt = <980000>;
-+				regulator-max-microvolt = <980000>;
-+				regulator-name = "vdd-sys";
-+			};
-+
-+			reg_dcdce: dcdce {
-+				regulator-always-on;
-+				regulator-min-microvolt = <1200000>;
-+				regulator-max-microvolt = <1200000>;
-+				regulator-name = "vcc-dram";
-+			};
-+
-+			sw {
-+				/* unused */
-+			};
-+		};
-+	};
-+};
-+
-+&pwm {
-+	status = "okay";
-+};
-+
-+&r_ir {
-+	status = "okay";
-+};
-+
-+&rtc {
-+	clocks = <&ext_osc32k>;
-+};
-+
-+/delete-node/ &spi0;
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_ph_pins>;
-+	status = "okay";
-+};
-+
-+&usb2otg {
-+	dr_mode = "host";
-+	status = "okay";
-+};
-+
-+&usb2phy {
-+	usb0_id_det-gpios = <&pio 2 15 GPIO_ACTIVE_HIGH>; /* PC15 */
-+	usb0_vbus-supply = <&reg_vcc5v>;
-+	usb3_vbus-supply = <&reg_vcc5v>;
-+	status = "okay";
-+};
-+
-+&usb3phy {
-+	status = "okay";
-+};
-diff --git a/configs/orangepi_3_lts_defconfig b/configs/orangepi_3_lts_defconfig
-new file mode 100644
-index 00000000..41a9af4e
--- /dev/null
-+++ b/configs/orangepi_3_lts_defconfig
-@@ -0,0 +1,19 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-3-lts"
-+CONFIG_SPL=y
-+CONFIG_MACH_SUN50I_H6=y
-+CONFIG_SUNXI_DRAM_H6_LPDDR3=y
-+CONFIG_MMC0_CD_PIN="PF6"
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPL_STACK=0x118000
-+CONFIG_SYS_PBSIZE=1024
-+CONFIG_SYS_BOOTM_LEN=0x2000000
-+CONFIG_PHY_SUN50I_USB3=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_DWC3=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_DWC3=y
-+# CONFIG_USB_DWC3_GADGET is not set
-- 
-2.39.2
-
--- a/recipes-bsp/u-boot/files/0004-i2c-mvtwsi-Add-compatible-string-for-allwinner-sun4i.patch
+++ b/recipes-bsp/u-boot/files/0004-i2c-mvtwsi-Add-compatible-string-for-allwinner-sun4i.patch
@ -0,0 +1,32 @@
+From eb31a4a141bf401f92426bd053a965022e47290d Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Fri, 7 Jan 2022 11:52:54 -0600
+Subject: [PATCH] i2c: mvtwsi: Add compatible string for allwinner,
+ sun4i-a10-i2c
+
+This adds a compatible string for the Allwinner Sun4i-A10 I2C
+controller. Without this, boards based on the R8 and A13 (at a
+minimum) fail to boot.
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+Acked-by: Akash Gajjar <gajjar04akash@gmail.com>
+Signed-off-by: Andre Przywara <andre.przywara@arm.com>
+---
+ drivers/i2c/mvtwsi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
+index bad4b1484f..f48a4f25aa 100644
+--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
+@@ -900,6 +900,7 @@ static const struct dm_i2c_ops mvtwsi_i2c_ops = {
+ static const struct udevice_id mvtwsi_i2c_ids[] = {
+ 	{ .compatible = "marvell,mv64xxx-i2c", },
+ 	{ .compatible = "marvell,mv78230-i2c", },
+	{ .compatible = "allwinner,sun4i-a10-i2c", },
+ 	{ .compatible = "allwinner,sun6i-a31-i2c", },
+ 	{ /* sentinel */ }
+ };
+-- 
+2.34.1
+
--- a/recipes-bsp/u-boot/files/0004-mangopi-mq-r-t113-Fix-serial-console.patch
+++ b/recipes-bsp/u-boot/files/0004-mangopi-mq-r-t113-Fix-serial-console.patch
@ -1,30 +0,0 @@
-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
-
--- a/recipes-bsp/u-boot/files/0005-Added-dtb-for-sun8i-h3-nanopi-r1-device.patch
+++ b/recipes-bsp/u-boot/files/0005-Added-dtb-for-sun8i-h3-nanopi-r1-device.patch
@ -0,0 +1,204 @@
+From 4ac73cb006bf34108ca280812e48942989a3575b Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@gmail.com>
+Date: Wed, 24 Apr 2024 15:06:58 +0200
+Subject: [PATCH] Added dtb for sun8i-h3-nanopi-r1 device
+
+Taken from mainline: 2c597855aa17d11520da642d03c82ff0c68042ab
+
+Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
+---
+ arch/arm/dts/Makefile               |   1 +
+ arch/arm/dts/sun8i-h3-nanopi-r1.dts | 169 ++++++++++++++++++++++++++++
+ 2 files changed, 170 insertions(+)
+ create mode 100644 arch/arm/dts/sun8i-h3-nanopi-r1.dts
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 9a9be76e6d..7a984510fe 100644
+--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
+@@ -589,6 +589,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
+ 	sun8i-h3-nanopi-m1-plus.dtb \
+ 	sun8i-h3-nanopi-neo.dtb \
+ 	sun8i-h3-nanopi-neo-air.dtb \
+	sun8i-h3-nanopi-r1.dtb \
+ 	sun8i-h3-orangepi-2.dtb \
+ 	sun8i-h3-orangepi-lite.dtb \
+ 	sun8i-h3-orangepi-one.dtb \
+diff --git a/arch/arm/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
+new file mode 100644
+index 0000000000..42cd1131ad
+--- /dev/null
+++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
+@@ -0,0 +1,169 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2019 Igor Pecovnik <igor@armbian.com>
+ * Copyright (C) 2020 Jayantajit Gogoi <jayanta.gogoi525@gmail.com>
+ * Copyright (C) 2020 Yu-Tung Chang <mtwget@gmail.com>
+*/
+
+#include "sun8i-h3-nanopi.dtsi"
+#include <dt-bindings/leds/common.h>
+
+/ {
+	model = "FriendlyARM NanoPi R1";
+	compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3";
+
+	aliases {
+		serial1 = &uart1;
+		ethernet0 = &emac;
+		ethernet1 = &wifi;
+	};
+
+	reg_gmac_3v3: gmac-3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "gmac-3v3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <100000>;
+		enable-active-high;
+		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
+	};
+
+	reg_vdd_cpux: gpio-regulator {
+		compatible = "regulator-gpio";
+		regulator-name = "vdd-cpux";
+		regulator-type = "voltage";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <1100000>;
+		regulator-max-microvolt = <1300000>;
+		regulator-ramp-delay = <50>;
+		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+		gpios-states = <0x1>;
+		states = <1100000 0x0>,
+			 <1300000 0x1>;
+	};
+
+	wifi_pwrseq: wifi_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
+		clock-names = "ext_clock";
+	};
+
+	leds {
+		led-2 {
+			function = LED_FUNCTION_WAN;
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
+		};
+
+		led-3 {
+			function = LED_FUNCTION_LAN;
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; /* PA9 */
+		};
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&reg_vdd_cpux>;
+};
+
+&ehci1 {
+	status = "okay";
+};
+
+&ehci2 {
+	status = "okay";
+};
+
+&emac {
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_rgmii_pins>;
+	phy-supply = <&reg_gmac_3v3>;
+	phy-handle = <&ext_rgmii_phy>;
+	phy-mode = "rgmii-id";
+	status = "okay";
+};
+
+&external_mdio {
+	ext_rgmii_phy: ethernet-phy@7 {
+		compatible = "ethernet-phy-ieee802.3-c22";
+		reg = <7>;
+	};
+};
+
+&mmc1 {
+	vmmc-supply = <&reg_vcc3v3>;
+	vqmmc-supply = <&reg_vcc3v3>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
+	status = "okay";
+
+	wifi: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&pio>;
+		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
+		interrupt-names = "host-wake";
+	};
+};
+
+&mmc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc2_8bit_pins>;
+	vmmc-supply = <&reg_vcc3v3>;
+	vqmmc-supply = <&reg_vcc3v3>;
+	bus-width = <8>;
+	non-removable;
+	status = "okay";
+};
+
+&ohci1 {
+	status = "okay";
+};
+
+&ohci2 {
+	status = "okay";
+};
+
+&reg_usb0_vbus {
+	gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
+	status = "okay";
+};
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins>;
+	status = "okay";
+};
+
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>;
+	uart-has-rtscts;
+	status = "okay";
+
+	bluetooth {
+		compatible = "brcm,bcm43438-bt";
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
+		clock-names = "lpo";
+		vbat-supply = <&reg_vcc3v3>;
+		vddio-supply = <&reg_vcc3v3>;
+		device-wakeup-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
+		host-wakeup-gpios = <&pio 0 7 GPIO_ACTIVE_HIGH>; /* PA7 */
+		shutdown-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
+	};
+};
+
+&usb_otg {
+	status = "okay";
+	dr_mode = "otg";
+};
+
+&usbphy {
+	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
+	usb0_vbus-supply = <&reg_usb0_vbus>;
+	status = "okay";
+};
+-- 
+2.25.1
+
--- a/recipes-bsp/u-boot/files/0006-nanopi-r1-dts-fixes.patch
+++ b/recipes-bsp/u-boot/files/0006-nanopi-r1-dts-fixes.patch
@ -0,0 +1,35 @@
+From 08aab303e36a3da19d49f111e5f2ad7d85b642fd Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@gmail.com>
+Date: Wed, 24 Apr 2024 15:32:12 +0200
+Subject: [PATCH] nanopi-r1: dts fixes
+
+Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
+---
+ arch/arm/dts/sun8i-h3-nanopi-r1.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
+index 42cd1131ad..26e2e6172e 100644
+--- a/arch/arm/dts/sun8i-h3-nanopi-r1.dts
+++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
+@@ -46,7 +46,7 @@
+ 	wifi_pwrseq: wifi_pwrseq {
+ 		compatible = "mmc-pwrseq-simple";
+ 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
+-		clocks = <&rtc CLK_OSC32K_FANOUT>;
+		clocks = <&rtc 1>;
+ 		clock-names = "ext_clock";
+ 	};
+ 
+@@ -147,7 +147,7 @@
+ 
+ 	bluetooth {
+ 		compatible = "brcm,bcm43438-bt";
+-		clocks = <&rtc CLK_OSC32K_FANOUT>;
+		clocks = <&rtc 1>;
+ 		clock-names = "lpo";
+ 		vbat-supply = <&reg_vcc3v3>;
+ 		vddio-supply = <&reg_vcc3v3>;
+-- 
+2.25.1
+
--- a/recipes-bsp/u-boot/files/arm/boot.cmd
+++ b/recipes-bsp/u-boot/files/arm/boot.cmd
@ -6,6 +6,6 @@ if itest.b *0x28 == 0x02 ; then
 	rootdev=mmcblk1p2
 fi
 setenv bootargs console=${console} console=tty1 root=/dev/${rootdev} rootwait panic=10 ${extra}
-load mmc 0:1 ${fdt_addr_r} ${fdtfile} || load mmc 0:1 ${fdt_addr_r} boot/allwinner/${fdtfile}
+load mmc 0:1 ${fdt_addr_r} ${fdtfile} || load mmc 0:1 ${fdt_addr_r} boot/${fdtfile}
 load mmc 0:1 ${kernel_addr_r} zImage || load mmc 0:1 ${kernel_addr_r} boot/zImage || load mmc 0:1 ${kernel_addr_r} uImage || load mmc 0:1 ${kernel_addr_r} boot/uImage
 bootz ${kernel_addr_r} - ${fdt_addr_r} || bootm ${kernel_addr_r} - ${fdt_addr_r}
--- a/recipes-bsp/u-boot/files/bananapi-m64/boot.cmd
+++ b/recipes-bsp/u-boot/files/bananapi-m64/boot.cmd
@ -1,11 +0,0 @@
-# Default to (primary) SD
-rootdev=mmcblk0p2
-if itest.b *0x28 == 0x02 ; then
-	# U-Boot loaded from eMMC or secondary SD so use it for rootfs too
-	echo "U-boot loaded from eMMC or secondary SD"
-	rootdev=mmcblk2p2
-fi
-setenv bootargs console=${console} console=tty1 root=/dev/${rootdev} rootwait panic=10 ${extra}
-load mmc 0:1 ${fdt_addr_r} ${fdtfile}
-load mmc 0:1 ${kernel_addr_r} Image
-booti ${kernel_addr_r} - ${fdt_addr_r}
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@ -1,7 +1,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"
+DEPENDS:append:sun50i = " atf-sunxi "

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

@ -12,12 +12,13 @@ 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-mangopi-mq-r-t113-Fix-serial-console.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-Add-nanopi-duo2-board-support.patch \
+	file://0004-i2c-mvtwsi-Add-compatible-string-for-allwinner-sun4i.patch \
+	file://0005-Added-dtb-for-sun8i-h3-nanopi-r1-device.patch \
+	file://0006-nanopi-r1-dts-fixes.patch \
+        file://boot.cmd \
 "

 UBOOT_ENV_SUFFIX:sunxi = "scr"
@ -26,8 +27,8 @@ UBOOT_ENV:sunxi = "boot"
 EXTRA_OEMAKE:append:sunxi = ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" '
 EXTRA_OEMAKE:append:sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin SCP=/dev/null"

-do_compile:sun50i[depends] += "trusted-firmware-a:do_deploy"
+do_compile_sun50i[depends] += "atf-sunxi:do_deploy"

 do_compile:append:sunxi() {
-    ${B}/tools/mkimage -C none -A arm -T script -d ${UNPACKDIR}/boot.cmd ${UNPACKDIR}/${UBOOT_ENV_BINARY}
+    ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
 }
--- a/recipes-devtools/python/files/olinuxino-a20lime2-emmc
+++ b/recipes-devtools/python/files/olinuxino-a20lime2-emmc
@ -1 +0,0 @@
-/home/marek/data/projects/kas/sources/meta-sunxi/recipes-devtools/python/files/olinuxino-a20lime2
--- a/recipes-devtools/python/pya20_0.2.12.bb
+++ b/recipes-devtools/python/pya20_0.2.12.bb
@ -16,7 +16,7 @@ S = "${WORKDIR}/pyA20-${PV}"
 inherit distutils3

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

 SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f"
--- a/recipes-graphics/libgles/sunxi-mali_git.bb
+++ b/recipes-graphics/libgles/sunxi-mali_git.bb
@ -22,7 +22,7 @@ python __anonymous() {
 }

 SRCREV = "d343311efc8db166d8371b28494f0f27b6a58724"
-SRC_URI = "git://github.com/linux-sunxi/sunxi-mali.git;protocol=https;branch=master \
+SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git \
           file://0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch \
           file://0002-Add-missing-GLchar-definition.patch \
           file://0003-Fix-sed-to-replace-by-the-correct-var.patch \
--- a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
+++ b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
@ -20,7 +20,7 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg "

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

 FILES:${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf"
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@ -1 +1 @@
-PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence"
+DEPENDS += "libxshmfence"
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@ -6,7 +6,7 @@
 # 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:sunxi() {
+do_install:append() {
 	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
--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0001-dts-add-h616-and-orangepizero2.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0001-dts-add-h616-and-orangepizero2.patch
@ -0,0 +1,907 @@
+From 4de4213f698a5962f839f671e4dec247baa35d5b Mon Sep 17 00:00:00 2001
+From: Patryk Biel <patryk.biel.external@trumpf.com>
+Date: Wed, 25 Jan 2023 20:30:15 +0100
+Subject: [PATCH] Add device tree from master
+
+---
+ arch/arm64/boot/dts/allwinner/Makefile        |   1 +
+ .../allwinner/sun50i-h616-orangepi-zero2.dts  | 261 ++++++++
+ .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 590 ++++++++++++++++++
+ include/dt-bindings/clock/sun6i-rtc.h         |  10 +
+ 4 files changed, 862 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+ create mode 100644 include/dt-bindings/clock/sun6i-rtc.h
+
+diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
+index a96d9d2d8..471822f5f 100644
+--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
+@@ -37,3 +37,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-model-b.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
+\ No newline at end of file
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+new file mode 100644
+index 000000000..e92055145
+--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+@@ -0,0 +1,261 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2020 Arm Ltd.
+ */
+
+/dts-v1/;
+
+#include "sun50i-h616.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/leds/common.h>
+
+/ {
+	model = "OrangePi Zero2";
+	compatible = "xunlong,orangepi-zero2", "allwinner,sun50i-h616";
+
+	aliases {
+		ethernet0 = &emac0;
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led-0 {
+			function = LED_FUNCTION_POWER;
+			color = <LED_COLOR_ID_RED>;
+			gpios = <&pio 2 12 GPIO_ACTIVE_HIGH>; /* PC12 */
+			default-state = "on";
+		};
+
+		led-1 {
+			function = LED_FUNCTION_STATUS;
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&pio 2 13 GPIO_ACTIVE_HIGH>; /* PC13 */
+		};
+	};
+
+	reg_vcc5v: vcc5v {
+		/* board wide 5V supply directly from the USB-C socket */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-5v";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+	};
+
+	reg_vcc33_wifi: vcc33-wifi {
+		/* Always on 3.3V regulator for WiFi and BT */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc33-wifi";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		vin-supply = <&reg_vcc5v>;
+	};
+
+	reg_vcc_wifi_io: vcc-wifi-io {
+		/* Always on 1.8V/300mA regulator for WiFi and BT IO */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-wifi-io";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		vin-supply = <&reg_vcc33_wifi>;
+	};
+
+	wifi_pwrseq: wifi-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&rtc 1>;
+		clock-names = "osc32k-out";
+		reset-gpios = <&pio 6 18 GPIO_ACTIVE_LOW>; /* PG18 */
+		post-power-on-delay-ms = <200>;
+	};
+};
+
+&emac0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&ext_rgmii_pins>;
+	phy-mode = "rgmii";
+	phy-handle = <&ext_rgmii_phy>;
+	phy-supply = <&reg_dcdce>;
+	allwinner,rx-delay-ps = <3100>;
+	allwinner,tx-delay-ps = <700>;
+	status = "okay";
+};
+
+&mmc1 {
+	vmmc-supply = <&reg_vcc33_wifi>;
+	vqmmc-supply = <&reg_vcc_wifi_io>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
+	mmc-ddr-1_8v;
+	status = "okay";
+
+	uwe-bsp {
+		compatible = "unisoc,uwe_bsp";
+		keep-power-on;
+		data-irq;
+		//adma-tx;
+		adma-rx;
+		//blksz-512;
+		status = "okay";
+	};
+};
+
+&mdio0 {
+	ext_rgmii_phy: ethernet-phy@1 {
+		compatible = "ethernet-phy-ieee802.3-c22";
+		reg = <1>;
+	};
+};
+
+&mmc0 {
+	vmmc-supply = <&reg_dcdce>;
+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;	/* PF6 */
+	bus-width = <4>;
+	status = "okay";
+};
+
+&r_rsb {
+	status = "okay";
+
+	axp305: pmic@745 {
+		compatible = "x-powers,axp305", "x-powers,axp805",
+			     "x-powers,axp806";
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		reg = <0x745>;
+
+		x-powers,self-working-mode;
+		vina-supply = <&reg_vcc5v>;
+		vinb-supply = <&reg_vcc5v>;
+		vinc-supply = <&reg_vcc5v>;
+		vind-supply = <&reg_vcc5v>;
+		vine-supply = <&reg_vcc5v>;
+		aldoin-supply = <&reg_vcc5v>;
+		bldoin-supply = <&reg_vcc5v>;
+		cldoin-supply = <&reg_vcc5v>;
+
+		regulators {
+			reg_aldo1: aldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-sys";
+			};
+
+			reg_aldo2: aldo2 {	/* 3.3V on headers */
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc3v3-ext";
+			};
+
+			reg_aldo3: aldo3 {	/* 3.3V on headers */
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc3v3-ext2";
+			};
+
+			reg_bldo1: bldo1 {
+				regulator-always-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc1v8";
+			};
+
+			bldo2 {
+				/* unused */
+			};
+
+			bldo3 {
+				/* unused */
+			};
+
+			bldo4 {
+				/* unused */
+			};
+
+			cldo1 {
+				/* reserved */
+			};
+
+			cldo2 {
+				/* unused */
+			};
+
+			cldo3 {
+				/* unused */
+			};
+
+			reg_dcdca: dcdca {
+				regulator-always-on;
+				regulator-min-microvolt = <810000>;
+				regulator-max-microvolt = <1100000>;
+				regulator-name = "vdd-cpu";
+			};
+
+			reg_dcdcc: dcdcc {
+				regulator-always-on;
+				regulator-min-microvolt = <810000>;
+				regulator-max-microvolt = <990000>;
+				regulator-name = "vdd-gpu-sys";
+			};
+
+			reg_dcdcd: dcdcd {
+				regulator-always-on;
+				regulator-min-microvolt = <1500000>;
+				regulator-max-microvolt = <1500000>;
+				regulator-name = "vdd-dram";
+			};
+
+			reg_dcdce: dcdce {
+				regulator-always-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc-eth-mmc";
+			};
+
+			sw {
+				/* unused */
+			};
+		};
+	};
+};
+
+&pio {
+	vcc-pc-supply = <&reg_aldo1>;
+	vcc-pf-supply = <&reg_aldo1>;
+	vcc-pg-supply = <&reg_bldo1>;
+	vcc-ph-supply = <&reg_aldo1>;
+	vcc-pi-supply = <&reg_aldo1>;
+};
+
+&spi0  {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi0_pins>, <&spi0_cs0_pin>;
+
+	flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <40000000>;
+	};
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_ph_pins>;
+	status = "okay";
+};
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+new file mode 100644
+index 000000000..ab344ea8a
+--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -0,0 +1,590 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// Copyright (C) 2020 Arm Ltd.
+// based on the H6 dtsi, which is:
+//   Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io>
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/sun50i-h616-ccu.h>
+#include <dt-bindings/clock/sun50i-h6-r-ccu.h>
+#include <dt-bindings/clock/sun6i-rtc.h>
+#include <dt-bindings/reset/sun50i-h616-ccu.h>
+#include <dt-bindings/reset/sun50i-h6-r-ccu.h>
+
+/ {
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "arm,cortex-a53";
+			device_type = "cpu";
+			reg = <0>;
+			enable-method = "psci";
+			clocks = <&ccu CLK_CPUX>;
+		};
+
+		cpu1: cpu@1 {
+			compatible = "arm,cortex-a53";
+			device_type = "cpu";
+			reg = <1>;
+			enable-method = "psci";
+			clocks = <&ccu CLK_CPUX>;
+		};
+
+		cpu2: cpu@2 {
+			compatible = "arm,cortex-a53";
+			device_type = "cpu";
+			reg = <2>;
+			enable-method = "psci";
+			clocks = <&ccu CLK_CPUX>;
+		};
+
+		cpu3: cpu@3 {
+			compatible = "arm,cortex-a53";
+			device_type = "cpu";
+			reg = <3>;
+			enable-method = "psci";
+			clocks = <&ccu CLK_CPUX>;
+		};
+	};
+
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		/*
+		 * 256 KiB reserved for Trusted Firmware-A (BL31).
+		 * This is added by BL31 itself, but some bootloaders fail
+		 * to propagate this into the DTB handed to kernels.
+		 */
+		secmon@40000000 {
+			reg = <0x0 0x40000000 0x0 0x40000>;
+			no-map;
+		};
+	};
+
+	osc24M: osc24M-clk {
+		#clock-cells = <0>;
+		compatible = "fixed-clock";
+		clock-frequency = <24000000>;
+		clock-output-names = "osc24M";
+	};
+
+	pmu {
+		compatible = "arm,cortex-a53-pmu";
+		interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
+	};
+
+	psci {
+		compatible = "arm,psci-0.2";
+		method = "smc";
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		arm,no-tick-in-suspend;
+		interrupts = <GIC_PPI 13
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+			     <GIC_PPI 14
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+			     <GIC_PPI 11
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+			     <GIC_PPI 10
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+	};
+
+	soc {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0x0 0x0 0x0 0x40000000>;
+
+		syscon: syscon@3000000 {
+			compatible = "allwinner,sun50i-h616-system-control";
+			reg = <0x03000000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+
+			sram_c: sram@28000 {
+				compatible = "mmio-sram";
+				reg = <0x00028000 0x30000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges = <0 0x00028000 0x30000>;
+			};
+		};
+
+		ccu: clock@3001000 {
+			compatible = "allwinner,sun50i-h616-ccu";
+			reg = <0x03001000 0x1000>;
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>, <&rtc CLK_IOSC>;
+			clock-names = "hosc", "losc", "iosc";
+			#clock-cells = <1>;
+			#reset-cells = <1>;
+		};
+
+		watchdog: watchdog@30090a0 {
+			compatible = "allwinner,sun50i-h616-wdt",
+				     "allwinner,sun6i-a31-wdt";
+			reg = <0x030090a0 0x20>;
+			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&osc24M>;
+		};
+
+		pio: pinctrl@300b000 {
+			compatible = "allwinner,sun50i-h616-pinctrl";
+			reg = <0x0300b000 0x400>;
+			interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_APB1>, <&osc24M>, <&rtc CLK_OSC32K>;
+			clock-names = "apb", "hosc", "losc";
+			gpio-controller;
+			#gpio-cells = <3>;
+			interrupt-controller;
+			#interrupt-cells = <3>;
+
+			ext_rgmii_pins: rgmii-pins {
+				pins = "PI0", "PI1", "PI2", "PI3", "PI4",
+				       "PI5", "PI7", "PI8", "PI9", "PI10",
+				       "PI11", "PI12", "PI13", "PI14", "PI15",
+				       "PI16";
+				function = "emac0";
+				drive-strength = <40>;
+			};
+
+			i2c0_pins: i2c0-pins {
+				pins = "PI6", "PI7";
+				function = "i2c0";
+			};
+
+			i2c3_ph_pins: i2c3-ph-pins {
+				pins = "PH4", "PH5";
+				function = "i2c3";
+			};
+
+			ir_rx_pin: ir-rx-pin {
+				pins = "PH10";
+				function = "ir_rx";
+			};
+
+			mmc0_pins: mmc0-pins {
+				pins = "PF0", "PF1", "PF2", "PF3",
+				       "PF4", "PF5";
+				function = "mmc0";
+				drive-strength = <30>;
+				bias-pull-up;
+			};
+
+			/omit-if-no-ref/
+			mmc1_pins: mmc1-pins {
+				pins = "PG0", "PG1", "PG2", "PG3",
+				       "PG4", "PG5";
+				function = "mmc1";
+				drive-strength = <30>;
+				bias-pull-up;
+			};
+
+			mmc2_pins: mmc2-pins {
+				pins = "PC0", "PC1", "PC5", "PC6",
+				       "PC8", "PC9", "PC10", "PC11",
+				       "PC13", "PC14", "PC15", "PC16";
+				function = "mmc2";
+				drive-strength = <30>;
+				bias-pull-up;
+			};
+
+			/omit-if-no-ref/
+			spi0_pins: spi0-pins {
+				pins = "PC0", "PC2", "PC4";
+				function = "spi0";
+			};
+
+			/omit-if-no-ref/
+			spi0_cs0_pin: spi0-cs0-pin {
+				pins = "PC3";
+				function = "spi0";
+			};
+
+			/omit-if-no-ref/
+			spi1_pins: spi1-pins {
+				pins = "PH6", "PH7", "PH8";
+				function = "spi1";
+			};
+
+			/omit-if-no-ref/
+			spi1_cs0_pin: spi1-cs0-pin {
+				pins = "PH5";
+				function = "spi1";
+			};
+
+			uart0_ph_pins: uart0-ph-pins {
+				pins = "PH0", "PH1";
+				function = "uart0";
+			};
+
+			/omit-if-no-ref/
+			uart1_pins: uart1-pins {
+				pins = "PG6", "PG7";
+				function = "uart1";
+			};
+
+			/omit-if-no-ref/
+			uart1_rts_cts_pins: uart1-rts-cts-pins {
+				pins = "PG8", "PG9";
+				function = "uart1";
+			};
+		};
+
+		gic: interrupt-controller@3021000 {
+			compatible = "arm,gic-400";
+			reg = <0x03021000 0x1000>,
+			      <0x03022000 0x2000>,
+			      <0x03024000 0x2000>,
+			      <0x03026000 0x2000>;
+			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+			interrupt-controller;
+			#interrupt-cells = <3>;
+		};
+
+		mmc0: mmc@4020000 {
+			compatible = "allwinner,sun50i-h616-mmc",
+				     "allwinner,sun50i-a100-mmc";
+			reg = <0x04020000 0x1000>;
+			clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>;
+			clock-names = "ahb", "mmc";
+			resets = <&ccu RST_BUS_MMC0>;
+			reset-names = "ahb";
+			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&mmc0_pins>;
+			status = "disabled";
+			max-frequency = <150000000>;
+			cap-sd-highspeed;
+			cap-mmc-highspeed;
+			mmc-ddr-3_3v;
+			cap-sdio-irq;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		mmc1: mmc@4021000 {
+			compatible = "allwinner,sun50i-h616-mmc",
+				     "allwinner,sun50i-a100-mmc";
+			reg = <0x04021000 0x1000>;
+			clocks = <&ccu CLK_BUS_MMC1>, <&ccu CLK_MMC1>;
+			clock-names = "ahb", "mmc";
+			resets = <&ccu RST_BUS_MMC1>;
+			reset-names = "ahb";
+			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&mmc1_pins>;
+			status = "disabled";
+			max-frequency = <150000000>;
+			cap-sd-highspeed;
+			cap-mmc-highspeed;
+			mmc-ddr-3_3v;
+			cap-sdio-irq;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		mmc2: mmc@4022000 {
+			compatible = "allwinner,sun50i-h616-emmc",
+				     "allwinner,sun50i-a100-emmc";
+			reg = <0x04022000 0x1000>;
+			clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>;
+			clock-names = "ahb", "mmc";
+			resets = <&ccu RST_BUS_MMC2>;
+			reset-names = "ahb";
+			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&mmc2_pins>;
+			status = "disabled";
+			max-frequency = <150000000>;
+			cap-sd-highspeed;
+			cap-mmc-highspeed;
+			mmc-ddr-3_3v;
+			cap-sdio-irq;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		uart0: serial@5000000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x05000000 0x400>;
+			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			clocks = <&ccu CLK_BUS_UART0>;
+			resets = <&ccu RST_BUS_UART0>;
+			status = "disabled";
+		};
+
+		uart1: serial@5000400 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x05000400 0x400>;
+			interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			clocks = <&ccu CLK_BUS_UART1>;
+			resets = <&ccu RST_BUS_UART1>;
+			status = "disabled";
+		};
+
+		uart2: serial@5000800 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x05000800 0x400>;
+			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			clocks = <&ccu CLK_BUS_UART2>;
+			resets = <&ccu RST_BUS_UART2>;
+			status = "disabled";
+		};
+
+		uart3: serial@5000c00 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x05000c00 0x400>;
+			interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			clocks = <&ccu CLK_BUS_UART3>;
+			resets = <&ccu RST_BUS_UART3>;
+			status = "disabled";
+		};
+
+		uart4: serial@5001000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x05001000 0x400>;
+			interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			clocks = <&ccu CLK_BUS_UART4>;
+			resets = <&ccu RST_BUS_UART4>;
+			status = "disabled";
+		};
+
+		uart5: serial@5001400 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x05001400 0x400>;
+			interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			clocks = <&ccu CLK_BUS_UART5>;
+			resets = <&ccu RST_BUS_UART5>;
+			status = "disabled";
+		};
+
+		i2c0: i2c@5002000 {
+			compatible = "allwinner,sun50i-h616-i2c",
+				     "allwinner,sun8i-v536-i2c",
+				     "allwinner,sun6i-a31-i2c";
+			reg = <0x05002000 0x400>;
+			interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_I2C0>;
+			resets = <&ccu RST_BUS_I2C0>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c0_pins>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		i2c1: i2c@5002400 {
+			compatible = "allwinner,sun50i-h616-i2c",
+				     "allwinner,sun8i-v536-i2c",
+				     "allwinner,sun6i-a31-i2c";
+			reg = <0x05002400 0x400>;
+			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_I2C1>;
+			resets = <&ccu RST_BUS_I2C1>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		i2c2: i2c@5002800 {
+			compatible = "allwinner,sun50i-h616-i2c",
+				     "allwinner,sun8i-v536-i2c",
+				     "allwinner,sun6i-a31-i2c";
+			reg = <0x05002800 0x400>;
+			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_I2C2>;
+			resets = <&ccu RST_BUS_I2C2>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		i2c3: i2c@5002c00 {
+			compatible = "allwinner,sun50i-h616-i2c",
+				     "allwinner,sun8i-v536-i2c",
+				     "allwinner,sun6i-a31-i2c";
+			reg = <0x05002c00 0x400>;
+			interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_I2C3>;
+			resets = <&ccu RST_BUS_I2C3>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		i2c4: i2c@5003000 {
+			compatible = "allwinner,sun50i-h616-i2c",
+				     "allwinner,sun8i-v536-i2c",
+				     "allwinner,sun6i-a31-i2c";
+			reg = <0x05003000 0x400>;
+			interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_I2C4>;
+			resets = <&ccu RST_BUS_I2C4>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		spi0: spi@5010000 {
+			compatible = "allwinner,sun50i-h616-spi",
+				     "allwinner,sun8i-h3-spi";
+			reg = <0x05010000 0x1000>;
+			interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>;
+			clock-names = "ahb", "mod";
+			resets = <&ccu RST_BUS_SPI0>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		spi1: spi@5011000 {
+			compatible = "allwinner,sun50i-h616-spi",
+				     "allwinner,sun8i-h3-spi";
+			reg = <0x05011000 0x1000>;
+			interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>;
+			clock-names = "ahb", "mod";
+			resets = <&ccu RST_BUS_SPI1>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		emac0: ethernet@5020000 {
+			compatible = "allwinner,sun50i-h616-emac0",
+				     "allwinner,sun50i-a64-emac";
+			reg = <0x05020000 0x10000>;
+			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "macirq";
+			clocks = <&ccu CLK_BUS_EMAC0>;
+			clock-names = "stmmaceth";
+			resets = <&ccu RST_BUS_EMAC0>;
+			reset-names = "stmmaceth";
+			syscon = <&syscon>;
+			status = "disabled";
+
+			mdio0: mdio {
+				compatible = "snps,dwmac-mdio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+
+		rtc: rtc@7000000 {
+			compatible = "allwinner,sun50i-h616-rtc",
+				     "allwinner,sun50i-h6-rtc";
+			reg = <0x07000000 0x400>;
+			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
+			clock-output-names = "osc32k", "osc32k-out", "iosc";
+			#clock-cells = <1>;
+		};
+
+		r_ccu: clock@7010000 {
+			compatible = "allwinner,sun50i-h616-r-ccu";
+			reg = <0x07010000 0x210>;
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>, <&rtc CLK_IOSC>,
+				 <&ccu CLK_PLL_PERIPH0>;
+			clock-names = "hosc", "losc", "iosc", "pll-periph";
+			#clock-cells = <1>;
+			#reset-cells = <1>;
+		};
+
+		r_pio: pinctrl@7022000 {
+			compatible = "allwinner,sun50i-h616-r-pinctrl";
+			reg = <0x07022000 0x400>;
+			clocks = <&r_ccu CLK_R_APB1>, <&osc24M>,
+				 <&rtc CLK_OSC32K>;
+			clock-names = "apb", "hosc", "losc";
+			gpio-controller;
+			#gpio-cells = <3>;
+
+			/omit-if-no-ref/
+			r_i2c_pins: r-i2c-pins {
+				pins = "PL0", "PL1";
+				function = "s_i2c";
+			};
+
+			r_rsb_pins: r-rsb-pins {
+				pins = "PL0", "PL1";
+				function = "s_rsb";
+			};
+		};
+
+		ir: ir@7040000 {
+			compatible = "allwinner,sun50i-h616-ir",
+				     "allwinner,sun6i-a31-ir";
+			reg = <0x07040000 0x400>;
+			interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&r_ccu CLK_R_APB1_IR>,
+				 <&r_ccu CLK_IR>;
+			clock-names = "apb", "ir";
+			resets = <&r_ccu RST_R_APB1_IR>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&ir_rx_pin>;
+			status = "disabled";
+		};
+
+		r_i2c: i2c@7081400 {
+			compatible = "allwinner,sun50i-h616-i2c",
+				     "allwinner,sun8i-v536-i2c",
+				     "allwinner,sun6i-a31-i2c";
+			reg = <0x07081400 0x400>;
+			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&r_ccu CLK_R_APB2_I2C>;
+			resets = <&r_ccu RST_R_APB2_I2C>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		r_rsb: rsb@7083000 {
+			compatible = "allwinner,sun50i-h616-rsb",
+				     "allwinner,sun8i-a23-rsb";
+			reg = <0x07083000 0x400>;
+			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&r_ccu CLK_R_APB2_RSB>;
+			clock-frequency = <3000000>;
+			resets = <&r_ccu RST_R_APB2_RSB>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&r_rsb_pins>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+};
+diff --git a/include/dt-bindings/clock/sun6i-rtc.h b/include/dt-bindings/clock/sun6i-rtc.h
+new file mode 100644
+index 000000000..c845493e4
+--- /dev/null
+++ b/include/dt-bindings/clock/sun6i-rtc.h
+@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
+
+#ifndef _DT_BINDINGS_CLK_SUN6I_RTC_H_
+#define _DT_BINDINGS_CLK_SUN6I_RTC_H_
+
+#define CLK_OSC32K		0
+#define CLK_OSC32K_FANOUT	1
+#define CLK_IOSC		2
+
+#endif /* _DT_BINDINGS_CLK_SUN6I_RTC_H_ */
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch
--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch
--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0004-dts-add-sunxi-info-device-tree-node.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0004-dts-add-sunxi-info-device-tree-node.patch
@ -0,0 +1,27 @@
+From 9a7776b44588c24d04ffff63194d8a137624f8ac Mon Sep 17 00:00:00 2001
+From: Patryk Biel <patryk.biel.external@trumpf.com>
+Date: Thu, 26 Jan 2023 09:50:42 +0100
+Subject: [PATCH] Add sunxi-info device tree node
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+index ab344ea8a..d0b95d43a 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+@@ -586,5 +586,10 @@ r_rsb: rsb@7083000 {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 		};
+
+		sunxi-info {
+			compatible = "allwinner,sun50i-h616-sys-info";
+			status = "okay";
+		};
+ 	};
+ };
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0005-dts-add-addr_mgt-device-tree-node.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0005-dts-add-addr_mgt-device-tree-node.patch
@ -1,5 +1,5 @@
 From 706dc6ed092e4a1b9d84893cb4186fbd354bb1c8 Mon Sep 17 00:00:00 2001
-From: pbiel <pbiel7@gmail.com>
+From: Patryk Biel <patryk.biel.external@trumpf.com>
 Date: Thu, 26 Jan 2023 09:51:22 +0100
 Subject: [PATCH] Add addr_mgt device tree node

--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0006-drv-modem-power-Power-manager-for-modems.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0006-drv-modem-power-Power-manager-for-modems.patch
--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch
@ -1,7 +1,8 @@
-From 418436514e2e64e07e7fd2ef9d77ec4712d1033b Mon Sep 17 00:00:00 2001
-From: pbiel <pbiel7@gmail.com>
-Date: Fri, 24 Feb 2023 10:38:03 +0100
-Subject: [PATCH 2/2] Add sunxi addr driver
+From 29cfa9437eaa2ff862ab0f06852383b181b60743 Mon Sep 17 00:00:00 2001
+From: afaulkner420 <afaulkner420@gmail.com>
+Date: Fri, 25 Mar 2022 20:18:18 +0000
+Subject: [PATCH 04/11] Add sunxi-addr driver - Used to fix uwe5622 bluetooth
+ MAC addresses

 ---
 drivers/misc/Kconfig                 |   1 +
@ -17,23 +18,23 @@ Subject: [PATCH 2/2] Add sunxi addr driver
 create mode 100644 drivers/misc/sunxi-addr/sunxi-addr.c

 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index 358ad56f6..c59480dc8 100644
+index 24cb809ae..52843042f 100644
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
-@@ -514,4 +514,5 @@ source "drivers/misc/habanalabs/Kconfig"
+@@ -494,4 +494,5 @@ source "drivers/misc/cardreader/Kconfig"
+ source "drivers/misc/habanalabs/Kconfig"
 source "drivers/misc/uacce/Kconfig"
 source "drivers/misc/pvpanic/Kconfig"
- source "drivers/misc/mchp_pci1xxxx/Kconfig"
 +source "drivers/misc/sunxi-addr/Kconfig"
 endmenu
 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
-index ac9b3e757..487a2bf2d 100644
+index f3eaa577a..0f9280509 100644
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
-@@ -62,3 +62,4 @@ obj-$(CONFIG_HI6421V600_IRQ)	+= hi6421v600-irq.o
- obj-$(CONFIG_OPEN_DICE)		+= open-dice.o
- obj-$(CONFIG_GP_PCI1XXXX)	+= mchp_pci1xxxx/
- obj-$(CONFIG_VCPU_STALL_DETECTOR)	+= vcpu_stall_detector.o
+@@ -60,3 +60,4 @@ obj-$(CONFIG_XILINX_SDFEC)	+= xilinx_sdfec.o
+ obj-$(CONFIG_HISI_HIKEY_USB)	+= hisi_hikey_usb.o
+ obj-$(CONFIG_HI6421V600_IRQ)	+= hi6421v600-irq.o
+ obj-$(CONFIG_MODEM_POWER)	+= modem-power.o
 +obj-$(CONFIG_SUNXI_ADDR_MGT)    += sunxi-addr/
 \ No newline at end of file
 diff --git a/drivers/misc/sunxi-addr/Kconfig b/drivers/misc/sunxi-addr/Kconfig
@ -608,5 +609,5 @@ index 000000000..a812e4e82
 +MODULE_DESCRIPTION("Network MAC Addess Manager");
 +MODULE_LICENSE("GPL");
 -- 
-2.34.1
+2.25.1

--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0008-drv-wireless-add-uwe5622-driver.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0008-drv-wireless-add-uwe5622-driver.patch
@ -1,11 +1,11 @@
-From ec1aee57ed09a181680241215115848f2033e897 Mon Sep 17 00:00:00 2001
-From: Igor Pecovnik <igor.pecovnik@gmail.com>
-Date: Fri, 20 Jan 2023 12:38:27 +0100
-Subject: [PATCH] Driver for Unisoc uwe5622
+From f4798e623c5df51add6d29a333b7253acb6fa4d8 Mon Sep 17 00:00:00 2001
+From: afaulkner420 <afaulkner420@gmail.com>
+Date: Fri, 25 Mar 2022 20:29:16 +0000
+Subject: [PATCH 07/11] wireless: Add uwe5622 driver

-Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
 ---
 drivers/net/wireless/Kconfig                  |      1 +
+ drivers/net/wireless/Makefile                 |      1 +
 drivers/net/wireless/uwe5622/Kconfig          |     13 +
 drivers/net/wireless/uwe5622/Makefile         |     10 +
 drivers/net/wireless/uwe5622/tty-sdio/Kconfig |      4 +
@ -160,9 +160,9 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
 .../net/wireless/uwe5622/unisocwifi/Kconfig   |     19 +
 .../net/wireless/uwe5622/unisocwifi/Makefile  |     64 +
 .../wireless/uwe5622/unisocwifi/api_version.c |    498 +
- .../wireless/uwe5622/unisocwifi/cfg80211.c    |   3944 +
+ .../wireless/uwe5622/unisocwifi/cfg80211.c    |   3940 +
 .../wireless/uwe5622/unisocwifi/cfg80211.h    |    220 +
- .../net/wireless/uwe5622/unisocwifi/cmdevt.c  |   3619 +
+ .../net/wireless/uwe5622/unisocwifi/cmdevt.c  |   3615 +
 .../net/wireless/uwe5622/unisocwifi/cmdevt.h  |   1131 +
 .../uwe5622/unisocwifi/dbg_ini_util.c         |    347 +
 .../uwe5622/unisocwifi/dbg_ini_util.h         |     22 +
@ -219,7 +219,7 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
 .../net/wireless/uwe5622/unisocwifi/wl_intf.h |    302 +
 .../net/wireless/uwe5622/unisocwifi/work.c    |    220 +
 .../net/wireless/uwe5622/unisocwifi/work.h    |     84 +
- 215 files changed, 210083 insertions(+)
+ 215 files changed, 210075 insertions(+)
 create mode 100644 drivers/net/wireless/uwe5622/Kconfig
 create mode 100644 drivers/net/wireless/uwe5622/Makefile
 create mode 100644 drivers/net/wireless/uwe5622/tty-sdio/Kconfig
@ -435,17 +435,29 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
 create mode 100644 drivers/net/wireless/uwe5622/unisocwifi/work.h

 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
-index 968dbfd76..27263c76a 100644
+index 7add2002f..e87ede0ea 100644
 --- a/drivers/net/wireless/Kconfig
 +++ b/drivers/net/wireless/Kconfig
-@@ -46,6 +46,7 @@ source "drivers/net/wireless/rtl8189fs/Kconfig"
- source "drivers/net/wireless/rtl8189es/Kconfig"
+@@ -35,6 +35,7 @@ source "drivers/net/wireless/st/Kconfig"
+ source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/zydas/Kconfig"
 source "drivers/net/wireless/quantenna/Kconfig"
 +source "drivers/net/wireless/uwe5622/Kconfig"
 
 config PCMCIA_RAYCS
 	tristate "Aviator/Raytheon 2.4GHz wireless support"
+diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
+index 80b324499..493309c20 100644
+--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_WLAN_VENDOR_ST) += st/
+ obj-$(CONFIG_WLAN_VENDOR_TI) += ti/
+ obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
+ obj-$(CONFIG_WLAN_VENDOR_QUANTENNA) += quantenna/
+obj-$(CONFIG_SPARD_WLAN_SUPPORT) += uwe5622/
+ 
+ # 16-bit wireless PCMCIA client drivers
+ obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
 diff --git a/drivers/net/wireless/uwe5622/Kconfig b/drivers/net/wireless/uwe5622/Kconfig
 new file mode 100644
 index 000000000..a1e123b03
@ -948,10 +960,10 @@ index 000000000..f97b8365a
 +#endif
 diff --git a/drivers/net/wireless/uwe5622/tty-sdio/lpm.c b/drivers/net/wireless/uwe5622/tty-sdio/lpm.c
 new file mode 100644
-index 000000000..35e30651a
+index 000000000..b2d9a8994
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/tty-sdio/lpm.c
-@@ -0,0 +1,147 @@
+@@ -0,0 +1,143 @@
 +#include <linux/module.h>
 +#include <linux/errno.h>
 +#include <linux/init.h>
@ -1024,11 +1036,7 @@ index 000000000..35e30651a
 +
 +static int bluesleep_open_proc_btwrite(struct inode *inode, struct file *file)
 +{
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+	return single_open(file, btwrite_proc_show, pde_data(inode));
-+#else
 +	return single_open(file, btwrite_proc_show, PDE_DATA(inode));
-+#endif
 +}
 +
 +static const struct proc_ops lpm_proc_btwrite_fops = {
@ -1253,7 +1261,7 @@ new file mode 100644
 index 000000000..0f90a758b
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/tty-sdio/tty.c
-@@ -0,0 +1,886 @@
+@@ -0,0 +1,885 @@
 +/*
 + * Copyright (C) 2015 Spreadtrum Communications Inc.
 + *
@ -1283,7 +1291,6 @@ index 000000000..0f90a758b
 +#include <linux/atomic.h>
 +#ifdef CONFIG_OF
 +#include <linux/of_device.h>
-+#include <linux/of.h>
 +#endif
 +#include <linux/compat.h>
 +#include <linux/tty_flip.h>
@ -5522,10 +5529,10 @@ index 000000000..638accb95
 +#endif
 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c b/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c
 new file mode 100644
-index 000000000..29a3ec298
+index 000000000..3ee6910e7
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c
-@@ -0,0 +1,856 @@
+@@ -0,0 +1,852 @@
 +/*
 + * Copyright (C) 2017 Spreadtrum Communications Inc.
 + *
@ -6090,11 +6097,7 @@ index 000000000..29a3ec298
 +static int wcn_platform_open(struct inode *inode, struct file *filp)
 +{
 +	struct platform_proc_file_entry
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+	*entry = (struct platform_proc_file_entry *)pde_data(inode);
-+#else
 +	*entry = (struct platform_proc_file_entry *)PDE_DATA(inode);
-+#endif
 +
 +	WCN_INFO("entry name:%s\n!", entry->name);
 +
@ -160413,10 +160416,10 @@ index 000000000..210a2ff96
 +#endif
 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c
 new file mode 100644
-index 000000000..9e453365b
+index 000000000..2edb7903d
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c
-@@ -0,0 +1,1260 @@
+@@ -0,0 +1,1256 @@
 +/*
 + * Copyright (C) 2015 Spreadtrum Communications Inc.
 + *
@ -160850,11 +160853,7 @@ index 000000000..9e453365b
 +static int mdbg_proc_open(struct inode *inode, struct file *filp)
 +{
 +	struct mdbg_proc_entry *entry =
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+		(struct mdbg_proc_entry *)pde_data(inode);
-+#else
 +		(struct mdbg_proc_entry *)PDE_DATA(inode);
-+#endif
 +	filp->private_data = entry;
 +
 +	return 0;
@ -166484,7 +166483,7 @@ new file mode 100644
 index 000000000..920645b2b
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_main.c
-@@ -0,0 +1,2314 @@
+@@ -0,0 +1,2313 @@
 +/*
 + * Copyright (C) 2017 Spreadtrum Communications Inc.
 + *
@ -166510,7 +166509,6 @@ index 000000000..920645b2b
 +#include <linux/module.h>
 +#include <linux/of_device.h>
 +#include <linux/of_gpio.h>
-+#include <linux/of_platform.h>
 +#include <linux/pm_runtime.h>
 +#include <linux/mmc/card.h>
 +#include <linux/mmc/core.h>
@ -166536,9 +166534,9 @@ index 000000000..920645b2b
 +extern void sdio_set_max_reqsz(unsigned int size);
 +#endif
 +
-+//#ifdef CONFIG_RK_BOARD
-+//extern int rockchip_wifi_set_carddetect(int val);
-+//#endif
+#ifdef CONFIG_RK_BOARD
+extern int rockchip_wifi_set_carddetect(int val);
+#endif
 +
 +#ifdef CONFIG_AW_BOARD
 +extern int sunxi_wlan_get_bus_index(void);
@ -168579,9 +168577,9 @@ index 000000000..920645b2b
 +	sdiohal_set_card_present(0);
 +#endif
 +
-+//#ifdef CONFIG_RK_BOARD
-+//	rockchip_wifi_set_carddetect(0);
-+//#endif
+#ifdef CONFIG_RK_BOARD
+	rockchip_wifi_set_carddetect(0);
+#endif
 +
 +#ifdef CONFIG_AW_BOARD
 +//	sunxi_mmc_rescan_card(wlan_bus_index);
@ -168681,9 +168679,9 @@ index 000000000..920645b2b
 +	sdiohal_set_card_present(1);
 +#endif
 +
-+//#ifdef CONFIG_RK_BOARD
-+//	rockchip_wifi_set_carddetect(1);
-+//#endif
+#ifdef CONFIG_RK_BOARD
+	rockchip_wifi_set_carddetect(1);
+#endif
 +
 +#if 0
 +	wlan_bus_index = sunxi_wlan_get_bus_index();
@ -171951,7 +171949,7 @@ index 000000000..793d627d0
 +#endif
 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c
 new file mode 100644
-index 000000000..0c2664d87
+index 000000000..f399ead5b
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c
@@ -0,0 +1,346 @@
@ -172039,11 +172037,7 @@ index 000000000..0c2664d87
 +{
 +	struct wcn_usb_ddata *data;
 +
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+	data = (struct wcn_usb_ddata *)pde_data(inode);
-+#else
 +	data = (struct wcn_usb_ddata *)PDE_DATA(inode);
-+#endif
 +
 +	if (!data)
 +		return -EIO;
@ -175332,10 +175326,10 @@ index 000000000..035635000
 +}
 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c
 new file mode 100644
-index 000000000..e7a9f2589
+index 000000000..c2cccc658
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c
-@@ -0,0 +1,1451 @@
+@@ -0,0 +1,1447 @@
 +#include "wcn_usb.h"
 +#include <linux/proc_fs.h>
 +#include <linux/kthread.h>
@ -175399,11 +175393,7 @@ index 000000000..e7a9f2589
 +{
 +	struct channel *channel;
 +
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+	channel = (struct channel *)pde_data(inode);
-+else
 +	channel = (struct channel *)PDE_DATA(inode);
-+#endif
 +
 +	if (!channel)
 +		return -EIO;
@ -175809,7 +175799,7 @@ index 000000000..e7a9f2589
 +{
 +	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;
@ -176258,7 +176248,7 @@ index 000000000..e7a9f2589
 +{
 +	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;
@ -178072,10 +178062,10 @@ index 000000000..79f0b5706
 +}
 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c b/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c
 new file mode 100644
-index 000000000..47d60f30c
+index 000000000..daef880ae
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c
-@@ -0,0 +1,3944 @@
+@@ -0,0 +1,3940 @@
 +/*
 + * Copyright (C) 2015 Spreadtrum Communications Inc.
 + *
@ -179062,11 +179052,7 @@ index 000000000..47d60f30c
 +	return sprdwl_change_beacon(vif, beacon);
 +}
 +
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+static int sprdwl_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
-+#else
 +static int sprdwl_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
-+#endif
 +{
 +#ifdef DFS_MASTER
 +	struct sprdwl_vif *vif = netdev_priv(ndev);
@ -182150,7 +182136,7 @@ index 000000000..d4ffe1024
 +
 +struct sprdwl_scan_ssid {
 +	u8 len;
-+	u8 ssid[];
+	u8 ssid[0];
 +} __packed;
 +
 +struct sprdwl_sched_scan_buf {
@ -182248,10 +182234,10 @@ index 000000000..d4ffe1024
 +#endif
 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c b/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c
 new file mode 100644
-index 000000000..308d1ecc7
+index 000000000..e81619b12
 --- /dev/null
 +++ b/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c
-@@ -0,0 +1,3619 @@
+@@ -0,0 +1,3615 @@
 +/*
 + * Copyright (C) 2015 Spreadtrum Communications Inc.
 + *
@ -185550,11 +185536,7 @@ index 000000000..308d1ecc7
 +						NL80211_CHAN_HT20);
 +		else
 +			wl_err("%s, ch is null!\n", __func__);
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+		cfg80211_ch_switch_notify(vif->ndev, &chandef, 0);
-+#else
 +		cfg80211_ch_switch_notify(vif->ndev, &chandef);
-+#endif
 +	}
 +}
 +
@ -211830,5 +211812,5 @@ index 000000000..4e745903e
 +
 +#endif
 -- 
-Created with Armbian build tools https://github.com/armbian/build
+2.25.1

--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch
@ -0,0 +1,28 @@
+From 70a0c21f9bc1eed754cce584fe382883dc412db0 Mon Sep 17 00:00:00 2001
+From: afaulkner420 <afaulkner420@gmail.com>
+Date: Fri, 25 Mar 2022 20:31:26 +0000
+Subject: [PATCH 08/11] uwe5622: bluetooth: Fix firmware init fail
+
+---
+ net/bluetooth/hci_core.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
+index c67390367..b2ee9b6a8 100644
+--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
+@@ -932,7 +932,11 @@ static int __hci_init(struct hci_dev *hdev)
+ 
+ 	err = __hci_req_sync(hdev, hci_init3_req, 0, HCI_INIT_TIMEOUT, NULL);
+ 	if (err < 0)
+#if defined(CONFIG_RK_WIFI_DEVICE_UWE5621) || defined(CONFIG_AW_WIFI_DEVICE_UWE5622)
+		;
+#else
+ 		return err;
+#endif
+ 
+ 	err = __hci_req_sync(hdev, hci_init4_req, 0, HCI_INIT_TIMEOUT, NULL);
+ 	if (err < 0)
+-- 
+2.25.1
+
--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0010-drv-fix-incldue-path-for-unisocwcn.patch
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/0010-drv-fix-incldue-path-for-unisocwcn.patch
@ -1,6 +1,6 @@
-From 5138d597275fd503573fac84018186bd18740644 Mon Sep 17 00:00:00 2001
-From: pbiel <pbiel7@gmail.com>
-Date: Thu, 30 Mar 2023 22:45:33 +0200
+From bb564341bb6c64003abbf24fd5d5ef254060b040 Mon Sep 17 00:00:00 2001
+From: Patryk Biel <patryk.biel.external@trumpf.com>
+Date: Thu, 19 Jan 2023 10:46:28 +0100
 Subject: [PATCH] Fix incldue path for unisocwcn

 ---
@ -24,13 +24,13 @@ index 313ea5123..e9a398584 100644
 export UNISOC_BSP_INCLUDE
 
 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/Makefile b/drivers/net/wireless/uwe5622/unisocwcn/Makefile
-index f9c595747..1ad490594 100644
+index b62652f63..ae6e1e25a 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
+@@ -119,9 +119,9 @@ ccflags-y += -DCONFIG_WCN_UTILS
 
 #### include path ######
+ ccflags-y += -I$(src)/../tty-sdio
 -ccflags-y += -I$(src)/include/
 -ccflags-y += -I$(src)/platform/
 -ccflags-y += -I$(src)/platform/rf/
--- a/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/defconfig
+++ b/recipes-kernel/linux/linux-mainline-5.15.35/orange-pi-zero2/defconfig
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0001-drv-wireless-add-uwe5622-wifi-driver.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0001-drv-wireless-add-uwe5622-wifi-driver.patch
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0002-drv-wireless-driver-for-uwe5622-allwinner-bugfix.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0002-drv-wireless-driver-for-uwe5622-allwinner-bugfix.patch
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0004-drv-wireless-adapt-uwe5622-wifi-driver-to-kernel-6.1.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0004-drv-wireless-adapt-uwe5622-wifi-driver-to-kernel-6.1.patch
@ -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
-
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0005-drv-fix-setting-mac-address-for-netdev-in-uwe5622.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0005-drv-fix-setting-mac-address-for-netdev-in-uwe5622.patch
@ -1,35 +0,0 @@
-From 9211a92d07e9a43fce104f87f9d45e890257b699 Mon Sep 17 00:00:00 2001
-From: pbiel <pbiel7@gmail.com>
-Date: Tue, 7 Mar 2023 20:28:44 +0100
-Subject: [PATCH] wireless: fix setting mac address for netdev in uwe5622
- unisocwifi driver
-
---
- drivers/net/wireless/uwe5622/unisocwifi/main.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/uwe5622/unisocwifi/main.c b/drivers/net/wireless/uwe5622/unisocwifi/main.c
-index 21efdf4e0..566a9a7f3 100644
--- a/drivers/net/wireless/uwe5622/unisocwifi/main.c
-+++ b/drivers/net/wireless/uwe5622/unisocwifi/main.c
-@@ -1356,6 +1356,7 @@ static struct sprdwl_vif *sprdwl_register_netdev(struct sprdwl_priv *priv,
- 	struct wireless_dev *wdev;
- 	struct sprdwl_vif *vif;
- 	int ret;
-+	u8 target_mac_addr[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
- 	ndev = alloc_netdev(sizeof(*vif), name, NET_NAME_UNKNOWN, ether_setup);
-@@ -1411,7 +1412,8 @@ static struct sprdwl_vif *sprdwl_register_netdev(struct sprdwl_priv *priv,
- 	ndev->features |= NETIF_F_SG;
- 	SET_NETDEV_DEV(ndev, wiphy_dev(priv->wiphy));
- 
-	sprdwl_set_mac_addr(vif, addr, ndev->dev_addr);
-+	sprdwl_set_mac_addr(vif, addr, target_mac_addr);
-+	dev_addr_set(ndev, target_mac_addr);
- 
- #ifdef CONFIG_P2P_INTF
- 	if (type == NL80211_IFTYPE_P2P_DEVICE)
-- 
-2.34.1
-
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0010-dts-add-wifi-power-regulator.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0010-dts-add-wifi-power-regulator.patch
@ -1,70 +0,0 @@
-From 899da8366afd97b1ca59b632036dc313777026da Mon Sep 17 00:00:00 2001
-From: pbiel <pbiel7@gmail.com>
-Date: Fri, 24 Feb 2023 22:14:58 +0100
-Subject: [PATCH] Add wifi power regulator
-
---
- .../allwinner/sun50i-h616-orangepi-zero2.dts  | 47 +++++++++++++++++++
- 1 file changed, 47 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
-index 02893f3ac..88234a139 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
-@@ -49,6 +49,53 @@ reg_vcc5v: vcc5v {
- 		regulator-max-microvolt = <5000000>;
- 		regulator-always-on;
- 	};
-+
-+	reg_vcc33_wifi: vcc33-wifi {
-+		/* Always on 3.3V regulator for WiFi and BT */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc33-wifi";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-always-on;
-+		vin-supply = <&reg_vcc5v>;
-+	};
-+
-+	reg_vcc_wifi_io: vcc-wifi-io {
-+		/* Always on 1.8V/300mA regulator for WiFi and BT IO */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-wifi-io";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		regulator-always-on;
-+		vin-supply = <&reg_vcc33_wifi>;
-+	};
-+
-+	wifi_pwrseq: wifi-pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		clocks = <&rtc 1>;
-+		clock-names = "osc32k-out";
-+		reset-gpios = <&pio 6 18 GPIO_ACTIVE_LOW>; /* PG18 */
-+		post-power-on-delay-ms = <200>;
-+	};
-+};
-+
-+&mmc1 {
-+	vmmc-supply = <&reg_vcc33_wifi>;
-+	vqmmc-supply = <&reg_vcc_wifi_io>;
-+	mmc-pwrseq = <&wifi_pwrseq>;
-+	bus-width = <4>;
-+	non-removable;
-+	mmc-ddr-1_8v;
-+	status = "okay";
-+	uwe-bsp {
-+		compatible = "unisoc,uwe_bsp";
-+		keep-power-on;
-+		data-irq;
-+		//adma-tx;
-+		adma-rx;
-+		//blksz-512;
-+		status = "okay";
-+	};
- };
- 
- &emac0 {
-- 
-2.34.1
-
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0011-dts-add-usb-to-h616.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0011-dts-add-usb-to-h616.patch
@ -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
-
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0012-dts-orange-pi-zero2.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0012-dts-orange-pi-zero2.patch
@ -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
-
--- a/recipes-kernel/linux/linux-mainline.inc
+++ b/recipes-kernel/linux/linux-mainline.inc
@ -9,24 +9,6 @@ require linux.inc

 LINUX_VERSION = "${PV}"

-KERNEL_DTB_PREFIX = "0"
-
-python() {
-    # return version in int form
-    def kernel_version():
-        ver = d.getVar('PV', True).split('.')
-        return int("".join(ver[0])),int("".join(ver[1]))
-
-    # kernel 6.5 have updated dts path add 'allwinner' prefix automatically
-    major, minor = kernel_version()
-    if major >= 6 and minor >= 5:
-        dt = d.getVar('KERNEL_DEVICETREE', True)
-        if not "allwinner" in dt:
-            dt = "allwinner/{0}".format(dt)
-            d.setVar('KERNEL_DEVICETREE', dt)
-        d.setVar('KERNEL_DTB_PREFIX', "1")
-}
-
 # Since we're not using git, this doesn't make a difference, but we need to fill
 # in something or kernel-yocto.bbclass will fail.
 KBRANCH ?= "master"
@ -38,31 +20,18 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"

 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

+LINUX_VERSION ?= "${PV}"
+
 S = "${WORKDIR}/linux-${PV}"

-# get release version 5.x or 6.x based on version
-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://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 = " \
+SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
 	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 \
+	file://0004-i2c-mv64xxx-Add-atomic_xfer-method-to-driver.patch \
+	file://0005-i2c-mv64xxx-Remove-shutdown-method-from-driver.patch \
+	file://0006-orangepi-pc-plus-Added-mmc-aliases-to-have-consisten.patch \
+	file://defconfig \
 "

 SRC_URI:append:use-mailine-graphics = " file://drm.cfg"
@ -70,10 +39,5 @@ SRC_URI:append:bananapi = " 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"
--- a/recipes-kernel/linux/linux-mainline/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
+++ b/recipes-kernel/linux/linux-mainline/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
-
--- a/recipes-kernel/linux/linux-mainline/0004-i2c-mv64xxx-Add-atomic_xfer-method-to-driver.patch
+++ b/recipes-kernel/linux/linux-mainline/0004-i2c-mv64xxx-Add-atomic_xfer-method-to-driver.patch
@ -0,0 +1,145 @@
+From 544a8d75f3d6e60e160cd92dc56321484598a993 Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Wed, 30 Mar 2022 12:16:57 -0500
+Subject: [PATCH] i2c: mv64xxx: Add atomic_xfer method to driver
+
+Add an atomic_xfer method to the driver so that it behaves correctly
+when controlling a PMIC that is responsible for device shutdown.
+
+The atomic_xfer method added is similar to the one from the i2c-rk3x
+driver. When running an atomic_xfer a bool flag in the driver data is
+set, the interrupt is not unmasked on transfer start, and the IRQ
+handler is manually invoked while waiting for pending transfers to
+complete.
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+---
+ drivers/i2c/busses/i2c-mv64xxx.c | 52 ++++++++++++++++++++++++++++----
+ 1 file changed, 46 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
+index 424c53e4c513..103a05ecc3d6 100644
+--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
+@@ -150,6 +150,7 @@ struct mv64xxx_i2c_data {
+ 	/* Clk div is 2 to the power n, not 2 to the power n + 1 */
+ 	bool			clk_n_base_0;
+ 	struct i2c_bus_recovery_info	rinfo;
+	bool			atomic;
+ };
+ 
+ static struct mv64xxx_i2c_regs mv64xxx_i2c_regs_mv64xxx = {
+@@ -179,7 +180,10 @@ mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data,
+ 	u32	dir = 0;
+ 
+ 	drv_data->cntl_bits = MV64XXX_I2C_REG_CONTROL_ACK |
+-		MV64XXX_I2C_REG_CONTROL_INTEN | MV64XXX_I2C_REG_CONTROL_TWSIEN;
+			      MV64XXX_I2C_REG_CONTROL_TWSIEN;
+
+	if (!drv_data->atomic)
+		drv_data->cntl_bits |= MV64XXX_I2C_REG_CONTROL_INTEN;
+ 
+ 	if (msg->flags & I2C_M_RD)
+ 		dir = 1;
+@@ -409,7 +413,8 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
+ 	case MV64XXX_I2C_ACTION_RCV_DATA_STOP:
+ 		drv_data->msg->buf[drv_data->byte_posn++] =
+ 			readl(drv_data->reg_base + drv_data->reg_offsets.data);
+-		drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
+		if (!drv_data->atomic)
+			drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
+ 		writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
+ 			drv_data->reg_base + drv_data->reg_offsets.control);
+ 		drv_data->block = 0;
+@@ -427,7 +432,8 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
+ 		drv_data->rc = -EIO;
+ 		fallthrough;
+ 	case MV64XXX_I2C_ACTION_SEND_STOP:
+-		drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
+		if (!drv_data->atomic)
+			drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
+ 		writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
+ 			drv_data->reg_base + drv_data->reg_offsets.control);
+ 		drv_data->block = 0;
+@@ -575,6 +581,17 @@ mv64xxx_i2c_wait_for_completion(struct mv64xxx_i2c_data *drv_data)
+ 		spin_unlock_irqrestore(&drv_data->lock, flags);
+ }
+ 
+static void mv64xxx_i2c_wait_polling(struct mv64xxx_i2c_data *drv_data)
+{
+	ktime_t timeout = ktime_add_ms(ktime_get(), drv_data->adapter.timeout);
+
+	while (READ_ONCE(drv_data->block) &&
+	       ktime_compare(ktime_get(), timeout) < 0) {
+		udelay(5);
+		mv64xxx_i2c_intr(0, drv_data);
+	}
+}
+
+ static int
+ mv64xxx_i2c_execute_msg(struct mv64xxx_i2c_data *drv_data, struct i2c_msg *msg,
+ 				int is_last)
+@@ -590,7 +607,11 @@ mv64xxx_i2c_execute_msg(struct mv64xxx_i2c_data *drv_data, struct i2c_msg *msg,
+ 	mv64xxx_i2c_send_start(drv_data);
+ 	spin_unlock_irqrestore(&drv_data->lock, flags);
+ 
+-	mv64xxx_i2c_wait_for_completion(drv_data);
+	if (!drv_data->atomic)
+		mv64xxx_i2c_wait_for_completion(drv_data);
+	else
+		mv64xxx_i2c_wait_polling(drv_data);
+
+ 	return drv_data->rc;
+ }
+ 
+@@ -717,7 +738,7 @@ mv64xxx_i2c_functionality(struct i2c_adapter *adap)
+ }
+ 
+ static int
+-mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
+mv64xxx_i2c_xfer_core(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
+ {
+ 	struct mv64xxx_i2c_data *drv_data = i2c_get_adapdata(adap);
+ 	int rc, ret = num;
+@@ -730,7 +751,7 @@ mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
+ 	drv_data->msgs = msgs;
+ 	drv_data->num_msgs = num;
+ 
+-	if (mv64xxx_i2c_can_offload(drv_data))
+	if (mv64xxx_i2c_can_offload(drv_data) && !drv_data->atomic)
+ 		rc = mv64xxx_i2c_offload_xfer(drv_data);
+ 	else
+ 		rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[0], num == 1);
+@@ -747,8 +768,27 @@ mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
+ 	return ret;
+ }
+ 
+static int
+mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
+{
+	struct mv64xxx_i2c_data *drv_data = i2c_get_adapdata(adap);
+
+	drv_data->atomic = 0;
+	return mv64xxx_i2c_xfer_core(adap, msgs, num);
+}
+
+static int mv64xxx_i2c_xfer_atomic(struct i2c_adapter *adap,
+				   struct i2c_msg msgs[], int num)
+{
+	struct mv64xxx_i2c_data *drv_data = i2c_get_adapdata(adap);
+
+	drv_data->atomic = 1;
+	return mv64xxx_i2c_xfer_core(adap, msgs, num);
+}
+
+ static const struct i2c_algorithm mv64xxx_i2c_algo = {
+ 	.master_xfer = mv64xxx_i2c_xfer,
+	.master_xfer_atomic = mv64xxx_i2c_xfer_atomic,
+ 	.functionality = mv64xxx_i2c_functionality,
+ };
+ 
+-- 
+2.25.1
+
--- a/recipes-kernel/linux/linux-mainline/0005-i2c-mv64xxx-Remove-shutdown-method-from-driver.patch
+++ b/recipes-kernel/linux/linux-mainline/0005-i2c-mv64xxx-Remove-shutdown-method-from-driver.patch
@ -0,0 +1,56 @@
+From 09b343038e3470e4d0da45f0ee09fb42107e5314 Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Fri, 25 Mar 2022 13:06:25 -0500
+Subject: [PATCH] i2c: mv64xxx: Remove shutdown method from driver
+
+When I attempt to shut down (or reboot) my R8 based NTC CHIP with this
+i2c driver I get the following error: "i2c i2c-0: mv64xxx: I2C bus
+locked, block: 1, time_left: 0". Reboots are successful but shutdowns
+freeze. If I comment out the shutdown routine the device both reboots
+and shuts down successfully without receiving this error (however it
+does receive a warning of missing atomic_xfer).
+
+It appears that very few i2c drivers have a shutdown method, I assume
+because these devices are often used to communicate with PMICs (such
+as in my case with the R8 based NTC CHIP). I'm proposing we simply
+remove this method so long as it doesn't cause trouble for others
+downstream. I'll work on an atomic_xfer method and submit that in
+a different patch.
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+---
+ drivers/i2c/busses/i2c-mv64xxx.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
+index 5c8e94b6cdb5..424c53e4c513 100644
+--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
+@@ -1047,14 +1047,6 @@ mv64xxx_i2c_remove(struct platform_device *pd)
+ 	return 0;
+ }
+ 
+-static void
+-mv64xxx_i2c_shutdown(struct platform_device *pd)
+-{
+-	pm_runtime_disable(&pd->dev);
+-	if (!pm_runtime_status_suspended(&pd->dev))
+-		mv64xxx_i2c_runtime_suspend(&pd->dev);
+-}
+-
+ static const struct dev_pm_ops mv64xxx_i2c_pm_ops = {
+ 	SET_RUNTIME_PM_OPS(mv64xxx_i2c_runtime_suspend,
+ 			   mv64xxx_i2c_runtime_resume, NULL)
+@@ -1065,7 +1057,6 @@ static const struct dev_pm_ops mv64xxx_i2c_pm_ops = {
+ static struct platform_driver mv64xxx_i2c_driver = {
+ 	.probe	= mv64xxx_i2c_probe,
+ 	.remove	= mv64xxx_i2c_remove,
+-	.shutdown = mv64xxx_i2c_shutdown,
+ 	.driver	= {
+ 		.name	= MV64XXX_I2C_CTLR_NAME,
+ 		.pm     = &mv64xxx_i2c_pm_ops,
+-- 
+2.25.1
+
--- a/recipes-kernel/linux/linux-mainline/0006-orangepi-pc-plus-Added-mmc-aliases-to-have-consisten.patch
+++ b/recipes-kernel/linux/linux-mainline/0006-orangepi-pc-plus-Added-mmc-aliases-to-have-consisten.patch
@ -0,0 +1,30 @@
+From 60ffeb194d08817efab0467e2b2d7eff502f3276 Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@open-nandra.com>
+Date: Wed, 10 Jan 2024 08:37:32 +0100
+Subject: [PATCH] orangepi-pc-plus: Added mmc aliases to have consistent
+ devices
+
+It fix random issues with boot problem.
+
+Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
+---
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
+index babf4cf1b..8c9bd76f5 100644
+--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
+@@ -50,6 +50,9 @@ / {
+ 	aliases {
+ 		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
+ 		ethernet1 = &rtl8189ftv;
+		mmc0 = &mmc0;
+		mmc1 = &mmc1;
+		mmc2 = &mmc2;
+ 	};
+ };
+ 
+-- 
+2.25.1
+
--- a/recipes-kernel/linux/linux-mainline/6.5/0001-dts-orangepi-zero-Add-wifi-support.patch
+++ b/recipes-kernel/linux/linux-mainline/6.5/0001-dts-orangepi-zero-Add-wifi-support.patch
@ -1,100 +0,0 @@
-From a9bad790ae9a9e9befbe8e8938b6baca84ee5138 Mon Sep 17 00:00:00 2001
-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
-
-Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
- .../allwinner/sun8i-h2-plus-orangepi-zero.dts | 46 +++++++++++++++----
- 1 file changed, 37 insertions(+), 9 deletions(-)
-
-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 3706216ff..ca94e313f 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
-@@ -80,13 +80,15 @@ status_led {
- 		};
- 	};
- 
-	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 {
-@@ -105,10 +107,12 @@ reg_vdd_cpux: vdd-cpux-regulator {
- 		states = <1100000 0>, <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>;
- 	};
- };
- 
-@@ -139,9 +143,11 @@ &mmc0 {
- };
- 
- &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";
- 
-@@ -151,6 +157,13 @@ &mmc1 {
- 	 */
- 	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];
- 	};
- };
- 
-@@ -207,3 +220,18 @@ &usbphy {
- 	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";
-+    };
-+};
-+
-- 
-2.25.1
-
--- a/recipes-kernel/linux/linux-mainline/6.5/0002-dts-nanopi-neo-air-Add-camera-support.patch
+++ b/recipes-kernel/linux/linux-mainline/6.5/0002-dts-nanopi-neo-air-Add-camera-support.patch
@ -1,113 +0,0 @@
-From e0d786f5465d2e2d977696cf0d02c70b78402291 Mon Sep 17 00:00:00 2001
-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
-
-Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
- .../dts/allwinner/sun8i-h3-nanopi-neo-air.dts | 85 +++++++++++++++++++
- 1 file changed, 85 insertions(+)
-
-diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo-air.dts
-index 9e1a33f94..7a05eff33 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo-air.dts
-+++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo-air.dts
-@@ -77,6 +77,39 @@ wifi_pwrseq: wifi_pwrseq {
- 		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 @@ &usbphy {
- 	/* 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;
-+};
-- 
-2.25.1
-
--- a/recipes-kernel/linux/linux-mainline/6.5/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch
+++ b/recipes-kernel/linux/linux-mainline/6.5/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch
@ -1,30 +0,0 @@
-From 7d7f32460702e99cab48909bb85ed84b67e65062 Mon Sep 17 00:00:00 2001
-From: Marek Belisko <marek.belisko@open-nandra.com>
-Date: Tue, 24 Oct 2023 10:43:55 +0200
-Subject: [PATCH] dts: allwinner: bananapi-m2-zero: Enforce consistent MMC
- numbering
-
-Enforce MMC number (sometimes the order was wrong and the device does not boot).
-
-Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
- arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts
-index d729b7c70..410a79487 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts
-+++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts
-@@ -20,6 +20,9 @@ / {
- 	aliases {
- 		serial0 = &uart0;
- 		serial1 = &uart1;
-+		mmc0 = &mmc0;
-+		mmc1 = &mmc1;
-+		mmc2 = &mmc2;
- 	};
- 
- 	chosen {
-- 
-2.25.1
-
--- a/recipes-kernel/linux/linux-mainline/6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
+++ b/recipes-kernel/linux/linux-mainline/6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
@ -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
-
--- a/recipes-kernel/linux/linux-mainline/orange-pi-prime/0001-dts-sun50i-h5-enable-power-button-for-orange-pi-prime.patch
+++ b/recipes-kernel/linux/linux-mainline/orange-pi-prime/0001-dts-sun50i-h5-enable-power-button-for-orange-pi-prime.patch
@ -1,27 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/orange-pi-prime/0002-dts-sun50i-h5-orange-pi-prime-add-regulator.patch
+++ b/recipes-kernel/linux/linux-mainline/orange-pi-prime/0002-dts-sun50i-h5-orange-pi-prime-add-regulator.patch
@ -1,66 +0,0 @@
-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
--- a/recipes-kernel/linux/linux-mainline/orange-pi-prime/0003-dts-sun50i-h5-orange-pi-prime-add-rtl8723cs.patch
+++ b/recipes-kernel/linux/linux-mainline/orange-pi-prime/0003-dts-sun50i-h5-orange-pi-prime-add-rtl8723cs.patch
@ -1,35 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/add-nodes-for-sunxi-info-addr-dump-reg.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/add-nodes-for-sunxi-info-addr-dump-reg.patch
@ -1,72 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-device-node-for-SID.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-device-node-for-SID.patch
@ -1,41 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch
@ -1,473 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-thermal-sensor-and-thermal-zones.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Add-thermal-sensor-and-thermal-zones.patch
@ -1,135 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Fix-thermal-zones-missing-trips.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-Fix-thermal-zones-missing-trips.patch
@ -1,73 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch
@ -1,39 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch
@ -1,38 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch
@ -1,55 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch
@ -1,39 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch
@ -1,30 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch
@ -1,69 +0,0 @@
-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-zero.dtsi  | 38 +++++++++++++++++++
- 1 file changed, 38 insertions(+)
-
-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 {
-+		/* Always on 3.3V regulator for WiFi and BT */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc33-wifi";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-always-on;
-+		vin-supply = <&reg_vcc5v>;
-+	};
-+
-+	reg_vcc_wifi_io: vcc-wifi-io {
-+		/* Always on 1.8V/300mA regulator for WiFi and BT IO */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-wifi-io";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		regulator-always-on;
-+		vin-supply = <&reg_vcc33_wifi>;
-+	};
-+
-+	wifi_pwrseq: wifi-pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		clocks = <&rtc 1>;
-+		clock-names = "osc32k-out";
-+		reset-gpios = <&pio 6 18 GPIO_ACTIVE_LOW>; /* PG18 */
-+		post-power-on-delay-ms = <200>;
-+	};
- };
- 
- &ehci1 {
-@@ -90,6 +118,16 @@ &mmc0 {
- 	status = "okay";
- };
- 
-+&mmc1 {
-+	vmmc-supply = <&reg_vcc33_wifi>;
-+	vqmmc-supply = <&reg_vcc_wifi_io>;
-+	mmc-pwrseq = <&wifi_pwrseq>;
-+	bus-width = <4>;
-+	non-removable;
-+	mmc-ddr-1_8v;
-+	status = "okay";
-+};
-+
- &ohci1 {
- 	status = "okay";
- };
-- 
-2.34.1
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-Add-dma-node.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-Add-dma-node.patch
@ -1,53 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch
@ -1,29 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch
@ -1,24 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch
@ -1,41 +0,0 @@
-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
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-rtc-sun6i-Add-Allwinner-H616-support.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-rtc-sun6i-Add-Allwinner-H616-support.patch
@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Andre Przywara <andre.przywara@arm.com>
-Date: Wed, 21 Apr 2021 12:46:43 +0100
-Subject: drv:rtc: sun6i: Add Allwinner H616 support
-
-The H616 RTC changes its day storage to the newly introduced linear day
-scheme, so pair the new compatible string with this feature flag.
-The clock part is missing an external 32768 Hz oscillator input pin,
-for future expansion we must thus ignore any provided clock for now.
-
-Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
- drivers/rtc/rtc-sun6i.c | 16 ++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
-index 190ea007d82e..e0b85a0d5645 100644
--- a/drivers/rtc/rtc-sun6i.c
-+++ b/drivers/rtc/rtc-sun6i.c
-@@ -389,6 +389,22 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node)
- CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_clk, "allwinner,sun50i-h6-rtc",
- 		      sun50i_h6_rtc_clk_init);
- 
-+static const struct sun6i_rtc_clk_data sun50i_h616_rtc_data = {
-+	.rc_osc_rate = 16000000,
-+	.fixed_prescaler = 32,
-+	.has_prescaler = 1,
-+	.has_out_clk = 1,
-+	.no_ext_losc = 1,
-+};
-+
-+static void __init sun50i_h616_rtc_clk_init(struct device_node *node)
-+{
-+	sun6i_rtc_clk_init(node, &sun50i_h616_rtc_data);
-+}
-+
-+CLK_OF_DECLARE_DRIVER(sun50i_h616_rtc_clk, "allwinner,sun50i-h616-rtc",
-+		      sun50i_h616_rtc_clk_init);
-+
- /*
-  * The R40 user manual is self-conflicting on whether the prescaler is
-  * fixed or configurable. The clock diagram shows it as fixed, but there
-- 
-Armbian
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch
@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Andre Przywara <andre.przywara@arm.com>
-Date: Mon, 14 Jun 2021 23:02:45 +0100
-Subject: drv:rtc:sun6i: support RTCs without external LOSCs
-
-Some newer Allwinner RTCs (for instance the one in the H616 SoC) lack
-a pin for an external 32768 Hz oscillator. As a consequence, this LOSC
-can't be selected as the RTC clock source, and we must rely on the
-internal RC oscillator.
-To allow additions of clocks to the RTC node, add a feature bit to ignore
-any provided clocks for now (the current code would think this is the
-external LOSC). Later DTs and code can then for instance add the PLL
-based clock input, and older kernel won't get confused.
-
-Signed-off-by: Andre Przywara <andre.przywara@arm.com>
-Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
- drivers/rtc/rtc-sun6i.c | 16 +++++++---
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
-index 02129ea346c1..190ea007d82e 100644
--- a/drivers/rtc/rtc-sun6i.c
-+++ b/drivers/rtc/rtc-sun6i.c
-@@ -137,6 +137,7 @@ struct sun6i_rtc_clk_data {
- 	unsigned int has_out_clk : 1;
- 	unsigned int has_losc_en : 1;
- 	unsigned int has_auto_swt : 1;
-+	unsigned int no_ext_losc : 1;
- };
- 
- #define RTC_LINEAR_DAY	BIT(0)
-@@ -260,7 +261,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
- 	}
- 
- 	/* Switch to the external, more precise, oscillator, if present */
-	if (of_property_present(node, "clocks")) {
-+	if (!rtc->data->no_ext_losc && of_get_property(node, "clocks", NULL)) {
- 		reg |= SUN6I_LOSC_CTRL_EXT_OSC;
- 		if (rtc->data->has_losc_en)
- 			reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN;
-@@ -284,14 +285,19 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
- 	}
- 
- 	parents[0] = clk_hw_get_name(rtc->int_osc);
-	/* If there is no external oscillator, this will be NULL and ... */
-	parents[1] = of_clk_get_parent_name(node, 0);
-+	if (rtc->data->no_ext_losc) {
-+		parents[1] = NULL;
-+		init.num_parents = 1;
-+	} else {
-+		/* If there is no external oscillator, this will be NULL and */
-+		parents[1] = of_clk_get_parent_name(node, 0);
-+		/* ... number of clock parents will be 1. */
-+		init.num_parents = of_clk_get_parent_count(node) + 1;
-+	}
- 
- 	rtc->hw.init = &init;
- 
- 	init.parent_names = parents;
-	/* ... number of clock parents will be 1. */
-	init.num_parents = of_clk_get_parent_count(node) + 1;
- 	of_property_read_string_index(node, "clock-output-names", 0,
- 				      &init.name);
- 
-- 
-Armbian
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-soc-sunxi-sram-Add-SRAM-C1-H616-handling.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-soc-sunxi-sram-Add-SRAM-C1-H616-handling.patch
@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@gmail.com>
-Date: Sat, 16 Oct 2021 21:26:41 +0200
-Subject: drv:soc: sunxi: sram: Add SRAM C1 H616 handling
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
- drivers/soc/sunxi/sunxi_sram.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c
-index 4458b2e0562b..9e65d8dfe355 100644
--- a/drivers/soc/sunxi/sunxi_sram.c
-+++ b/drivers/soc/sunxi/sunxi_sram.c
-@@ -70,6 +70,12 @@ static struct sunxi_sram_desc sun4i_a10_sram_c1 = {
- 				  SUNXI_SRAM_MAP(0x7fffffff, 1, "ve")),
- };
- 
-+static struct sunxi_sram_desc sun50i_h616_sram_c1 = {
-+	.data	= SUNXI_SRAM_DATA("C1", 0x0, 0x0, 31,
-+				  SUNXI_SRAM_MAP(0x7fffffff, 0, "cpu"),
-+				  SUNXI_SRAM_MAP(0, 1, "ve")),
-+};
-+
- static struct sunxi_sram_desc sun4i_a10_sram_d = {
- 	.data	= SUNXI_SRAM_DATA("D", 0x4, 0x0, 1,
- 				  SUNXI_SRAM_MAP(0, 0, "cpu"),
-@@ -99,6 +105,10 @@ static const struct of_device_id sunxi_sram_dt_ids[] = {
- 		.compatible	= "allwinner,sun50i-a64-sram-c",
- 		.data		= &sun50i_a64_sram_c.data,
- 	},
-+	{
-+		.compatible	= "allwinner,sun50i-h616-sram-c1",
-+		.data		= &sun50i_h616_sram_c1.data,
-+	},
- 	{}
- };
- 
-- 
-Armbian
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-staging-media-sunxi-cedrus-add-H616-variant.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/drv-staging-media-sunxi-cedrus-add-H616-variant.patch
@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@gmail.com>
-Date: Fri, 15 Oct 2021 21:49:45 +0200
-Subject: drv:staging:media:sunxi:cedrus: add H616 variant
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
- drivers/staging/media/sunxi/cedrus/cedrus.c | 13 ++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
-index a0f9f4a5b03a..160bd376eb58 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
-+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
-@@ -651,6 +651,15 @@ static const struct cedrus_variant sun50i_h6_cedrus_variant = {
- 	.mod_rate	= 600000000,
- };
- 
-+static const struct cedrus_variant sun50i_h616_cedrus_variant = {
-+	.capabilities	= CEDRUS_CAPABILITY_UNTILED |
-+			  CEDRUS_CAPABILITY_MPEG2_DEC |
-+			  CEDRUS_CAPABILITY_H264_DEC |
-+			  CEDRUS_CAPABILITY_H265_DEC |
-+			  CEDRUS_CAPABILITY_VP8_DEC,
-+	.mod_rate	= 600000000,
-+};
-+
- static const struct of_device_id cedrus_dt_match[] = {
- 	{
- 		.compatible = "allwinner,sun4i-a10-video-engine",
-@@ -696,6 +705,10 @@ static const struct of_device_id cedrus_dt_match[] = {
- 		.compatible = "allwinner,sun50i-h6-video-engine",
- 		.data = &sun50i_h6_cedrus_variant,
- 	},
-+	{
-+		.compatible = "allwinner,sun50i-h616-video-engine",
-+		.data = &sun50i_h6_cedrus_variant,
-+	},
- 	{ /* sentinel */ }
- };
- MODULE_DEVICE_TABLE(of, cedrus_dt_match);
-- 
-Armbian
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/h61x-common-6_6.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/h61x-common-6_6.scc
@ -1,24 +0,0 @@
-# Common patches for h616 and h618
-# Ported from armbian
-# https://github.com/armbian/build/tree/main/patch/kernel/archive/sunxi-6.6/patches.armbian
-# Armabian includes a hack hdmi output not included here: drivers-hack-for-h616-hdmi-video-output.patch
-
-patch add-nodes-for-sunxi-info-addr-dump-reg.patch
-patch arm64-dts-allwinner-h616-Add-device-node-for-SID.patch
-patch arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch
-patch arm64-dts-allwinner-h616-Add-thermal-sensor-and-thermal-zones.patch
-patch arm64-dts-allwinner-h616-Fix-thermal-zones-missing-trips.patch
-patch arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch
-patch arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch
-patch arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch
-patch arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch
-patch arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch
-
-patch arm64-dts-sun50i-h616-Add-dma-node.patch
-patch drv-nvmem-sunxi_sid-Support-SID-on-H616.patch
-patch drv-rtc-sun6i-Add-Allwinner-H616-support.patch
-patch drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch
-patch drv-soc-sunxi-sram-Add-SRAM-C1-H616-handling.patch
-patch drv-staging-media-sunxi-cedrus-add-H616-variant.patch
-patch nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch
@ -1,58 +0,0 @@
-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:19:05 +0300
-Subject: nvmem: sunxi_sid: add sunxi_get_soc_chipid, sunxi_get_serial
-
---
- drivers/nvmem/sunxi_sid.c | 28 ++++++++++
- 1 file changed, 28 insertions(+)
-
-diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
-index c526fe4abe22..e522bd1e5edd 100644
--- a/drivers/nvmem/sunxi_sid.c
-+++ b/drivers/nvmem/sunxi_sid.c
-@@ -36,6 +36,25 @@ struct sunxi_sid {
- 	u32			value_offset;
- };
- 
-+static unsigned int sunxi_soc_chipid[4];
-+static unsigned int sunxi_serial[4];
-+
-+int sunxi_get_soc_chipid(unsigned char *chipid)
-+{
-+	memcpy(chipid, sunxi_soc_chipid, 16);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(sunxi_get_soc_chipid);
-+
-+int sunxi_get_serial(unsigned       char *serial)
-+{
-+	memcpy(serial, sunxi_serial, 16);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(sunxi_get_serial);
-+
- static int sunxi_sid_read(void *context, unsigned int offset,
- 			  void *val, size_t bytes)
- {
-@@ -177,6 +196,15 @@ static int sunxi_sid_probe(struct platform_device *pdev)
- 
- 	platform_set_drvdata(pdev, nvmem);
- 
-+	nvmem_cfg->reg_read(sid, 0, &sunxi_soc_chipid[0], sizeof(int));
-+	nvmem_cfg->reg_read(sid, 4, &sunxi_soc_chipid[1], sizeof(int));
-+	nvmem_cfg->reg_read(sid, 8, &sunxi_soc_chipid[2], sizeof(int));
-+	nvmem_cfg->reg_read(sid, 12, &sunxi_soc_chipid[3], sizeof(int));
-+
-+	sunxi_serial[0] = sunxi_soc_chipid[3];
-+	sunxi_serial[1] = sunxi_soc_chipid[2];
-+	sunxi_serial[2] = (sunxi_soc_chipid[1] >> 16) & 0x0ffff;
-+
- 	return 0;
- }
- 
-- 
-Armbian
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/orangepi-zero2-6_6.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/h61x/orangepi-zero2-6_6.scc
@ -1,7 +0,0 @@
-# Kmeta for OPI Zero 2
-include h61x-common-6_6.scc
-
-patch arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch
-patch arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch
-patch arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/ASoC-hdmi-codec-fix-channel-allocation.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/ASoC-hdmi-codec-fix-channel-allocation.patch
@ -1,142 +0,0 @@
-From 91b69779e0875e58d8973b2938a1cc4b7a1c455b Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Sun, 25 Mar 2018 22:17:06 +0200
-Subject: [PATCH 22/44] ASoC: hdmi-codec: fix channel allocation
-
---
- sound/soc/codecs/hdmi-codec.c | 113 ++++++++++++++++------------------
- 1 file changed, 52 insertions(+), 61 deletions(-)
-
--- a/sound/soc/codecs/hdmi-codec.c
-+++ b/sound/soc/codecs/hdmi-codec.c
-@@ -194,78 +194,69 @@ static const struct snd_pcm_chmap_elem h
-  */
- static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
- 	{ .ca_id = 0x00, .n_ch = 2,
-	  .mask = FL | FR},
-	/* 2.1 */
-	{ .ca_id = 0x01, .n_ch = 4,
-	  .mask = FL | FR | LFE},
-	/* Dolby Surround */
-+	  .mask = FL | FR },
-+	{ .ca_id = 0x03, .n_ch = 4,
-+	  .mask = FL | FR | LFE | FC },
- 	{ .ca_id = 0x02, .n_ch = 4,
- 	  .mask = FL | FR | FC },
-	/* surround51 */
-+	{ .ca_id = 0x01, .n_ch = 4,
-+	  .mask = FL | FR | LFE },
- 	{ .ca_id = 0x0b, .n_ch = 6,
-	  .mask = FL | FR | LFE | FC | RL | RR},
-	/* surround40 */
-	{ .ca_id = 0x08, .n_ch = 6,
-	  .mask = FL | FR | RL | RR },
-	/* surround41 */
-	{ .ca_id = 0x09, .n_ch = 6,
-	  .mask = FL | FR | LFE | RL | RR },
-	/* surround50 */
-+	  .mask = FL | FR | LFE | FC | RL | RR },
- 	{ .ca_id = 0x0a, .n_ch = 6,
- 	  .mask = FL | FR | FC | RL | RR },
-	/* 6.1 */
-	{ .ca_id = 0x0f, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC | RL | RR | RC },
-	/* surround71 */
-+	{ .ca_id = 0x09, .n_ch = 6,
-+	  .mask = FL | FR | LFE | RL | RR },
-+	{ .ca_id = 0x08, .n_ch = 6,
-+	  .mask = FL | FR | RL | RR },
-+	{ .ca_id = 0x07, .n_ch = 6,
-+	  .mask = FL | FR | LFE | FC | RC },
-+	{ .ca_id = 0x06, .n_ch = 6,
-+	  .mask = FL | FR | FC | RC },
-+	{ .ca_id = 0x05, .n_ch = 6,
-+	  .mask = FL | FR | LFE | RC },
-+	{ .ca_id = 0x04, .n_ch = 6,
-+	  .mask = FL | FR | RC },
- 	{ .ca_id = 0x13, .n_ch = 8,
- 	  .mask = FL | FR | LFE | FC | RL | RR | RLC | RRC },
-	/* others */
-	{ .ca_id = 0x03, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC },
-	{ .ca_id = 0x04, .n_ch = 8,
-	  .mask = FL | FR | RC},
-	{ .ca_id = 0x05, .n_ch = 8,
-	  .mask = FL | FR | LFE | RC },
-	{ .ca_id = 0x06, .n_ch = 8,
-	  .mask = FL | FR | FC | RC },
-	{ .ca_id = 0x07, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC | RC },
-	{ .ca_id = 0x0c, .n_ch = 8,
-	  .mask = FL | FR | RC | RL | RR },
-	{ .ca_id = 0x0d, .n_ch = 8,
-	  .mask = FL | FR | LFE | RL | RR | RC },
-	{ .ca_id = 0x0e, .n_ch = 8,
-	  .mask = FL | FR | FC | RL | RR | RC },
-	{ .ca_id = 0x10, .n_ch = 8,
-	  .mask = FL | FR | RL | RR | RLC | RRC },
-	{ .ca_id = 0x11, .n_ch = 8,
-	  .mask = FL | FR | LFE | RL | RR | RLC | RRC },
-+	{ .ca_id = 0x1f, .n_ch = 8,
-+	  .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
- 	{ .ca_id = 0x12, .n_ch = 8,
- 	  .mask = FL | FR | FC | RL | RR | RLC | RRC },
-	{ .ca_id = 0x14, .n_ch = 8,
-	  .mask = FL | FR | FLC | FRC },
-	{ .ca_id = 0x15, .n_ch = 8,
-	  .mask = FL | FR | LFE | FLC | FRC },
-	{ .ca_id = 0x16, .n_ch = 8,
-	  .mask = FL | FR | FC | FLC | FRC },
-	{ .ca_id = 0x17, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC | FLC | FRC },
-	{ .ca_id = 0x18, .n_ch = 8,
-	  .mask = FL | FR | RC | FLC | FRC },
-	{ .ca_id = 0x19, .n_ch = 8,
-	  .mask = FL | FR | LFE | RC | FLC | FRC },
-	{ .ca_id = 0x1a, .n_ch = 8,
-	  .mask = FL | FR | RC | FC | FLC | FRC },
-	{ .ca_id = 0x1b, .n_ch = 8,
-	  .mask = FL | FR | LFE | RC | FC | FLC | FRC },
-	{ .ca_id = 0x1c, .n_ch = 8,
-	  .mask = FL | FR | RL | RR | FLC | FRC },
-	{ .ca_id = 0x1d, .n_ch = 8,
-	  .mask = FL | FR | LFE | RL | RR | FLC | FRC },
- 	{ .ca_id = 0x1e, .n_ch = 8,
- 	  .mask = FL | FR | FC | RL | RR | FLC | FRC },
-	{ .ca_id = 0x1f, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
-+	{ .ca_id = 0x11, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RL | RR | RLC | RRC },
-+	{ .ca_id = 0x1d, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RL | RR | FLC | FRC },
-+	{ .ca_id = 0x10, .n_ch = 8,
-+	  .mask = FL | FR | RL | RR | RLC | RRC },
-+	{ .ca_id = 0x1c, .n_ch = 8,
-+	  .mask = FL | FR | RL | RR | FLC | FRC },
-+	{ .ca_id = 0x0f, .n_ch = 8,
-+	  .mask = FL | FR | LFE | FC | RL | RR | RC },
-+	{ .ca_id = 0x1b, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RC | FC | FLC | FRC },
-+	{ .ca_id = 0x0e, .n_ch = 8,
-+	  .mask = FL | FR | FC | RL | RR | RC },
-+	{ .ca_id = 0x1a, .n_ch = 8,
-+	  .mask = FL | FR | RC | FC | FLC | FRC },
-+	{ .ca_id = 0x0d, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RL | RR | RC },
-+	{ .ca_id = 0x19, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RC | FLC | FRC },
-+	{ .ca_id = 0x0c, .n_ch = 8,
-+	  .mask = FL | FR | RC | RL | RR },
-+	{ .ca_id = 0x18, .n_ch = 8,
-+	  .mask = FL | FR | RC | FLC | FRC },
-+	{ .ca_id = 0x17, .n_ch = 8,
-+	  .mask = FL | FR | LFE | FC | FLC | FRC },
-+	{ .ca_id = 0x16, .n_ch = 8,
-+	  .mask = FL | FR | FC | FLC | FRC },
-+	{ .ca_id = 0x15, .n_ch = 8,
-+	  .mask = FL | FR | LFE | FLC | FRC },
-+	{ .ca_id = 0x14, .n_ch = 8,
-+	  .mask = FL | FR | FLC | FRC },
- };
- 
- struct hdmi_codec_priv {
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/HACK-h6-Add-HDMI-sound-card.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/HACK-h6-Add-HDMI-sound-card.patch
@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@siol.net>
-Date: Sat, 16 Jan 2021 10:58:14 +0100
-Subject: [PATCH] HACK: h6: Add HDMI sound card
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -108,6 +108,24 @@
- 			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
- 	};
- 
-+	sound_hdmi: sound {
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "allwinner-hdmi";
-+		simple-audio-card,mclk-fs = <128>;
-+		simple-audio-card,frame-inversion;
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&hdmi>;
-+		};
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s1>;
-+			dai-tdm-slot-num = <2>;
-+			dai-tdm-slot-width = <32>;
-+		};
-+	};
-+
- 	soc {
- 		compatible = "simple-bus";
- 		#address-cells = <1>;
-@@ -664,7 +682,6 @@
- 			dmas = <&dma 4>, <&dma 4>;
- 			resets = <&ccu RST_BUS_I2S1>;
- 			dma-names = "rx", "tx";
-			status = "disabled";
- 		};
- 
- 		spdif: spdif@5093000 {
-@@ -801,6 +818,7 @@
- 		};
- 
- 		hdmi: hdmi@6000000 {
-+			#sound-dai-cells = <0>;
- 			compatible = "allwinner,sun50i-h6-dw-hdmi";
- 			reg = <0x06000000 0x10000>;
- 			reg-io-width = <1>;
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Input-axp20x-pek-allow-wakeup-after-shutdown-6_1.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Input-axp20x-pek-allow-wakeup-after-shutdown-6_1.patch
@ -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",
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Input-axp20x-pek-allow-wakeup-after-shutdown-6_5.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Input-axp20x-pek-allow-wakeup-after-shutdown-6_5.patch
@ -1,36 +0,0 @@
-From dbf607d6716dd0a314d734cfd9423601d6c5a99d Mon Sep 17 00:00:00 2001
-From: OpenEmbedded <oe.patch@oe>
-Date: Wed, 6 Dec 2023 18:01:24 +0100
-Subject: [PATCH] Input: axp20x-pek - allow wakeup after shutdown
-
---
- drivers/input/misc/axp20x-pek.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
-index 4581606a2..7217dc6ed 100644
--- a/drivers/input/misc/axp20x-pek.c
-+++ b/drivers/input/misc/axp20x-pek.c
-@@ -393,6 +393,11 @@ static const struct dev_pm_ops axp20x_pek_pm_ops = {
- 	.resume_noirq = pm_sleep_ptr(axp20x_pek_resume_noirq),
- };
- 
-+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",
-@@ -408,6 +413,7 @@ MODULE_DEVICE_TABLE(platform, axp_pek_id_match);
- 
- 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",
-- 
-2.43.0
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/OrangePi-3-LTS-support.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/OrangePi-3-LTS-support.patch
@ -1,393 +0,0 @@
-From 20d3d43d9daa82d5fa1e937e17b975974572d189 Mon Sep 17 00:00:00 2001
-From: Juliano Dorigão <jdorigao@gmail.com>
-Date: Fri, 3 Mar 2023 16:12:03 -0400
-Subject: [PATCH] OrangePi 3 LTS support
-
---
- arch/arm64/boot/dts/allwinner/Makefile        |   1 +
- .../allwinner/sun50i-h6-orangepi-3-lts.dts    | 361 ++++++++++++++++++
- 2 files changed, 362 insertions(+)
- create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts
-
-diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 6a96494a2..ace8159a6 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
-+++ b/arch/arm64/boot/dts/allwinner/Makefile
-@@ -32,6 +32,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-beelink-gs1.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-3.dtb
-+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-3-lts.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts
-new file mode 100644
-index 000000000..67f38b8a1
--- /dev/null
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts
-@@ -0,0 +1,361 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+// Copyright (C) 2023 Jernej Skrabec <jernej.skrabec@gmail.com>
-+// Based on sun50i-h6-orangepi-3.dts, which is:
-+// Copyright (C) 2019 Ondřej Jirman <megous@megous.com>
-+
-+/dts-v1/;
-+
-+#include "sun50i-h6.dtsi"
-+#include "sun50i-h6-cpu-opp.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	model = "OrangePi 3 LTS";
-+	compatible = "xunlong,orangepi-3-lts", "allwinner,sun50i-h6";
-+
-+	aliases {
-+		ethernet0 = &emac;
-+		serial0 = &uart0;
-+	};
-+
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
-+	connector {
-+		compatible = "hdmi-connector";
-+		ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
-+		type = "a";
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+
-+	ext_osc32k: ext_osc32k_clk {
-+		#clock-cells = <0>;
-+		compatible = "fixed-clock";
-+		clock-frequency = <32768>;
-+		clock-output-names = "ext_osc32k";
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led-0 {
-+			label = "orangepi:red:power";
-+			gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
-+		};
-+
-+		led-1 {
-+			label = "orangepi:green:status";
-+			gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
-+			default-state = "on";
-+		};
-+	};
-+
-+	reg_vcc5v: vcc5v {
-+		/* board wide 5V supply directly from the DC jack */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-5v";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-always-on;
-+	};
-+
-+	reg_gmac_3v3: gmac-3v3 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "gmac-3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		startup-delay-us = <150000>;
-+		enable-active-high;
-+		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
-+	};
-+
-+	reg_vcc33_wifi: vcc33-wifi {
-+		/* Always on 3.3V regulator for WiFi and BT */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc33-wifi";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		enable-active-high;
-+		gpio = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
-+	};
-+
-+	reg_vcc_wifi_io: vcc-wifi-io {
-+		/* Always on 1.8V/300mA regulator for WiFi and BT IO */
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-wifi-io";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		regulator-always-on;
-+		vin-supply = <&reg_vcc33_wifi>;
-+	};
-+
-+	wifi_pwrseq: wifi-pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		clocks = <&rtc 1>;
-+		clock-names = "ext_clock";
-+		reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */
-+		post-power-on-delay-ms = <200>;
-+	};
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&reg_dcdca>;
-+};
-+
-+&de {
-+	status = "okay";
-+};
-+
-+&dwc3 {
-+	status = "okay";
-+};
-+
-+&ehci0 {
-+	status = "okay";
-+};
-+
-+&ehci3 {
-+	status = "okay";
-+};
-+
-+&emac {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&ext_rgmii_pins>;
-+	phy-mode = "rgmii";
-+	phy-handle = <&ext_rgmii_phy>;
-+	phy-supply = <&reg_gmac_3v3>;
-+	allwinner,rx-delay-ps = <1500>;
-+	allwinner,tx-delay-ps = <700>;
-+	status = "okay";
-+};
-+
-+&gpu {
-+	mali-supply = <&reg_dcdcc>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	hvcc-supply = <&reg_bldo2>;
-+	status = "okay";
-+};
-+
-+&hdmi_out {
-+	hdmi_out_con: endpoint {
-+		remote-endpoint = <&hdmi_con_in>;
-+	};
-+};
-+
-+&mdio {
-+	ext_rgmii_phy: ethernet-phy@1 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <1>;
-+
-+		reset-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
-+		reset-assert-us = <15000>;
-+		reset-deassert-us = <40000>;
-+	};
-+};
-+
-+&mmc0 {
-+	vmmc-supply = <&reg_cldo1>;
-+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
-+	bus-width = <4>;
-+	status = "okay";
-+};
-+
-+&mmc1 {
-+	vmmc-supply = <&reg_vcc33_wifi>;
-+	vqmmc-supply = <&reg_vcc_wifi_io>;
-+	mmc-pwrseq = <&wifi_pwrseq>;
-+	bus-width = <4>;
-+	non-removable;
-+	status = "okay";
-+};
-+
-+&mmc2 {
-+	vmmc-supply = <&reg_cldo1>;
-+	vqmmc-supply = <&reg_bldo2>;
-+	cap-mmc-hw-reset;
-+	non-removable;
-+	bus-width = <8>;
-+	status = "okay";
-+};
-+
-+&ohci0 {
-+	status = "okay";
-+};
-+
-+&ohci3 {
-+	status = "okay";
-+};
-+
-+&pio {
-+	vcc-pc-supply = <&reg_bldo2>;
-+	vcc-pd-supply = <&reg_cldo1>;
-+	vcc-pg-supply = <&reg_bldo3>;
-+};
-+
-+&r_ir {
-+	status = "okay";
-+};
-+
-+&r_rsb {
-+	clock-frequency = <100000>;
-+	status = "okay";
-+
-+	axp805: pmic@745 {
-+		compatible = "x-powers,axp805", "x-powers,axp806";
-+		reg = <0x745>;
-+		interrupt-parent = <&r_intc>;
-+		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
-+		interrupt-controller;
-+		#interrupt-cells = <1>;
-+		x-powers,self-working-mode;
-+		vina-supply = <&reg_vcc5v>;
-+		vinb-supply = <&reg_vcc5v>;
-+		vinc-supply = <&reg_vcc5v>;
-+		vind-supply = <&reg_vcc5v>;
-+		vine-supply = <&reg_vcc5v>;
-+		aldoin-supply = <&reg_vcc5v>;
-+		bldoin-supply = <&reg_vcc5v>;
-+		cldoin-supply = <&reg_vcc5v>;
-+
-+		regulators {
-+			reg_aldo1: aldo1 {
-+				regulator-always-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc-pl-led-ir";
-+			};
-+
-+			reg_aldo2: aldo2 {
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc33-audio-tv-ephy-mac";
-+			};
-+
-+			/* ALDO3 is shorted to CLDO1 */
-+			reg_aldo3: aldo3 {
-+				regulator-always-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-1";
-+			};
-+
-+			reg_bldo1: bldo1 {
-+				regulator-always-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc18-dram-bias-pll";
-+			};
-+
-+			reg_bldo2: bldo2 {
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc-efuse-pcie-hdmi-pc";
-+			};
-+
-+			reg_bldo3: bldo3 {
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc-pm-pg-dcxoio-wifi";
-+			};
-+
-+			bldo4 {
-+				/* unused */
-+			};
-+
-+			reg_cldo1: cldo1 {
-+				regulator-always-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-2";
-+			};
-+
-+			cldo2 {
-+				/* unused */
-+			};
-+
-+			cldo3 {
-+				/* unused */
-+			};
-+
-+			reg_dcdca: dcdca {
-+				regulator-always-on;
-+				regulator-min-microvolt = <800000>;
-+				regulator-max-microvolt = <1160000>;
-+				regulator-ramp-delay = <2500>;
-+				regulator-name = "vdd-cpu";
-+			};
-+
-+			reg_dcdcc: dcdcc {
-+				regulator-enable-ramp-delay = <32000>;
-+				regulator-min-microvolt = <810000>;
-+				regulator-max-microvolt = <1080000>;
-+				regulator-ramp-delay = <2500>;
-+				regulator-name = "vdd-gpu";
-+			};
-+
-+			reg_dcdcd: dcdcd {
-+				regulator-always-on;
-+				regulator-min-microvolt = <980000>;
-+				regulator-max-microvolt = <980000>;
-+				regulator-name = "vdd-sys";
-+			};
-+
-+			reg_dcdce: dcdce {
-+				regulator-always-on;
-+				regulator-min-microvolt = <1200000>;
-+				regulator-max-microvolt = <1200000>;
-+				regulator-name = "vcc-dram";
-+			};
-+
-+			sw {
-+				/* unused */
-+			};
-+		};
-+	};
-+};
-+
-+&pwm {
-+	status = "okay";
-+};
-+
-+&r_ir {
-+	status = "okay";
-+};
-+
-+&rtc {
-+	clocks = <&ext_osc32k>;
-+};
-+
-+/delete-node/ &spi0;
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_ph_pins>;
-+	status = "okay";
-+};
-+
-+&usb2otg {
-+	dr_mode = "host";
-+	status = "okay";
-+};
-+
-+&usb2phy {
-+	usb0_id_det-gpios = <&pio 2 15 GPIO_ACTIVE_HIGH>; /* PC15 */
-+	usb0_vbus-supply = <&reg_vcc5v>;
-+	usb3_vbus-supply = <&reg_vcc5v>;
-+	status = "okay";
-+};
-+
-+&usb3phy {
-+	status = "okay";
-+};
-- 
-2.39.2
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Revert-clk-qcom-Support-protected-clocks-property.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Revert-clk-qcom-Support-protected-clocks-property.patch
@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Mon, 30 Dec 2019 12:39:31 -0600
-Subject: [PATCH] Revert "clk: qcom: Support 'protected-clocks' property"
-
-Now that protected-clocks is handled in the clk core, this
-driver-specific implementation is redundant.
-
-This reverts commit b181b3b801da8893c8eb706e448dd5111b02de60.
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
---
- drivers/clk/qcom/common.c | 18 ------------------
- 1 file changed, 18 deletions(-)
-
--- a/drivers/clk/qcom/common.c
-+++ b/drivers/clk/qcom/common.c
-@@ -194,22 +194,6 @@ int qcom_cc_register_sleep_clk(struct de
- }
- EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);
- 
-/* Drop 'protected-clocks' from the list of clocks to register */
-static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc)
-{
-	struct device_node *np = dev->of_node;
-	struct property *prop;
-	const __be32 *p;
-	u32 i;
-
-	of_property_for_each_u32(np, "protected-clocks", prop, p, i) {
-		if (i >= cc->num_rclks)
-			continue;
-
-		cc->rclks[i] = NULL;
-	}
-}
-
- static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,
- 					 void *data)
- {
-@@ -272,8 +256,6 @@ int qcom_cc_really_probe(struct platform
- 	cc->rclks = rclks;
- 	cc->num_rclks = num_clks;
- 
-	qcom_cc_drop_protected(dev, cc);
-
- 	for (i = 0; i < num_clk_hws; i++) {
- 		ret = devm_clk_hw_register(dev, clk_hws[i]);
- 		if (ret)
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-allwinner-Enforce-consistent-MMC-numbering.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-allwinner-Enforce-consistent-MMC-numbering.patch
@ -1,67 +0,0 @@
-From ba3b30a80ac2c388d48c58fbee242466d51fbfd8 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 6 Dec 2020 11:15:34 -0600
-Subject: [PATCH 177/389] arm64: dts: allwinner: Enforce consistent MMC
- numbering
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
---
- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 ++++++
- arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi  | 6 ++++++
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi  | 6 ++++++
- 3 files changed, 18 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 77b5349f6087..9e0e17179839 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -18,6 +18,12 @@ / {
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 
-+	aliases {
-+		mmc0 = &mmc0;
-+		mmc1 = &mmc1;
-+		mmc2 = &mmc2;
-+	};
-+
- 	chosen {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
-index a56fae761a1f..2159fa336d75 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
-@@ -6,6 +6,12 @@
- #include <dt-bindings/thermal/thermal.h>
- 
- / {
-+	aliases {
-+		mmc0 = &mmc0;
-+		mmc1 = &mmc1;
-+		mmc2 = &mmc2;
-+	};
-+
- 	cpus {
- 		#address-cells = <1>;
- 		#size-cells = <0>;
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-index ca1d287a0a01..3feac99556f3 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -17,6 +17,12 @@ / {
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 
-+	aliases {
-+		mmc0 = &mmc0;
-+		mmc1 = &mmc1;
-+		mmc2 = &mmc2;
-+	};
-+
- 	cpus {
- 		#address-cells = <1>;
- 		#size-cells = <0>;
-- 
-2.35.3
-
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
@ -1,110 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@siol.net>
-Date: Fri, 16 Aug 2019 16:40:20 +0200
-Subject: [PATCH] arm64: dts: allwinner: h6: Add AC200 EPHY related nodes
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 56 ++++++++++++++++++++
- 1 file changed, 56 insertions(+)
-
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -16,6 +16,16 @@
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 
-+	ac200_pwm_clk: ac200_clk {
-+		compatible = "pwm-clock";
-+		#clock-cells = <0>;
-+		clock-frequency = <24000000>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pwm1_pin>;
-+		pwms = <&pwm 1 42 0>;
-+		status = "disabled";
-+	};
-+
- 	cpus {
- 		#address-cells = <1>;
- 		#size-cells = <0>;
-@@ -319,6 +329,10 @@
- 			cpu_speed_grade: cpu-speed-grade@1c {
- 				reg = <0x1c 0x4>;
- 			};
-+
-+			ephy_calib: ephy_calib@2c {
-+				reg = <0x2c 0x2>;
-+			};
- 		};
- 
- 		timer@3009000 {
-@@ -373,6 +387,13 @@
- 				drive-strength = <40>;
- 			};
- 
-+			ext_rmii_pins: rmii_pins {
-+				pins = "PA0", "PA1", "PA2", "PA3", "PA4",
-+				       "PA5", "PA6", "PA7", "PA8", "PA9";
-+				function = "emac";
-+				drive-strength = <40>;
-+			};
-+
- 			hdmi_pins: hdmi-pins {
- 				pins = "PH8", "PH9", "PH10";
- 				function = "hdmi";
-@@ -393,6 +414,11 @@
- 				function = "i2c2";
- 			};
- 
-+			i2c3_pins: i2c3-pins {
-+				pins = "PB17", "PB18";
-+				function = "i2c3";
-+			};
-+
- 			mmc0_pins: mmc0-pins {
- 				pins = "PF0", "PF1", "PF2", "PF3",
- 				       "PF4", "PF5";
-@@ -419,6 +445,11 @@
- 				bias-pull-up;
- 			};
- 
-+			pwm1_pin: pwm1-pin {
-+				pins = "PB19";
-+				function = "pwm1";
-+			};
-+
- 			/omit-if-no-ref/
- 			spi0_pins: spi0-pins {
- 				pins = "PC0", "PC2", "PC3";
-@@ -652,6 +683,31 @@
- 			#size-cells = <0>;
- 		};
- 
-+		i2c3: i2c@5002c00 {
-+			compatible = "allwinner,sun6i-a31-i2c";
-+			reg = <0x05002c00 0x400>;
-+			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&ccu CLK_BUS_I2C3>;
-+			resets = <&ccu RST_BUS_I2C3>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&i2c3_pins>;
-+			status = "disabled";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ac200: mfd@10 {
-+				compatible = "x-powers,ac200";
-+				reg = <0x10>;
-+				clocks = <&ac200_pwm_clk>;
-+
-+				ac200_ephy: phy {
-+					compatible = "x-powers,ac200-ephy";
-+					nvmem-cells = <&ephy_calib>;
-+					nvmem-cell-names = "ephy_calib";
-+				};
-+			};
-+		};
-+
- 		emac: ethernet@5020000 {
- 			compatible = "allwinner,sun50i-h6-emac",
- 				     "allwinner,sun50i-a64-emac";
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-allwinner-h6-Add-SCPI-protocol.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-allwinner-h6-Add-SCPI-protocol.patch
@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 14 Dec 2019 20:54:40 -0600
-Subject: [PATCH] arm64: dts: allwinner: h6: Add SCPI protocol
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
---
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -88,6 +88,13 @@
- 		method = "smc";
- 	};
- 
-+	scpi_protocol: scpi {
-+		compatible = "arm,scpi";
-+		mboxes = <&msgbox 2>, <&msgbox 3>;
-+		mbox-names = "tx", "rx";
-+		shmem = <&scpi_sram>;
-+	};
-+
- 	timer {
- 		compatible = "arm,armv8-timer";
- 		arm,no-tick-in-suspend;
-@@ -196,6 +203,19 @@
- 			#size-cells = <1>;
- 			ranges;
- 
-+			sram_a2: sram@100000 {
-+				compatible = "mmio-sram";
-+				reg = <0x00100000 0x18000>;
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				ranges = <0 0x00100000 0x18000>;
-+
-+				scpi_sram: scpi-sram@17c00 {
-+					compatible = "arm,scp-shmem";
-+					reg = <0x17c00 0x200>;
-+				};
-+			};
-+
- 			sram_c: sram@28000 {
- 				compatible = "mmio-sram";
- 				reg = <0x00028000 0x1e000>;
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@gmail.com>
-Date: Wed, 12 Oct 2022 23:01:04 +0200
-Subject: [PATCH] arm64: dts: allwinner: h6: Fix Cedrus IOMMU, again
-
-Cedrus actually uses two IOMMU channels. Add the second one.
-
-Fixes: 62a8ccf3a248 ("arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage")
-Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-index e897559d9a89..436cc2a02d1a 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -172,7 +172,7 @@ video-codec@1c0e000 {
- 			resets = <&ccu RST_BUS_VE>;
- 			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
- 			allwinner,sram = <&ve_sram 1>;
-			iommus = <&iommu 3>;
-+			iommus = <&iommu 1>, <&iommu 3>;
- 		};
- 
- 		gpu: gpu@1800000 {
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-h6-deinterlace.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/arm64-dts-h6-deinterlace.patch
@ -1,31 +0,0 @@
-From c009b3b707bbde30fa6ff49ca3075160524ea7b9 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@siol.net>
-Date: Tue, 26 May 2020 20:08:27 +0200
-Subject: [PATCH 41/44] arm64: dts: h6 deinterlace
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -160,6 +160,18 @@
- 			};
- 		};
-
-+		deinterlace: deinterlace@1420000 {
-+			compatible = "allwinner,sun50i-h6-deinterlace";
-+			reg = <0x01420000 0x2000>;
-+			clocks = <&ccu CLK_BUS_DEINTERLACE>,
-+				 <&ccu CLK_DEINTERLACE>,
-+				 <&ccu CLK_MBUS_DEINTERLACE>;
-+			clock-names = "bus", "mod", "ram";
-+			resets = <&ccu RST_BUS_DEINTERLACE>;
-+			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
-+			iommus = <&iommu 2>;
-+		};
-+
- 		video-codec@1c0e000 {
- 			compatible = "allwinner,sun50i-h6-video-engine";
- 			reg = <0x01c0e000 0x2000>;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marek Belisko	7798cc5eda	linux-mainline: Added LINUX_VERSION variable Fixes: File "/home/retpolanne/Dev/orange-pi-one-plus-image/poky/scripts/lib/devtool/standard.py", line 839, in modify if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TypeError: 'in ' requires string as left operand, not NoneType While running devtool modify virtual/kernel. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-04-25 08:54:39 +02:00
Marek Belisko	48472ebf37	Merge pull request #404 from linux-sunxi/kirkstone-nanopi-r1 u-boot:Added fixes for nanopi-r1 board	2024-04-25 08:08:37 +02:00
Marek Belisko	a665e3d23c	u-boot:Added fixes for nanopi-r1 board Added missing dts + small dts fix. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-04-24 15:34:27 +02:00
Marek Belisko	201bd2c428	linux-mainline: Added consistent mmc device handling for orangepi-pc-plus Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2024-01-10 09:19:42 +01:00
Marek Belisko	ce4a0294c3	linux-mainline: Backport fixes for mv64xxx PMIC For details please see: https://github.com/linux-sunxi/meta-sunxi/issues/397 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2023-11-20 13:30:09 +01:00
Marek Belisko	3fce491bba	Merge pull request #366 from pblxptr/orange-pi-zero-2-poc Introduce support for Orange PI Zero 2	2023-02-22 09:15:48 +01:00
pbiel	6ac957c598	Revert "Enable mainline ATF for 64 bit CPUs" This reverts commit `68e4972f6f`.	2023-02-21 08:15:34 +01:00
pbiel	68e4972f6f	Enable mainline ATF for 64 bit CPUs	2023-02-14 21:31:28 +01:00
pbiel	a1e217f10f	Fix typos, refactor SRC_URIs introduce new SOC_FAMILY	2023-02-11 11:38:44 +01:00
matteolel	7f75a3bd18	Fix random stucks during boot With my device, around one boot out of 3 was not able to finish. I found that the mmc order was not correct in that cases. Fix: enforcing device order in DTS.	2023-02-03 15:03:21 +01:00
mpromonet	e5b6d8f13e	sunxi: add cam support to nanopi-neo-air Signed-off-by: mpromonet <michel.promonet@free.fr>	2023-02-03 15:03:19 +01:00
matteolel	14ca86bdb3	Add bananapi-m2-zero machine	2023-02-03 15:03:11 +01:00
Marek Belisko	e27ac5477a	Merge pull request #363 from qpmr/kirkstone-fix-devtool-err linux-mainline: fix 'devtool modify' command fail	2023-02-03 07:55:45 +01:00
Ilja Byckevich	02d905b476	linux-mainline: fix 'devtool modify' command fail Traceback (most recent call last): File "${TOPDIR}/../src/poky/scripts/devtool", line 338, in <module> ret = main() File "${TOPDIR}/../src/poky/scripts/devtool", line 325, in main ret = args.func(args, config, basepath, workspace) File "${TOPDIR}/../src/poky/scripts/lib/devtool/standard.py", line 834, in modify if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): TypeError: 'in <string>' requires string as left operand, not NoneType Where 'kernelVersion' is None that cause an error. In the code: "kernelVersion = rd.getVar('LINUX_VERSION')" So LINUX_VERSION should be initialized Signed-off-by: Ilja Byckevich <iljabyckevich@gmail.com>	2023-02-03 09:51:22 +03:00
Marek Belisko	fde5948e85	Merge pull request #362 from spanceac/A13_boot_fix Fix boot of A13 based machines	2023-01-31 08:38:29 +01:00
Marek Belisko	7b05a7ea5f	Merge pull request #361 from qpmr/kirkstone-add-pi-one-plus-support conf: machine: Add "Orange Pi One Plus" support	2023-01-31 08:17:42 +01:00
Sebastian Panceac	2dc45f3cdc	Fix boot of A13 based machines This commit backports an u-boot patch that adds a compatible string for the Allwinner Sun4i-A10 I2C controller. This will fix the boot process freeze after SPL stage for A13 based machines Signed-off-by: Sebastian Panceac <spanceac@gmail.com>	2023-01-30 23:31:53 +02:00
Ilja Byckevich	2d229d2ca0	conf: machine: Add "Orange Pi One Plus" support Signed-off-by: Ilja Byckevich <iljabyckevich@gmail.com>	2023-01-30 20:13:27 +03:00
pbiel	fb9d9db5c3	Add UWE5622 wifi driver and required firmwmare	2023-01-27 09:33:15 +01:00
pbiel	a182269fd4	Add dump reg and sunxi sys info drivers and enable them in dt	2023-01-26 18:02:43 +01:00
pbiel	bdf63dfd79	Add device tree for h616 and orangepizero2	2023-01-26 14:39:20 +01:00
Marek Belisko	d1a076fbea	Merge pull request #360 from linux-sunxi/core-image-sato-fixes Core image sato fixes	2023-01-25 13:31:11 +01:00
Marek Belisko	7371198497	xserver-xorg: Added xshmfence dependency Fixes following: ERROR: Problem encountered: DRI3 requested, but xshmfence not found Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2023-01-23 10:36:20 +01:00
Marek Belisko	35e9d23058	mega-gl: Added more dependencies to fix config issue Fix following: ERROR: Problem encountered: xlib based GLX requires at least one gallium driver Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2023-01-23 10:35:38 +01:00
Marek Belisko	56dec0cd0f	sunxi.inc: Drop xf86-video-turbo It cannot be compiled anymore drop it. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2023-01-23 10:33:56 +01:00
Marek Belisko	df4da8dd06	Merge pull request #353 from spanceac/patch-2 Use correct arch in sun5i.inc - Kirkstone	2022-12-05 09:24:40 +01:00
Sebastian Panceac	2d86e00d7e	Use correct arch in sun5i.inc Cortex-A8 architecture is ARMv7A. Before this path fix the following failure was triggered when building for "olinuxino-a13" machine: " [..]/meta-sunxi/conf/machine/include/sun5i.inc:3: Could not include required file conf/machine/include/arm/armv8a/tune-cortexa8.inc "	2022-11-29 15:51:19 +02:00
Marek Belisko	5f4a85b92b	Merge pull request #350 from jakub-kozlowicz/kirkstone Add NanoPi Duo2 board support	2022-11-16 09:55:17 +01:00
Jakub Kozłowicz	9aab097e6b	add nanopi duo2 board support	2022-11-15 21:40:54 +01:00
Christophe Blaess	773dc04614	Fix `LICENSE` field of some recipes to correspond to Poky ones.	2022-09-12 07:27:30 +02:00
Anthony Papillon	eeb1cefdd4	Fix inherit distutils3 error	2022-09-09 08:24:40 +02:00
Marek Belisko	ebdbb33410	u-boot: Fix booting issues for 64bit boards In kirkstone we use u-boot 2022.01 which added as mandatory usage of scp. As it's used for power relates stuff and we don't need it atm set to to empty. Without this fix generated u-boot cannot boot. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2022-08-24 14:05:50 +02:00
Jacek Skarzynski	7c2df0f736	conf: Add orange-pi-zero2 config Signed-off-by: Jacek Skarzyński <skarzynski.jacek@gmail.com>	2022-08-04 11:56:12 +02:00
Jacek Skarzynski	05afdd62e0	linux-h616: Add kernel that supports OPi Zero 2 Signed-off-by: Jacek Skarzyński <skarzynski.jacek@gmail.com>	2022-08-04 11:54:42 +02:00
Jacek Skarzynski	eb9cbc7cf4	atf-sunxi: Add atf for H616 CPU Signed-off-by: Jacek Skarzyński <skarzynski.jacek@gmail.com>	2022-08-03 15:44:42 +02:00
				`@ -1 +0,0 @@`
				`/home/marek/data/projects/kas/sources/meta-sunxi/recipes-devtools/python/files/olinuxino-a20lime2`