Merge branch 'armbian:main' into main

.github/CODEOWNERS

@@ -38,6 +38,7 @@ config/boards/cherryba-m1.csc		@IsMrX
 config/boards/clearfogpro.csc		@Heisath
 config/boards/cm3588-nas.csc		@ColorfulRhino
 config/boards/coolpi-cm5.csc		@andyshrk
+config/boards/coolpi-genbook.csc		@andyshrk
 config/boards/firefly-itx-3588j.csc		@SeeleVolleri
 config/boards/fxblox-rk1.csc		@mahdichi
 config/boards/gateway-gz80x.conf		@pyavitz

config/boards/coolpi-genbook.csc

@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC eMMC USB3 NVME
 BOARD_NAME="CoolPi GenBook"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="Andyshrk"
+BOARD_MAINTAINER="andyshrk"
 BOARD_FIRMWARE_INSTALL="-full"
 BOOT_SOC="rk3588"
 BOOTCONFIG="coolpi-cm5-genbook-rk3588_defconfig"

config/sources/families/sm8250.conf

@@ -16,13 +16,13 @@ enable_extension "image-output-abl"
 case $BRANCH in
 
 	current)
-		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH='branch:linux-6.11.y'
+		declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH='branch:linux-6.12.y'
 		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
+		declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
 		;;
 
 esac

packages/bsp/rockchip/asound.conf

@@ -1,27 +1,3 @@
-pcm.OnBoard_D0 {
-
-        type hw
-        card OnBoard
-        device 0
-
-}
-
-pcm.OnBoard_D1 {
-
-        type hw
-        card OnBoard
-        device 1
-
-}
-
-pcm.OnBoard_D2 {
-
-        type hw
-        card OnBoard
-        device 2
-
-}
-
 # Configuration to expose the SPDIF device of RK3288 to ALSA.
 # The device tree must describe a simple-audio-card device named "SPDIF"
 # for this to work properly
@@ -53,24 +29,18 @@ cards.SPDIF.pcm.iec958.0 {
 }
 
 # Configuration to expose the HDMI device of RK3288 to ALSA.
-# The device tree must describe a simple-audio-card device named "DW-I2S-HDMI"
+# The device tree must describe a simple-audio-card device named "HDMI"
 # for this to work properly
 # This percolates to PulseAudio, which will eventually show the proper
 # labels to the audio device
 
 <confdir:pcm/hdmi.conf>
 
-cards.DW-I2S-HDMI.pcm.hdmi.0 {
-        @args [ CARD DEVICE CTLINDEX AES0 AES1 AES2 AES3 ]
+cards.HDMI.pcm.hdmi.0 {
+        @args [ CARD AES0 AES1 AES2 AES3 ]
         @args.CARD {
                 type string
         }
-        @args.DEVICE {
-                type integer
-        }
-        @args.CTLINDEX {
-                type integer
-        }
         @args.AES0 {
                 type integer
         }
@@ -83,6 +53,22 @@ cards.DW-I2S-HDMI.pcm.hdmi.0 {
         @args.AES3 {
                 type integer
         }
-        type hw
-	card $CARD 
+        type hooks
+        slave.pcm {
+                type hw
+                card $CARD
+        }
+        hooks.0 {
+                type ctl_elems
+                hook_args [
+                        {
+                                interface PCM
+                                name "IEC958 Playback Default"
+                                lock true
+                                preserve true
+                                value [ $AES0 $AES1 $AES2 $AES3 ]
+                        }
+                ]
+        }
 }
+

patch/kernel/archive/meson64-6.1/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chen Jiali <[email protected]>
+Date: Tue, 23 Apr 2024 16:05:42 +0800
+Subject: [PATCH 1/1] Reduce eMMC frequency to improve compatibility
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+index cf0a9be83..29ace14b4 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+@@ -358,7 +358,7 @@ &sd_emmc_c {
+ 	cap-mmc-highspeed;
+ 	mmc-ddr-1_8v;
+ 	mmc-hs200-1_8v;
+-	max-frequency = <200000000>;
++	max-frequency = <150000000>;
+ 	disable-wp;
+
+ 	mmc-pwrseq = <&emmc_pwrseq>;

patch/kernel/archive/meson64-6.12/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chen Jiali <[email protected]>
+Date: Tue, 23 Apr 2024 16:05:42 +0800
+Subject: [PATCH 1/1] Reduce eMMC frequency to improve compatibility
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+index cf0a9be83..29ace14b4 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+@@ -358,7 +358,7 @@ &sd_emmc_c {
+ 	cap-mmc-highspeed;
+ 	mmc-ddr-1_8v;
+ 	mmc-hs200-1_8v;
+-	max-frequency = <200000000>;
++	max-frequency = <150000000>;
+ 	disable-wp;
+
+ 	mmc-pwrseq = <&emmc_pwrseq>;

patch/kernel/archive/meson64-6.12/overlay/Makefile

@@ -21,6 +21,7 @@ dtbo-$(CONFIG_ARCH_MESON) += \
 	meson-g12a-radxa-zero-uart-ao-b-on-gpioao-2-gpioao-3.dtbo \
 	meson-g12a-radxa-zero-uart-ao-b-on-gpioao-8-gpioao-9.dtbo \
 	meson-g12a-radxa-zero-uart-ee-c.dtbo \
+	meson-g12b-bananapi-cm4-i2c2.dtbo \
 	meson-g12b-bananapi-cm4-pwm-gpioh-5-fan.dtbo \
 	meson-g12b-bananapi-cm4-wifi-freq-200mhz.dtbo \
 	meson-g12b-bananapi-m2s-rtl8822cs.dtbo \

patch/kernel/archive/meson64-6.12/overlay/meson-g12b-bananapi-cm4-i2c2.dtso

@@ -0,0 +1,20 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
+
+	fragment@0 {
+		target = <&i2c2>;
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@1 {
+		target = <&uart_A>;
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+};

patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chen Jiali <[email protected]>
+Date: Tue, 23 Apr 2024 16:05:42 +0800
+Subject: [PATCH 1/1] Reduce eMMC frequency to improve compatibility
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+index cf0a9be83..29ace14b4 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+@@ -358,7 +358,7 @@ &sd_emmc_c {
+ 	cap-mmc-highspeed;
+ 	mmc-ddr-1_8v;
+ 	mmc-hs200-1_8v;
+-	max-frequency = <200000000>;
++	max-frequency = <150000000>;
+ 	disable-wp;
+
+ 	mmc-pwrseq = <&emmc_pwrseq>;

patch/kernel/archive/meson64-6.6/overlay/Makefile

@@ -21,6 +21,7 @@ dtbo-$(CONFIG_ARCH_MESON) += \
 	meson-g12a-radxa-zero-uart-ao-b-on-gpioao-2-gpioao-3.dtbo \
 	meson-g12a-radxa-zero-uart-ao-b-on-gpioao-8-gpioao-9.dtbo \
 	meson-g12a-radxa-zero-uart-ee-c.dtbo \
+	meson-g12b-bananapi-cm4-i2c2.dtbo \
 	meson-g12b-bananapi-cm4-pwm-gpioh-5-fan.dtbo \
 	meson-g12b-bananapi-cm4-wifi-freq-200mhz.dtbo \
 	meson-g12b-bananapi-m2s-rtl8822cs.dtbo \

patch/kernel/archive/meson64-6.6/overlay/meson-g12b-bananapi-cm4-i2c2.dts

@@ -0,0 +1,20 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
+
+	fragment@0 {
+		target = <&i2c2>;
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@1 {
+		target = <&uart_A>;
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+};