Merge pull request #451 from alperak/master

Update to whinlatter release series and adapt to UNPACKDIR changes

conf/layer.conf

@@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"
 
 LAYERDEPENDS_sunxi = "core meta-python meta-arm"
 
-LAYERSERIES_COMPAT_sunxi = "honister kirkstone langdale mickledore nanbield scarthgap"
+LAYERSERIES_COMPAT_sunxi = "whinlatter"

conf/machine/include/sunxi.inc

@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-input-libinput"
+           xf86-input-keyboard"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
 PREFERRED_VERSION_linux-mainline ?= "6.6.%"

conf/machine/olinuxino-a20som204.conf

@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: Olimex A20-SOM204
+#@DESCRIPTION: Machine configuration for the Olimex A20-SOM204 Evaluation Board, based on Allwinner A20 CPU
+#https://github.com/OLIMEX/SOM204
+
+require conf/machine/include/sun7i.inc
+
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olimex-som204-evb.dtb"
+UBOOT_MACHINE = "A20-Olimex-SOM204-EVB_defconfig"

recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb

@@ -13,8 +13,6 @@ SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=https;branch=m
 # Increase PV with SRCREV change
 SRCREV = "af5f938ea14a3614d35ad3d9ab51a5d392117444"
 
-S = "${WORKDIR}/git"
-
 SUNXI_FEX_BIN_IMAGE = "fex-${MACHINE}-${PV}-${PR}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK = "fex-${MACHINE}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK_SIMPLE = "fex.bin"

recipes-bsp/u-boot/u-boot-sunxi.bb

@@ -31,8 +31,6 @@ PV = "v2014.04+git${SRCPV}"
 # Corresponds 2014.04 in Makefile
 SRCREV = "ea1ac32bf76eb60baef474c2516fc431b381d952"
 
-S = "${WORKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SPL_BINARY="u-boot-sunxi-with-spl.bin"

recipes-bsp/u-boot/u-boot_%.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:prepend:sunxi := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 DEPENDS:append:sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native "
 DEPENDS:append:sun50i = " trusted-firmware-a"
@@ -35,5 +35,5 @@ EXTRA_OEMAKE:append:sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin SCP=/dev/null"
 do_compile:sun50i[depends] += "trusted-firmware-a:do_deploy"
 
 do_compile:append:sunxi() {
-    ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
+    ${B}/tools/mkimage -C none -A arm -T script -d ${UNPACKDIR}/boot.cmd ${UNPACKDIR}/${UBOOT_ENV_BINARY}
 }

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

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

recipes-devtools/python/pya20_0.2.12.bb

@@ -6,17 +6,17 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=4e584373bb0f46ef1e423cb7df37847d"
 DEPENDS = "python3"
 
 # No GPIO mappings for other machines yet
-COMPATIBLE_MACHINE = "(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10lime|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a13som|olinuxino-a20som)"
+COMPATIBLE_MACHINE = "^(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10lime|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a13som|olinuxino-a20som)$"
 
 SRC_URI = "https://pypi.python.org/packages/source/p/pyA20/pyA20-${PV}.tar.gz \
            file://mapping.h \
           "
