orange-pi-zero2: Added wifi firmware

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Add UWE5622 wifi driver and required firmwmare
2025-07-16 13:59:46 +02:00 · 2023-02-02 20:35:35 +01:00 · 2023-02-02 20:35:35 +01:00 · 2023-02-02 20:35:35 +01:00 · 2023-02-02 20:35:30 +01:00 · 2023-01-31 08:38:29 +01:00
62 changed files with 4273 additions and 12889 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 = "honister kirkstone langdale mickledore nanbield"
+LAYERSERIES_COMPAT_meta-sunxi = "honister kirkstone"
--- a/conf/machine/bananapi-m2-zero.conf
+++ b/conf/machine/bananapi-m2-zero.conf
@ -1,10 +0,0 @@
-#@TYPE: Machine
-#@NAME: bananapi-m2-zero
-#@DESCRIPTION: Machine configuration for the Banana Pi M2 Zero, base on Allwinner H3 CPU
-
-require conf/machine/include/sun8i.inc
-require conf/machine/include/hardware/ap6212a.inc
-
-KERNEL_DEVICETREE = "sun8i-h2-plus-bananapi-m2-zero.dtb"
-UBOOT_MACHINE = "bananapi_m2_zero_defconfig"
-
--- 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
@ -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-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.5.%"
+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
@ -9,7 +9,8 @@ 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"

@ -19,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/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-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-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
@ -2,15 +2,13 @@
 #@NAME: orange-pi-zero-2
 #@DESCRIPTION: Machine configuration for the orange-pi-zero-2, based on Allwinner H616 CPU

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

 KERNEL_DEVICETREE = "allwinner/sun50i-h616-orangepi-zero2.dtb"
 UBOOT_MACHINE = "orangepi_zero2_defconfig"

-SPL_BINARY = "u-boot-sunxi-with-spl.bin"
-
 # as for now neither graphics nor audio is supported
 MACHINE_FEATURES:remove = "alsa x11"
 MACHINE_FEATURES:append = "bluetooth wifi"

-MACHINE_EXTRA_RRECOMMENDS = "uwe5622-firmware"
+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,29 @@
+DESCRIPTION = "ARM Trusted Firmware Allwinner"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://license.md;md5=829bdeb34c1d9044f393d5a16c068371"
+
+SRC_URI = "git://github.com/apritzel/arm-trusted-firmware;nobranch=1;protocol=https"
+SRCREV = "aa75c8da415158a94b82a430b2b40000778e851f"
+
+SRC_URI:append = " file://0001-Use-same-type-as-in-declaration.patch"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+COMPATIBLE_MACHINE = "(sun50i)"
+
+PLATFORM:sun50i = "sun50iw1p1"
+
+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 = "(sun50i|sun50i-h616|sun50i-h6)"
-
-TFA_PLATFORM:sun50i = "sun50i_a64"
-TFA_PLATFORM:sun50i-h6 = "sun50i_h6"
-TFA_PLATFORM:sun50i-h616 = "sun50i_h616"
-
-TFA_BUILD_TARGET = "bl31"
--- 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,10 +5,135 @@ 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>
 ---
+ arch/arm/dts/Makefile               |   1 +
+ arch/arm/dts/sun8i-h3-nanopi-r1.dts | 102 ++++++++++++++++++++++++++++++++++++
+ configs/nanopi_r1_defconfig         |  22 ++++++++
+ 3 files changed, 125 insertions(+)
+ create mode 100644 arch/arm/dts/sun8i-h3-nanopi-r1.dts
+ create mode 100644 configs/nanopi_r1_defconfig
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 9fb3868..6743e32 100644
+--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
+@@ -600,6 +600,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 0000000..9c3c574
+--- /dev/null
+++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
+@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2019 Igor Pecovnik <igor@armbian.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "sun8i-h3-nanopi.dtsi"
+
+/ {
+	model = "FriendlyARM NanoPi R1";
+	compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";
+
+	reg_gmac_3v3: gmac-3v3 {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		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>;
+	};
+
+};
+
+&ehci0 {
+	status = "okay";
+};
+
+&pio {
+	gmac_power_pin_nanopi: gmac_power_pin@0 {
+		pins = "PD6";
+		function = "gpio_out";
+	};
+};
+
+&ohci0 {
+	status = "okay";
+};
+
+&mmc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc2_8bit_pins>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <8>;
+	non-removable;
+	cap-mmc-hw-reset;
+	status = "okay";
+};
+
+&emac {
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_rgmii_pins>;
+	phy-supply = <&reg_gmac_3v3>;
+	phy-handle = <&ext_rgmii_phy>;
+	phy-mode = "rgmii";
+
+	status = "okay";
+};
+
+&external_mdio {
+	ext_rgmii_phy: ethernet-phy@1 {
+		compatible = "ethernet-phy-ieee802.3-c22";
+		reg = <7>;
+	};
+};
 diff --git a/configs/nanopi_r1_defconfig b/configs/nanopi_r1_defconfig
 new file mode 100644
 index 0000000..e028b41
--- 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-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/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)"

@ -14,7 +14,8 @@ 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://0003-Add-nanopi-duo2-board-support.patch \
+	file://0004-i2c-mvtwsi-Add-compatible-string-for-allwinner-sun4i.patch \
        file://boot.cmd \
 "

@ -24,7 +25,7 @@ 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 ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
--- 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-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
@ -7,26 +7,6 @@ inherit kernel

 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"
@ -40,34 +20,13 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 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 \
-"
-
-# 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://defconfig \
 "

 SRC_URI:append:use-mailine-graphics = " file://drm.cfg"
 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"

 FILES_${KERNEL_PACKAGE_NAME}-base:append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
--- a/recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch
+++ b/recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch
@ -1,101 +0,0 @@
-diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-index cd3df12b65..33a161692f 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-@@ -77,6 +77,39 @@
- 		compatible = "mmc-pwrseq-simple";
- 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
- 	};
-+
-+        cam_xclk: cam-xclk {
-+                #clock-cells = <0>;
-+                compatible = "fixed-clock";
-+                clock-frequency = <24000000>;
-+                clock-output-names = "cam-xclk";
-+        };
-+
-+        reg_cam_avdd: cam-avdd {
-+                compatible = "regulator-fixed";
-+                regulator-name = "cam-avdd";
-+                regulator-min-microvolt = <2800000>;
-+                regulator-max-microvolt = <2800000>;
-+                vin-supply = <&reg_vcc3v3>;
-+        };
-+
-+        reg_cam_dovdd: cam-dovdd {
-+                compatible = "regulator-fixed";
-+                regulator-name = "cam-dovdd";
-+                regulator-min-microvolt = <1800000>;
-+                regulator-max-microvolt = <1800000>;
-+                vin-supply = <&reg_vcc3v3>;
-+        };
-+
-+        reg_cam_dvdd: cam-dvdd {
-+                compatible = "regulator-fixed";
-+                regulator-name = "cam-dvdd";
-+                regulator-min-microvolt = <1500000>;
-+                regulator-max-microvolt = <1500000>;
-+                vin-supply = <&reg_vcc3v3>;
-+        };
-+
-+
- };
- 
- &mmc0 {
-@@ -141,3 +174,55 @@
- 	/* USB VBUS is always on */
- 	status = "okay";
- };
-+
-+&csi {
-+    status = "okay";
-+
-+    port {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        /* Parallel bus endpoint */
-+        csi_from_ov5640: endpoint {
-+            remote-endpoint = <&ov5640_to_csi>;
-+            bus-width = <8>;
-+            data-shift = <2>;
-+            hsync-active = <1>; /* Active high */
-+            vsync-active = <0>; /* Active low */
-+            data-active = <1>;  /* Active high */
-+            pclk-sample = <1>;  /* Rising */
-+        };
-+    };
-+};
-+
-+&i2c2 {
-+   status = "okay";
-+
-+   ov5640: camera@3c {
-+        compatible = "ovti,ov5640";
-+        reg = <0x3c>;
-+        clocks = <&cam_xclk>;
-+        clock-names = "xclk";
-+
-+        reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>;
-+        powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>;
-+        AVDD-supply = <&reg_cam_avdd>;
-+        DOVDD-supply = <&reg_cam_dovdd>;
-+        DVDD-supply = <&reg_cam_dvdd>;
-+
-+        port {
-+            ov5640_to_csi: endpoint {
-+                remote-endpoint = <&csi_from_ov5640>;
-+                bus-width = <8>;
-+                data-shift = <2>;
-+                hsync-active = <1>; /* Active high */
-+                vsync-active = <0>; /* Active low */
-+                data-active = <1>;  /* Active high */
-+                pclk-sample = <1>;  /* Rising */
-+            };
-+        };
-+    };
-+};
-+&i2c2_pins {
-+   bias-pull-up;
-+};
-
--- a/recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch
+++ b/recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch
@ -1,28 +0,0 @@
-From 9b4baa9b5aab0511c46a1ae95485e1a3ea984352 Mon Sep 17 00:00:00 2001
-From: matteolel <matteolel91@hotmail.it>
-Date: Fri, 9 Dec 2022 16:38:11 +0000
-Subject: [PATCH] dts: allwinner: bananapi-m2-zreo: Enforce consistent MMC
- numbering
-
-Enforce MMC number (sometimes the order was wrong and the device does not boot).
---
- arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
-index 8e8634ff2..37a2ed937 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
-+++ b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
-@@ -20,6 +20,9 @@ / {
- 	aliases {
- 		serial0 = &uart0;
- 		serial1 = &uart1;
-+		mmc0 = &mmc0;
-+		mmc1 = &mmc1;
-+		mmc2 = &mmc2;
- 	};
- 
- 	chosen {
-- 
-2.25.1
-
--- 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/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/cam500b.cfg
+++ b/recipes-kernel/linux/linux-mainline/cam500b.cfg
@ -1,6 +0,0 @@
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-
-CONFIG_VIDEO_OV5640=m
-CONFIG_VIDEO_SUN6I_CSI=m
-CONFIG_VIDEO_V4L2=m
--- a/recipes-kernel/linux/linux-mainline/orange-pi-zero2/0001-dts-add-h616-and-orangepizero2.patch
+++ b/recipes-kernel/linux/linux-mainline/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-6.1.9/orange-pi-zero2/0006-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0006-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch
--- a/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0007-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0007-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch
--- a/recipes-kernel/linux/linux-mainline/orange-pi-zero2/0004-dts-add-sunxi-info-device-tree-node.patch
+++ b/recipes-kernel/linux/linux-mainline/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-6.1.9/orange-pi-zero2/0009-dts-add-addr_mgt-device-tree-node.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0009-dts-add-addr_mgt-device-tree-node.patch
@ -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/orange-pi-zero2/0006-drv-modem-power-Power-manager-for-modems.patch
+++ b/recipes-kernel/linux/linux-mainline/orange-pi-zero2/0006-drv-modem-power-Power-manager-for-modems.patch
--- a/recipes-kernel/linux/linux-mainline/orange-pi-zero2/0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch
+++ b/recipes-kernel/linux/linux-mainline/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-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/orange-pi-zero2/0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch
+++ b/recipes-kernel/linux/linux-mainline/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-6.1.9/orange-pi-zero2/0003-drv-fix-incldue-path-for-unisocwcn.patch
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/0003-drv-fix-incldue-path-for-unisocwcn.patch
@ -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-6.1.9/orange-pi-zero2/defconfig
+++ b/recipes-kernel/linux/linux-mainline-6.1.9/orange-pi-zero2/defconfig
--- a/recipes-kernel/linux/linux-mainline_5.15.91.bb
+++ b/recipes-kernel/linux/linux-mainline_5.15.91.bb
@ -4,4 +4,5 @@ DESCRIPTION = "Mainline Longterm Linux kernel"

 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"

-SRC_URI[sha256sum] = "a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80"
+SRC_URI[md5sum] = "0751179f60de73eb2cd93f161fa52fcf"
+SRC_URI[sha256sum] = "3b84e13abae26af17ebccc4d7212f5843a991127a73a320848d5c6942ef781a2"
--- a/recipes-kernel/linux/linux-mainline_5.15.35.bb
+++ b/recipes-kernel/linux/linux-mainline_5.15.35.bb
@ -0,0 +1,21 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+SRC_URI[sha256sum] = "0a1a5ae2f30eb2b38215e59077f045aabd7f4e2857a881482f02ea48186105d8"
+
+# opi-zero-2 support added only for 5.15 kernel so add it to this recipe not to inc file
+SRC_URI:append:orange-pi-zero2 = " \
+	file://0001-dts-add-h616-and-orangepizero2.patch \
+	file://0002-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch \
+	file://0003-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch \
+	file://0004-dts-add-sunxi-info-device-tree-node.patch \
+	file://0005-dts-add-addr_mgt-device-tree-node.patch \
+	file://0006-drv-modem-power-Power-manager-for-modems.patch \
+	file://0007-drv-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch \
+	file://0008-drv-wireless-add-uwe5622-driver.patch \
+	file://0009-drv-uwe5622-bluetooth-fix-firmware-init-fail.patch \
+	file://0010-drv-fix-incldue-path-for-unisocwcn.patch \
+"
--- a/recipes-kernel/linux/linux-mainline_5.4.69.bb
+++ b/recipes-kernel/linux/linux-mainline_5.4.69.bb
@ -0,0 +1,8 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+SRC_URI[md5sum] = "98c8187b801f006ba203db0669e307a5"
+SRC_URI[sha256sum] = "a8b31d716b397303a183e42ad525ff2871024a43e3ea530d0fdf73b7f9d27da7"
--- a/recipes-kernel/linux/linux-mainline_6.1.9.bb
+++ b/recipes-kernel/linux/linux-mainline_6.1.9.bb
@ -1,23 +0,0 @@
-require linux-mainline.inc
-
-DESCRIPTION = "Mainline Longterm Linux kernel"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-SRC_URI[sha256sum] = "d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b"
-
-SRC_URI:append:orange-pi-zero2  = " \
-        file://defconfig \
-        file://0001-drv-wireless-add-uwe5622-wifi-driver.patch \
-        file://0002-drv-wireless-driver-for-uwe5622-allwinner-bugfix.patch \
-        file://0003-drv-fix-incldue-path-for-unisocwcn.patch \
-        file://0004-drv-wireless-adapt-uwe5622-wifi-driver-to-kernel-6.1.patch \
-        file://0005-drv-fix-setting-mac-address-for-netdev-in-uwe5622.patch \
-        file://0006-drv-add-dump_reg-and-sunxi-sysinfo-drivers.patch \
-        file://0007-drv-add-sunxi_get_soc_chipid-and-sunxi_get_serial.patch \
-        file://0008-drv-add-sunxi-addr-driver.patch \
-        file://0009-dts-add-addr_mgt-device-tree-node.patch \
-        file://0010-dts-add-wifi-power-regulator.patch \
-        file://0011-dts-add-usb-to-h616.patch \
-        file://0012-dts-orange-pi-zero2.patch \
-"
--- a/recipes-kernel/linux/linux-mainline_6.5.11.bb
+++ b/recipes-kernel/linux/linux-mainline_6.5.11.bb
@ -1,8 +0,0 @@
-require linux-mainline.inc
-
-DESCRIPTION = "Mainline Longterm Linux kernel"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-SRC_URI[sha256sum] = "2ee24af9282b80923b2da56b70aad7df2e8ee4e3f076452e05ba66be2059b519"
-
--- a/recipes-kernel/uwe5622-firwmare/files/wcnmodem.bin
+++ b/recipes-kernel/uwe5622-firwmare/files/wcnmodem.bin
--- a/recipes-kernel/uwe5622-firwmare/files/wifi_2355b001_1ant.ini
+++ b/recipes-kernel/uwe5622-firwmare/files/wifi_2355b001_1ant.ini
--- a/recipes-kernel/uwe5622-firwmare/uwe5622-firmware.bb
+++ b/recipes-kernel/uwe5622-firwmare/uwe5622-firmware.bb
@ -6,10 +6,8 @@ S = "${WORKDIR}"

 COMPATIBLE_MACHINE = "orange-pi-zero2"

-SRC_URI:append = " \
-        file://wcnmodem.bin \
-        file://wifi_2355b001_1ant.ini \
-"
+SRC_URI += "file://wcnmodem.bin"
+SRC_URI += "file://wifi_2355b001_1ant.ini"

 do_install() {
    install -d ${D}${base_libdir}/firmware
@ -19,4 +17,4 @@ do_install() {

 FILES:${PN} = "${base_libdir}/*"

-PACKAGES = "${PN}"
+PACKAGES = "${PN}"
--- a/recipes-kernel/xradio/xradio.bb
+++ b/recipes-kernel/xradio/xradio.bb
@ -11,10 +11,11 @@ RDEPENDS:${PN} += "xradio-firmware"

 COMPATIBLE_MACHINE = "orange-pi-zero"

-SRCREV = "547521df27d1a80fb5542e93fa13bd09fb2259a2"
+SRCREV = "279868ac96f6db34b65f68c6722830fa0aacb86b"

 SRC_URI = "\
-	   git://github.com/fifteenhex/xradio.git;protocol=http;branch=master \
+	   git://github.com/dbeinder/xradio.git;protocol=https;branch=karabek_rebase \
+	file://0001-Enable-out-of-tree-compilation.patch \
          "

 S = "${WORKDIR}/git"
--- a/recipes-kernel/xradio/xradio/0001-Enable-out-of-tree-compilation.patch
+++ b/recipes-kernel/xradio/xradio/0001-Enable-out-of-tree-compilation.patch
@ -0,0 +1,30 @@
+From 15651d333da5429a1544f0a17d5f02c74f693ad7 Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@open-nandra.com>
+Date: Thu, 15 Oct 2020 14:45:07 +0200
+Subject: [PATCH] Enable out of tree compilation
+
+Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7a0de9a..ee75f0b 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,9 +1,9 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+ 
+ # # Standalone Makefile - uncomment for out-of-tree compilation
+-# CONFIG_WLAN_VENDOR_XRADIO := m
+-# ccflags-y += -DCONFIG_XRADIO_USE_EXTENSIONS
+-# ccflags-y += -DCONFIG_XRADIO_WAPI_SUPPORT
+CONFIG_WLAN_VENDOR_XRADIO := m
+ccflags-y += -DCONFIG_XRADIO_USE_EXTENSIONS
+ccflags-y += -DCONFIG_XRADIO_WAPI_SUPPORT
+ 
+ # Kernel part
+ 
+-- 
+2.7.4
+
Author	SHA1	Message	Date
Marek Belisko	7df2e3d132	orange-pi-zero2: Added wifi firmware Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2023-02-02 20:35:35 +01:00
Marek Belisko	577edca3d1	Add UWE5622 wifi driver and required firmwmare Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: pbiel <pbiel7@gmail.com>	2023-02-02 20:35:35 +01:00
Marek Belisko	ea93a2dd03	linux-mainline: Added orangepi-zero-2 support patches Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: pbiel <pbiel7@gmail.com>	2023-02-02 20:35:35 +01:00
Marek Belisko	948205c553	conf: Added machine definition for orange-pi-zero-2 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: pbiel <pbiel7@gmail.com>	2023-02-02 20:35:30 +01: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
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