Updated README.md

README.md

@@ -1,13 +1,13 @@
 # Upstream Linux 6.1 LTS for CoolPi RK3588 devices
 ## Description
-This kernel is based on the **rk-6.1-rkr5** branch of the **Armbian Rockchip Linux 6.1 LTS** kernel with patches sourced from the **linux-6.1-stan-rkr3.1** branch of the **CoolPi Linux 6.1 LTS** kernel to support **CoolPi** devices. 
+This kernel is based on the **rk-6.1-rkr5** branch of the **Armbian Rockchip Linux 6.1 LTS** kernel with patches sourced from the **linux-6.1-stan-rkr3.1** branch of the **CoolPi Linux 6.1 LTS** kernel to support **CoolPi** devices, including those that were recently dropped by the CoolPi vendor kernel (commit 4c7deae). 
 
 Additional patches for the **Armbian** and **CoolPi** kernels are applied as they are released.  Patch commit status can be verified by either running the **build-kernel.sh** script or by referring to the files containing the patch commit hashes that the build script reads from: **armbian-rk-6.1-rkr5-patch-release** and **coolpi-linux-6.1-stan-rkr3.1-patch-release**.
 
 This kernel aims to always be on the latest **Linux 6.1 LTS upstream release**.
 
 ## Kernel Testing Information
-The device used to test this kernel is a CoolPi CM5 NoteBook v20.
+The device used to test this kernel is a CoolPi CM5 NoteBook v20, also known as the CoolPi CM5 GenBook.
 
 ## Credits and Sources
 | Repository                                                  | Branch                                                         | Organization |

arch/arm64/boot/dts/rockchip/Makefile

@@ -428,10 +428,10 @@
 #dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-tablet-v10.dtb
 #dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-tablet-v11.dtb
 #dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-luckfox-core3566.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-cpcm5-notebook-v20.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-cpcm5-evb-v11.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-cpcm5-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-cp4.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-cm5-test.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-cpcm5-genbook.dtb
 
 subdir-y := $(dts-dirs) overlay

arch/arm64/boot/dts/rockchip/rk3588-cpcm5-genbook.dts

@@ -422,6 +422,16 @@
 		4G,power-gpio = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
 		status = "okay";
 	};
+
+	i2c_mux: i2c-mux {
+		compatible = "i2c-gpio";
+		sda-gpios = <&gpio4 RK_PA7 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+		scl-gpios = <&gpio4 RK_PA6 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+		i2c-gpio,delay-us = <8>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
 };
 
 &cpu_l0 {
@@ -1143,6 +1153,16 @@
 	};
 };
 
+&i2c_mux {
+	status = "okay";
+	
+	atsha204a: atsha204a@64 {
+		status = "okay";
+        compatible = "atmel,atsha204a";
+        reg = <0x64>;
+    };
+};
+
 &i2s0_8ch {
 	status = "okay";
 	pinctrl-names = "default";

arch/arm64/configs/rk3588_cpcm5_genbook_defconfig

@@ -1031,3 +1031,96 @@ CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_LOADER_COMPRESS_XZ=y
 CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 CONFIG_FW_UPLOAD=y
+CONFIG_PPP=y
+CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=y
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOE=y
+CONFIG_PPTP=y
+CONFIG_PPPOL2TP=y
+CONFIG_PPP_ASYNC=y
+CONFIG_PPP_SYNC_TTY=y
+CONFIG_AT76C50X_USB=m
+CONFIG_B43=m
+CONFIG_BRCMSMAC=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+CONFIG_IPW2100_DEBUG=y
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+CONFIG_IPW2200_DEBUG=y
+CONFIG_LIBIPW_DEBUG=y
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_IWLEGACY_DEBUG=y
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_DEBUG=y
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_DEBUG=y
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_MT7601U=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615E=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921E=m
+CONFIG_MT7921S=m
+CONFIG_MT7921U=m
+CONFIG_RT2X00=m
+CONFIG_RT2800PCI=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2X00_DEBUG=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTW88=m
+CONFIG_RTW89=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852CE=m
+CONFIG_RTW89_DEBUGMSG=y
+CONFIG_RTW89_DEBUGFS=y
+CONFIG_I2C_MUX_GPIO=y
+CONFIG_I2C_GPIO=y
+CONFIG_CRYPTO_DEV_ATSHA204A=y

build-kernel.sh

@@ -37,7 +37,7 @@ echo "3. cm5-evb"
 echo "4. cm5-evb-v11"
 echo "5. cm5-minipc"
 echo "6. cm5-notebook"
-echo "7. cm5-notebook-v20"
+echo "7. cm5-notebook-v20/genbook"
 echo "8. cm5-8uart"
 echo "9. cpnano"
 echo "10. Exit Script"
@@ -79,8 +79,8 @@ case $choice in
 	  BOARD="cm5-notebook"
       ;;
     7)
-      echo "BOARD=cm5-notebook-v20"
-	  BOARD="cm5-notebook-v20"
+      echo "BOARD=cm5-genbook"
+	  BOARD="cm5-genbook"
       ;;
     8)
       echo "BOARD=cm5-8uart"
@@ -139,11 +139,11 @@ case "$BOARD" in
     txt_config_file="config_cpcm5_notebook.txt"
     txt_extconf_file="extlinux_cpcm5_notebook.conf"
     ;;
-  cm5-notebook-v20)
-    cfg="rk3588_cpcm5_notebook_v20_defconfig"
-    dtb="rk3588-cpcm5-notebook-v20.dtb"
-    txt_config_file="config_cpcm5_notebook_v20.txt"
-    txt_extconf_file="extlinux_cpcm5_notebook_v20.conf"
+  cm5-genbook)
+    cfg="rk3588_cpcm5_genbook_defconfig"
+    dtb="rk3588-cpcm5-genbook.dtb"
+    txt_config_file="config_cpcm5_genbook.txt"
+    txt_extconf_file="extlinux_cpcm5_genbook.conf"
     ;;
   cm5-8uart)
     cfg="rk3588_cpcm5_defconfig"

coolpi-linux-6.1-stan-rkr3.1-patch-release

@@ -1 +1 @@
-d931710eacc73fec9728458547c6c5c787930bde
+4c7deae912bc0e48912b78c1a0ce366b6d17cad4

demo-cfgs/config_cpcm5_genbook.txt

@@ -1,5 +1,5 @@
 bootdir=/
 kernel=vmlinuz
 initrd=initrd.img
-dtb=rk3588-cpcm5-notebook-v20.dtb
+dtb=rk3588-cpcm5-genbook.dtb
 

demo-cfgs/extlinux_cpcm5_genbook.conf

@@ -3,5 +3,5 @@ default Linux coolpi
 label Linux coolpi
 	kernel /Image
 	initrd /initrd.img
-	fdt    /rk3588-cpcm5-notebook-v20.dtb
+	fdt    /rk3588-cpcm5-genbook.dtb
 	append root=LABEL=writable rw rootfstype=ext4 console=ttyS0,115200n81 quiet splash plymouth.ignore-serial-consoles vt.global_cursor_default=1 irqchip.gicv3_pseudo_nmi=0 net.ifnames=0