-S = "${WORKDIR}/pyA20-${PV}"
+S = "${UNPACKDIR}/pyA20-${PV}"
 
 inherit setuptools3
 
 do_compile:prepend() { 
-cp ${WORKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
+    cp ${UNPACKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
 }
 
 SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f"

recipes-graphics/libgles/sunxi-mali_git.bb

@@ -29,8 +29,6 @@ SRC_URI = "git://github.com/linux-sunxi/sunxi-mali.git;protocol=https;branch=mas
            file://0001-fix-test-build.patch \
            "
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "libdrm xorgproto libump patchelf-native"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"

recipes-graphics/libump/libump_git.bb

@@ -10,6 +10,3 @@ SRCREV = "ec0680628744f30b8fac35e41a7bd8e23e59c39f"
 
 SRC_URI = "git://github.com/linux-sunxi/libump.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
-

recipes-graphics/xorg-xserver/libdri2_git.bb

@@ -11,7 +11,5 @@ SRC_URI = "git://github.com/robclark/libdri2.git;protocol=http;branch=master"
 
 SRCREV = "4f1eef3183df2b270c3d5cbef07343ee5127a6a4"
 
-S = "${WORKDIR}/git"
-
 inherit autotools pkgconfig
 

recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb

@@ -14,13 +14,11 @@ SRCREV = "e094e3c8f9004ca3347694bd05b99d136e8621b9"
 SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \
            file://20-fbturbo.conf"
 
-S = "${WORKDIR}/git"
-
 CFLAGS += " -I${STAGING_INCDIR}/xorg "
 
 do_install:append() {
     install -d ${D}${datadir}/X11/xorg.conf.d
-    install -m 0644 ${WORKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
+    install -m 0644 ${UNPACKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
 }
 
 FILES:${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf"

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

@@ -6,8 +6,6 @@ PV = "1.0+git"
 SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master"
 SRCREV = "4050e02da2dce2b74c97101f7964ecfb962f5aec"
 
-S = "${WORKDIR}/git"
-
 inherit allarch
 
 do_compile[noexec] = "1"
@@ -29,7 +27,6 @@ FILES:${PN}-ap6212 = " \
     ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \
 "
 
-
 # Make armbian-firmware depend on all of the split-out packages.
 python populate_packages:prepend () {
     firmware_pkgs = oe.utils.packages_filter_out_system(d)

recipes-kernel/linux/linux-mainline.inc

@@ -20,7 +20,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
-S = "${WORKDIR}/linux-${PV}"
+S = "${UNPACKDIR}/linux-${PV}"
 
 # get release version 5.x or 6.x based on version
 KRELEASE = "${@d.getVar('PV', True).split('.')[0]}"

recipes-kernel/linux/linux-mainline/patches/0001-dts-allwinner-Orangepi-one-plus-Fixed-pmic-error.patch

@@ -1,77 +0,0 @@
-From aba276a0dabae7dac88a22b5a48488058ab9048c Mon Sep 17 00:00:00 2001
-From: OpenEmbedded <oe.patch@oe>
-Date: Wed, 11 Feb 2026 17:02:49 +0900
-Subject: [PATCH] Fixed pmic error
-
-When kernel is boot, rsb would not probe and initialize axp806 pmic correctly.
-
-Upstream revert it to use i2c bus instream rsb.
-
-Signed-off-by: OpenEmbedded <oe.patch@oe>
----
- .../dts/allwinner/sun50i-h6-orangepi.dtsi     | 25 ++++++++++---------
- 1 file changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
-index 92745128f..e34dbb992 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
-@@ -32,7 +32,7 @@ hdmi_con_in: endpoint {
- 		};
- 	};
- 
--	ext_osc32k: ext_osc32k_clk {
-+	ext_osc32k: ext-osc32k-clk {
- 		#clock-cells = <0>;
- 		compatible = "fixed-clock";
- 		clock-frequency = <32768>;
-@@ -94,6 +94,7 @@ hdmi_out_con: endpoint {
- &mmc0 {
- 	vmmc-supply = <&reg_cldo1>;
- 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
-+	disable-wp;
- 	bus-width = <4>;
- 	status = "okay";
- };
-@@ -112,20 +113,12 @@ &pio {
- 	vcc-pg-supply = <&reg_aldo1>;
- };
- 
--&r_ir {
--	status = "okay";
--};
--
--&r_pio {
--	vcc-pm-supply = <&reg_bldo3>;
--};
--
--&r_rsb {
-+&r_i2c {
- 	status = "okay";
- 
--	axp805: pmic@745 {
-+	axp805: pmic@36 {
- 		compatible = "x-powers,axp805", "x-powers,axp806";
--		reg = <0x745>;
-+		reg = <0x36>;
- 		interrupt-parent = <&r_intc>;
- 		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
- 		interrupt-controller;
-@@ -240,6 +233,14 @@ sw {
- 	};
- };
- 
-+&r_ir {
-+	status = "okay";
-+};
-+
-+&r_pio {
-+	vcc-pm-supply = <&reg_bldo3>;
-+};
-+
- &rtc {
- 	clocks = <&ext_osc32k>;
- };
--- 
-2.34.1
-

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

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

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

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

recipes-kernel/linux/linux-mainline/patches/0002-dts-orange-pi-one-plus-Add-Enable-Ethernet.patch

@@ -1,40 +0,0 @@
-From d547db3a6067b670995f7479cf6cec49ac09ef94 Mon Sep 17 00:00:00 2001
-From: Mark Choi <afewgoodman.choi@gmail.com>
-Date: Tue, 24 Feb 2026 14:33:42 +0900
-Subject: [PATCH] dts orange pi one plus Add Enable Ethernet
-
-1. Add compatible to specifiy RTL8211.
-This was fixed in U-boot.
-
-https://patchwork.ozlabs.org/project/uboot/patch/20230711003957.658805-2-retpolanne@posteo.net/#3148293
-
-2. Add reset pin definition(PD14) for RTL8211.
-reset pin is required for if up/down function.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mark Choi <afewgoodman.choi@gmail.com>
----
- .../boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts      | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-index 29a081e72..769716c0e 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-@@ -37,7 +37,11 @@ &emac {
- 
- &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>;
-+		reset-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
-+		reset-assert-us = <10000>;
-+		reset-deassert-us = <50000>;
-+
- 	};
- };
--- 
-2.34.1
-

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

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

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

@@ -3,6 +3,8 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
 Date: Thu, 11 May 2023 11:18:33 +0200
 Subject: [PATCH] bananapi-m64: Consistent nodes for mmc devices
 
+Upstream-Status: Pending
+
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
  arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 3 +++

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/0001-clk-config-fixup-of_property_for_each_u32-after-land.patch

@@ -1,42 +0,0 @@
-From 071808589900d4f2f5407a8a638466e75bb35a61 Mon Sep 17 00:00:00 2001
-From: Alexander Sack <asac@pantacor.com>
-Date: Thu, 12 Jun 2025 08:43:13 +0000
-Subject: [PATCH] clk-config: fixup of_property_for_each_u32 after landing of
- 914ef7d1a702c510d0b59151a9623f9d20c69d2a
-
----
- drivers/clk/clk-conf.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
-index 70b0fdd63..602383b96 100644
---- a/drivers/clk/clk-conf.c
-+++ b/drivers/clk/clk-conf.c
-@@ -16,9 +16,7 @@
- static int __set_clk_flags(struct device_node *node)
- {
- 	struct of_phandle_args clkspec;
--	struct property *prop;
- 	int i, index = 0, rc;
--	const __be32 *cur;
- 	struct clk *clk;
- 	u32 nr_cells;
- 
-@@ -31,11 +29,11 @@ static int __set_clk_flags(struct device_node *node)
- 	clkspec.np         = node;
- 	clkspec.args_count = nr_cells;
- 
--	of_property_for_each_u32(node, "protected-clocks", prop, cur, clkspec.args[0]) {
-+	of_property_for_each_u32(node, "protected-clocks", clkspec.args[0]) {
- 		/* read the remainder of the clock specifier */
- 		for (i = 1; i < nr_cells; ++i) {
--			cur = of_prop_next_u32(prop, cur, &clkspec.args[i]);
--			if (!cur) {
-+			_it.item = of_prop_next_u32(_it.prop, _it.item, &clkspec.args[i]);
-+			if (!_it.item) {
- 				pr_err("clk: invalid value of protected-clocks"
- 				       " property at %pOF\n", node);
- 				return -EINVAL;
--- 
-2.34.1
-

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/ASoC-hdmi-codec-fix-channel-allocation.patch

@@ -0,0 +1,142 @@
+From 91b69779e0875e58d8973b2938a1cc4b7a1c455b Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sun, 25 Mar 2018 22:17:06 +0200
+Subject: [PATCH 22/44] ASoC: hdmi-codec: fix channel allocation
+
+---
+ sound/soc/codecs/hdmi-codec.c | 113 ++++++++++++++++------------------
+ 1 file changed, 52 insertions(+), 61 deletions(-)
+
+--- a/sound/soc/codecs/hdmi-codec.c
++++ b/sound/soc/codecs/hdmi-codec.c
+@@ -194,78 +194,69 @@ static const struct snd_pcm_chmap_elem h
+  */
+ static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
+ 	{ .ca_id = 0x00, .n_ch = 2,
+-	  .mask = FL | FR},
+-	/* 2.1 */
+-	{ .ca_id = 0x01, .n_ch = 4,
+-	  .mask = FL | FR | LFE},
+-	/* Dolby Surround */
++	  .mask = FL | FR },
++	{ .ca_id = 0x03, .n_ch = 4,
++	  .mask = FL | FR | LFE | FC },
+ 	{ .ca_id = 0x02, .n_ch = 4,
+ 	  .mask = FL | FR | FC },
+-	/* surround51 */
++	{ .ca_id = 0x01, .n_ch = 4,
++	  .mask = FL | FR | LFE },
+ 	{ .ca_id = 0x0b, .n_ch = 6,
+-	  .mask = FL | FR | LFE | FC | RL | RR},
+-	/* surround40 */
+-	{ .ca_id = 0x08, .n_ch = 6,
+-	  .mask = FL | FR | RL | RR },
+-	/* surround41 */
+-	{ .ca_id = 0x09, .n_ch = 6,
+-	  .mask = FL | FR | LFE | RL | RR },
+-	/* surround50 */
++	  .mask = FL | FR | LFE | FC | RL | RR },
+ 	{ .ca_id = 0x0a, .n_ch = 6,
+ 	  .mask = FL | FR | FC | RL | RR },
+-	/* 6.1 */
+-	{ .ca_id = 0x0f, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC | RL | RR | RC },
+-	/* surround71 */
++	{ .ca_id = 0x09, .n_ch = 6,
++	  .mask = FL | FR | LFE | RL | RR },
++	{ .ca_id = 0x08, .n_ch = 6,
++	  .mask = FL | FR | RL | RR },
++	{ .ca_id = 0x07, .n_ch = 6,
++	  .mask = FL | FR | LFE | FC | RC },
++	{ .ca_id = 0x06, .n_ch = 6,
++	  .mask = FL | FR | FC | RC },
++	{ .ca_id = 0x05, .n_ch = 6,
++	  .mask = FL | FR | LFE | RC },
++	{ .ca_id = 0x04, .n_ch = 6,
++	  .mask = FL | FR | RC },
+ 	{ .ca_id = 0x13, .n_ch = 8,
+ 	  .mask = FL | FR | LFE | FC | RL | RR | RLC | RRC },
+-	/* others */
+-	{ .ca_id = 0x03, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC },
+-	{ .ca_id = 0x04, .n_ch = 8,
+-	  .mask = FL | FR | RC},
+-	{ .ca_id = 0x05, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RC },
+-	{ .ca_id = 0x06, .n_ch = 8,
+-	  .mask = FL | FR | FC | RC },
+-	{ .ca_id = 0x07, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC | RC },
+-	{ .ca_id = 0x0c, .n_ch = 8,
+-	  .mask = FL | FR | RC | RL | RR },
+-	{ .ca_id = 0x0d, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RL | RR | RC },
+-	{ .ca_id = 0x0e, .n_ch = 8,
+-	  .mask = FL | FR | FC | RL | RR | RC },
+-	{ .ca_id = 0x10, .n_ch = 8,
+-	  .mask = FL | FR | RL | RR | RLC | RRC },
+-	{ .ca_id = 0x11, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RL | RR | RLC | RRC },
++	{ .ca_id = 0x1f, .n_ch = 8,
++	  .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
+ 	{ .ca_id = 0x12, .n_ch = 8,
+ 	  .mask = FL | FR | FC | RL | RR | RLC | RRC },
+-	{ .ca_id = 0x14, .n_ch = 8,
+-	  .mask = FL | FR | FLC | FRC },
+-	{ .ca_id = 0x15, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FLC | FRC },
+-	{ .ca_id = 0x16, .n_ch = 8,
+-	  .mask = FL | FR | FC | FLC | FRC },
+-	{ .ca_id = 0x17, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC | FLC | FRC },
+-	{ .ca_id = 0x18, .n_ch = 8,
+-	  .mask = FL | FR | RC | FLC | FRC },
+-	{ .ca_id = 0x19, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RC | FLC | FRC },
+-	{ .ca_id = 0x1a, .n_ch = 8,
+-	  .mask = FL | FR | RC | FC | FLC | FRC },
+-	{ .ca_id = 0x1b, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RC | FC | FLC | FRC },
+-	{ .ca_id = 0x1c, .n_ch = 8,
+-	  .mask = FL | FR | RL | RR | FLC | FRC },
+-	{ .ca_id = 0x1d, .n_ch = 8,
+-	  .mask = FL | FR | LFE | RL | RR | FLC | FRC },
+ 	{ .ca_id = 0x1e, .n_ch = 8,
+ 	  .mask = FL | FR | FC | RL | RR | FLC | FRC },
+-	{ .ca_id = 0x1f, .n_ch = 8,
+-	  .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
++	{ .ca_id = 0x11, .n_ch = 8,
++	  .mask = FL | FR | LFE | RL | RR | RLC | RRC },
++	{ .ca_id = 0x1d, .n_ch = 8,
++	  .mask = FL | FR | LFE | RL | RR | FLC | FRC },
++	{ .ca_id = 0x10, .n_ch = 8,
++	  .mask = FL | FR | RL | RR | RLC | RRC },
++	{ .ca_id = 0x1c, .n_ch = 8,
++	  .mask = FL | FR | RL | RR | FLC | FRC },
++	{ .ca_id = 0x0f, .n_ch = 8,
++	  .mask = FL | FR | LFE | FC | RL | RR | RC },
++	{ .ca_id = 0x1b, .n_ch = 8,
++	  .mask = FL | FR | LFE | RC | FC | FLC | FRC },
++	{ .ca_id = 0x0e, .n_ch = 8,
++	  .mask = FL | FR | FC | RL | RR | RC },
++	{ .ca_id = 0x1a, .n_ch = 8,
++	  .mask = FL | FR | RC | FC | FLC | FRC },
++	{ .ca_id = 0x0d, .n_ch = 8,
++	  .mask = FL | FR | LFE | RL | RR | RC },
++	{ .ca_id = 0x19, .n_ch = 8,
++	  .mask = FL | FR | LFE | RC | FLC | FRC },
++	{ .ca_id = 0x0c, .n_ch = 8,
++	  .mask = FL | FR | RC | RL | RR },
++	{ .ca_id = 0x18, .n_ch = 8,
++	  .mask = FL | FR | RC | FLC | FRC },
++	{ .ca_id = 0x17, .n_ch = 8,
++	  .mask = FL | FR | LFE | FC | FLC | FRC },
++	{ .ca_id = 0x16, .n_ch = 8,
++	  .mask = FL | FR | FC | FLC | FRC },
++	{ .ca_id = 0x15, .n_ch = 8,
++	  .mask = FL | FR | LFE | FLC | FRC },
++	{ .ca_id = 0x14, .n_ch = 8,
++	  .mask = FL | FR | FLC | FRC },
+ };
+ 
+ struct hdmi_codec_priv {

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Revert-clk-qcom-Support-protected-clocks-property.patch

@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 30 Dec 2019 12:39:31 -0600
+Subject: [PATCH] Revert "clk: qcom: Support 'protected-clocks' property"
+
+Now that protected-clocks is handled in the clk core, this
+driver-specific implementation is redundant.
+
+This reverts commit b181b3b801da8893c8eb706e448dd5111b02de60.
+
+Signed-off-by: Samuel Holland <samuel@sholland.org>
+---
+ drivers/clk/qcom/common.c | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+--- a/drivers/clk/qcom/common.c
++++ b/drivers/clk/qcom/common.c
+@@ -194,22 +194,6 @@ int qcom_cc_register_sleep_clk(struct de
+ }
+ EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);
+ 
+-/* Drop 'protected-clocks' from the list of clocks to register */
+-static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc)
+-{
+-	struct device_node *np = dev->of_node;
+-	struct property *prop;
+-	const __be32 *p;
+-	u32 i;
+-
+-	of_property_for_each_u32(np, "protected-clocks", prop, p, i) {
+-		if (i >= cc->num_rclks)
+-			continue;
+-
+-		cc->rclks[i] = NULL;
+-	}
+-}
+-
+ static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,
+ 					 void *data)
+ {
+@@ -272,8 +256,6 @@ int qcom_cc_really_probe(struct platform
+ 	cc->rclks = rclks;
+ 	cc->num_rclks = num_clks;
+ 
+-	qcom_cc_drop_protected(dev, cc);
+-
+ 	for (i = 0; i < num_clk_hws; i++) {
+ 		ret = devm_clk_hw_register(dev, clk_hws[i]);
+ 		if (ret)

recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/orange-pi-3lts-common.scc

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

recipes-kernel/linux/linux-mainline_6.6.85.bb

@@ -9,6 +9,5 @@ SRC_URI += "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.t
            "
 SRC_URI[sha256sum] = "5ebaccf4ca3428cd26817bae62171f4efd270eed866a3e3d0a1d9e970b7b7529"
 
-
 KERNEL_FEATURES:append:orange-pi-3lts = " bsp/orange-pi-3lts/orange-pi-3lts-6_5.scc bsp/uwe5622/uwe5622-6_6.scc bsp/orange-pi-3lts/fix-rtc.scc"
 KERNEL_FEATURES:append:orange-pi-zero2 = " bsp/h61x/orangepi-zero2-6_6.scc bsp/uwe5622/uwe5622-6_6.scc"

recipes-kernel/linux/linux-mainline_6.6.85.bbappend

@@ -1,5 +0,0 @@
-
-SRC_URI:append:orange-pi-one-plus = " file://axp20x.cfg"
-SRC_URI:append:orange-pi-one-plus = " file://patches/0001-dts-allwinner-Orangepi-one-plus-Fixed-pmic-error.patch"
-SRC_URI:append:orange-pi-one-plus = " file://patches/0002-dts-orange-pi-one-plus-Add-Enable-Ethernet.patch"
-

recipes-kernel/linux/linux-sunxi_3.4.bb

@@ -21,8 +21,6 @@ SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protoc
         "
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-S = "${WORKDIR}/git"
-
 #fix QA issue "Files/directories were installed but not shipped: /usr/src/debug"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 

recipes-kernel/linux/linux-tools.inc

@@ -24,7 +24,6 @@ fakeroot do_install_perf () {
     fi
 }
 
-
 # perf tasks
 addtask compile_perf after do_compile before do_install
 addtask install_perf after do_install before do_package

recipes-kernel/linux/linux.inc

@@ -35,9 +35,10 @@ kernel_conf_variable() {
     fi
 }
 
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot"
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
+do_kernel_configme[depends] += "virtual/cross-binutils:do_populate_sysroot"
+do_kernel_configme[depends] += "virtual/cross-cc:do_populate_sysroot"
 do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
+do_kernel_configme[depends] += "kern-tools-native:do_populate_sysroot"
 
 do_configure:prepend() {
     CONF_SED_SCRIPT=""
@@ -45,8 +46,8 @@ do_configure:prepend() {
     #
     # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
     #
-    if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
-        install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+    if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then
+        install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
         kernel_conf_variable LOGO y
         kernel_conf_variable LOGO_LINUX_CLUT224 y
     fi

recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb

@@ -2,7 +2,7 @@ DESCRIPTION = "UWE5622 Wifi firmware"
 LICENSE = "CC0-1.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 COMPATIBLE_MACHINE = "(orange-pi-zero2|orange-pi-3lts)"
 

recipes-kernel/xradio-firmware/xradio-firmware.bb

@@ -11,8 +11,6 @@ COMPATIBLE_MACHINE = "orange-pi-zero"
 
 SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 do_install() {
     install -d ${D}${base_libdir}/firmware/xr819
     install -m 0644 ${S}/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/

recipes-kernel/xradio/xradio.bb

@@ -17,8 +17,6 @@ SRC_URI = "\
 	   git://github.com/fifteenhex/xradio.git;protocol=http;branch=master \
           "
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE += "-C ${STAGING_KERNEL_DIR} M=${S}"
 
 KERNEL_MODULE_AUTOLOAD += "xradio_wlan"

recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb

@@ -15,8 +15,6 @@ SRC_URI = "git://github.com/ebutera/gst-plugin-cedar.git;protocol=https;branch=m
 PV = "0.10.1+git${SRCPV}"
 PR = "r1"
 
-S = "${WORKDIR}/git"
-
 FILES:${PN} += "${libdir}/gstreamer-0.10/*.so"
 FILES:${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
 FILES:${PN}-dev += "${libdir}/gstreamer-0.10/*.la"

recipes-support/sunxi-tools/sunxi-tools_git.bb

@@ -12,8 +12,6 @@ SRCREV = "9a3d62aa0c820b3dd42ba3409b2043f4143683cd"
 
 inherit pkgconfig
 
-S = "${WORKDIR}/git"
-
 BBCLASSEXTEND = "native nativesdk"
 
 FILES:${PN} = "${bindir}/*"