[updpkg]: linux-tqc-a01 6.4.12 && enable hdmi audio output

5 files changed, 31 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0298803601a3..728ceec3f636 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-tqc-a01
-	pkgver = 6.4.11
+	pkgver = 6.4.12
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = aarch64
@@ -38,9 +38,9 @@ pkgbase = linux-tqc-a01
 	source = linux.preset
 	source = 60-linux.hook
 	source = 90-linux.hook
-	source = https://mirror.bjtu.edu.cn/kernel/linux/kernel/v6.x/patch-6.4.11.xz
+	source = https://mirror.bjtu.edu.cn/kernel/linux/kernel/v6.x/patch-6.4.12.xz
 	md5sums = bb65b2232cf596e7044c56a7c4205f51
-	md5sums = 7d9f4609119a7ae169cf7b7cb9121537
+	md5sums = d8b83f286380f920cef80c637a7af091
 	md5sums = 7a18066683f3351b2bbd2653db783f80
 	md5sums = 74baf0cb243b3abd5e38f0131c95408f
 	md5sums = 947f64e1c0eec0564cb683940a5af51f
@@ -52,18 +52,18 @@ pkgbase = linux-tqc-a01
 	md5sums = f585248da27f4a1a2ae00fcef89ad92e
 	md5sums = ab514581687e4bb1f107a3692bba4bf3
 	md5sums = b45a181d414c98d99fe3231dc56ee38d
-	md5sums = f8aa3197a5c1e6d01cb1809c31cc2d92
+	md5sums = 4c79495bf2f66cc506d780e7a62fd927
 	md5sums = eda5ceb6d7f63318bba5ec63c601ae93
 	md5sums = a709f3089148690f41c739275e66e9b0
 	md5sums = 99368425ced226332796b7f69fda3a2b
 	md5sums = 6ab19f7244b9f82f56edabeb7e1e1004
 	md5sums = a95bab65e3009909138c0982ab7234aa
 	md5sums = 113ec102b9b94a8c8c44dbde7e9b8d59
-	md5sums = 4ffd2586e7ffa6652a5ebfab3c7d9b9b
+	md5sums = 9681a8a5d7255d2e69a804ffcafa4dd6
 	md5sums = 66e0ae63183426b28c0ec0c7e10b5e16
 	md5sums = ce6c81ad1ad1f8b333fd6077d47abdaf
 	md5sums = 3dc88030a8f2f5a5f97266d99b149f77
-	md5sums = 2615856a8e6093234575cc390bb4b2fa
+	md5sums = 8e950aaeded83ce47ff85cae9771ca6a
 
 pkgname = linux-tqc-a01
 	pkgdesc = The Linux Kernel and modules - AArch64 kernel for TQC A01
@@ -73,12 +73,12 @@ pkgname = linux-tqc-a01
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
 	optdepends = firmware-tqc-a01: firmware for TQC A01 WiFi/Bluetooth
-	provides = linux=6.4.11
+	provides = linux=6.4.12
 	provides = WIREGUARD-MODULE
 	conflicts = linux
 	backup = etc/mkinitcpio.d/linux-tqc-a01.preset
 
 pkgname = linux-tqc-a01-headers
 	pkgdesc = Header files and scripts for building modules for linux kernel - AArch64 kernel for TQC A01
-	provides = linux-headers=6.4.11
+	provides = linux-headers=6.4.12
 	conflicts = linux-headers
diff --git a/PKGBUILD b/PKGBUILD
index eea5e8e04cc0..b17783e53fe1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=linux-tqc-a01
 _srcname=linux-6.4
 _kernelname=${pkgbase#linux}
 _desc="AArch64 kernel for TQC A01"
-pkgver=6.4.11
+pkgver=6.4.12
 pkgrel=1
 arch=('aarch64')
 url="http://www.kernel.org/"
@@ -64,7 +64,7 @@ source=(
 source+=("https://mirror.bjtu.edu.cn/kernel/linux/kernel/v6.x/patch-${pkgver}.xz")
 
 md5sums=('bb65b2232cf596e7044c56a7c4205f51'
-         '7d9f4609119a7ae169cf7b7cb9121537'
+         'd8b83f286380f920cef80c637a7af091'
          '7a18066683f3351b2bbd2653db783f80'
          '74baf0cb243b3abd5e38f0131c95408f'
          '947f64e1c0eec0564cb683940a5af51f'
@@ -76,18 +76,18 @@ md5sums=('bb65b2232cf596e7044c56a7c4205f51'
          'f585248da27f4a1a2ae00fcef89ad92e'
          'ab514581687e4bb1f107a3692bba4bf3'
          'b45a181d414c98d99fe3231dc56ee38d'
-         'f8aa3197a5c1e6d01cb1809c31cc2d92'
+         '4c79495bf2f66cc506d780e7a62fd927'
          'eda5ceb6d7f63318bba5ec63c601ae93'
          'a709f3089148690f41c739275e66e9b0'
          '99368425ced226332796b7f69fda3a2b'
          '6ab19f7244b9f82f56edabeb7e1e1004'
          'a95bab65e3009909138c0982ab7234aa'
          '113ec102b9b94a8c8c44dbde7e9b8d59'
-         '4ffd2586e7ffa6652a5ebfab3c7d9b9b'
+         '9681a8a5d7255d2e69a804ffcafa4dd6'
          '66e0ae63183426b28c0ec0c7e10b5e16'
          'ce6c81ad1ad1f8b333fd6077d47abdaf'
          '3dc88030a8f2f5a5f97266d99b149f77'
-         '2615856a8e6093234575cc390bb4b2fa')
+         '8e950aaeded83ce47ff85cae9771ca6a')
 
 prepare() {
   cd ${_srcname}
diff --git a/arm64-dts-allwinner-h6-Add-hdmi-sound-card.patch b/arm64-dts-allwinner-h6-Add-hdmi-sound-card.patch
index 603522ba0505..26899f5b7fc9 100644
--- a/arm64-dts-allwinner-h6-Add-hdmi-sound-card.patch
+++ b/arm64-dts-allwinner-h6-Add-hdmi-sound-card.patch
@@ -14,21 +14,26 @@ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/
 index fbe94abbb1f9..60d7ee645c31 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -101,6 +101,20 @@ scpi_protocol: scpi {
+@@ -101,6 +101,25 @@ scpi_protocol: scpi {
  		shmem = <&scpi_sram>;
  	};
  
-+	sound_hdmi: sound_hdmi {
-+		compatible = "allwinner,sun9i-a80-hdmi-audio",
-+			     "allwinner,sun50i-h6-hdmi-audio";
++	hdmi_sound: hdmi-sound {
++		compatible = "simple-audio-card";
++		simple-audio-card,format = "i2s";
++		simple-audio-card,name = "sun50i-h6-hdmi";
++		simple-audio-card,mclk-fs = <128>;
++		simple-audio-card,frame-inversion;
 +		status = "disabled";
 +
-+		codec {
++		simple-audio-card,codec {
 +			sound-dai = <&hdmi>;
 +		};
 +
-+		cpu {
++		simple-audio-card,cpu {
 +			sound-dai = <&i2s1>;
++			dai-tdm-slot-num = <2>;
++			dai-tdm-slot-width = <32>;
 +		};
 +	};
 +
diff --git a/config b/config
index c8ec90d97c0a..aa850e2e6e0e 100644
--- a/config
+++ b/config
@@ -6908,13 +6908,12 @@ CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_MAX3421_HCD=y
+# CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_HCD_ISO=y
+# CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
@@ -7007,14 +7006,7 @@ CONFIG_USB_DWC2_DUAL_ROLE=y
 CONFIG_USB_DWC2_PCI=y
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_PCI=y
-CONFIG_USB_CHIPIDEA_MSM=y
-CONFIG_USB_CHIPIDEA_IMX=y
-CONFIG_USB_CHIPIDEA_GENERIC=y
-CONFIG_USB_CHIPIDEA_TEGRA=y
+# CONFIG_USB_CHIPIDEA is not set
 CONFIG_USB_ISP1760=y
 CONFIG_USB_ISP1760_HCD=y
 CONFIG_USB_ISP1761_UDC=y
diff --git a/sun50i-h6-tqc-a01.dts b/sun50i-h6-tqc-a01.dts
index ae7b1e3262e3..17d59c787f80 100644
--- a/sun50i-h6-tqc-a01.dts
+++ b/sun50i-h6-tqc-a01.dts
@@ -215,6 +215,8 @@
 	vcc-pc-supply = <&reg_bldo2>;
 	vcc-pd-supply = <&reg_cldo1>;
 	vcc-pg-supply = <&reg_vcc_wifi_io>;
+	vcc-pl-supply = <&reg_aldo1>;
+	vcc-pm-supply = <&reg_vcc_wifi_io>;
 };
 
 &r_i2c {
@@ -346,7 +348,7 @@
 	clocks = <&ext_osc32k>;
 };
 
-&sound_hdmi {
+&hdmi_sound {
     status = "okay";
 };
 
@@ -364,7 +366,7 @@
 	status = "okay";
 
 	bluetooth {
-		compatible = "brcm,bcm4345c5";
+		compatible = "brcm,bcm43430a1-bt";
 		clocks = <&rtc 1>;
 		clock-names = "lpo";
 		device-wakeup-gpios = <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */