Linux 6.12 (Missing ASUS bundle).

SteamFork · Nov 18, 2024 · 9f2eabe · 9f2eabe
1 parent 9885b0b
commit 9f2eabe
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/PKGBUILD/linux/0020-add-devices-to-oxp-sensors.patch b/PKGBUILD/linux/0020-add-devices-to-oxp-sensors.patch
@@ -1,22 +1,22 @@
-diff -rupN linux-6.9.8.orig/drivers/hwmon/oxp-sensors.c linux-6.9.8/drivers/hwmon/oxp-sensors.c
---- linux-6.9.8.orig/drivers/hwmon/oxp-sensors.c	2024-07-05 07:38:21.000000000 +0000
-+++ linux-6.9.8/drivers/hwmon/oxp-sensors.c	2024-07-10 23:02:16.668034636 +0000
-@@ -42,10 +42,14 @@ static bool unlock_global_acpi_lock(void
+diff -rupN linux-6.12.orig/drivers/hwmon/oxp-sensors.c linux-6.12/drivers/hwmon/oxp-sensors.c
+--- linux-6.12.orig/drivers/hwmon/oxp-sensors.c	2024-11-17 22:15:08.000000000 +0000
++++ linux-6.12/drivers/hwmon/oxp-sensors.c	2024-11-18 12:34:25.438029683 +0000
+@@ -45,12 +45,14 @@ static bool unlock_global_acpi_lock(void
  enum oxp_board {
  	aok_zoe_a1 = 1,
  	aya_neo_2,
 +	aya_neo_2s,
  	aya_neo_air,
-+	aya_neo_air_1s,
+ 	aya_neo_air_1s,
  	aya_neo_air_plus_mendo,
  	aya_neo_air_pro,
-+	aya_neo_flip,
+ 	aya_neo_flip,
  	aya_neo_geek,
 +	aya_neo_geek_1s,
- 	oxp_mini_amd,
- 	oxp_mini_amd_a07,
- 	oxp_mini_amd_pro,
-@@ -92,6 +96,13 @@ static const struct dmi_system_id dmi_ta
+ 	aya_neo_kun,
+ 	orange_pi_neo,
+ 	oxp_2,
+@@ -111,6 +113,13 @@ static const struct dmi_system_id dmi_ta
  		},
  		.driver_data = (void *)aya_neo_2,
  	},
@@ -30,7 +30,7 @@ diff -rupN linux-6.9.8.orig/drivers/hwmon/oxp-sensors.c linux-6.9.8/drivers/hwmo
  	{
  		.matches = {
  			DMI_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
-@@ -102,6 +113,13 @@ static const struct dmi_system_id dmi_ta
+@@ -128,6 +137,13 @@ static const struct dmi_system_id dmi_ta
  	{
  		.matches = {
  			DMI_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
@@ -44,7 +44,7 @@ diff -rupN linux-6.9.8.orig/drivers/hwmon/oxp-sensors.c linux-6.9.8/drivers/hwmo
  			DMI_EXACT_MATCH(DMI_BOARD_NAME, "AB05-Mendocino"),
  		},
  		.driver_data = (void *)aya_neo_air_plus_mendo,
-@@ -122,6 +140,20 @@ static const struct dmi_system_id dmi_ta
+@@ -169,6 +185,20 @@ static const struct dmi_system_id dmi_ta
  	},
  	{
  		.matches = {
@@ -65,26 +65,33 @@ diff -rupN linux-6.9.8.orig/drivers/hwmon/oxp-sensors.c linux-6.9.8/drivers/hwmo
  			DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
  			DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONE XPLAYER"),
  		},
-@@ -339,10 +371,14 @@ static int oxp_platform_read(struct devi
- 				return ret;
- 			switch (board) {
+@@ -463,12 +493,14 @@ static int oxp_platform_read(struct devi
+ 				return read_from_ec(OXP_2_SENSOR_FAN_REG, 2, val);
+ 			case aok_zoe_a1:
  			case aya_neo_2:
 +			case aya_neo_2s:
-+			case aya_neo_flip:
  			case aya_neo_air:
-+			case aya_neo_air_1s:
+ 			case aya_neo_air_1s:
  			case aya_neo_air_plus_mendo:
  			case aya_neo_air_pro:
+ 			case aya_neo_flip:
  			case aya_neo_geek:
 +			case aya_neo_geek_1s:
+ 			case aya_neo_kun:
+ 			case oxp_fly:
  			case oxp_mini_amd:
- 			case oxp_mini_amd_a07:
- 				*val = (*val * 255) / 100;
-@@ -385,6 +421,7 @@ static int oxp_platform_write(struct dev
+@@ -588,12 +620,14 @@ static int oxp_platform_write(struct dev
+ 				val = (val * 184) / 255;
+ 				return write_to_ec(OXP_SENSOR_PWM_REG, val);
+ 			case aya_neo_2:
++			case aya_neo_2s:
  			case aya_neo_air:
+ 			case aya_neo_air_1s:
  			case aya_neo_air_plus_mendo:
  			case aya_neo_air_pro:
-+			case aya_neo_flip:
+ 			case aya_neo_flip:
  			case aya_neo_geek:
++			case aya_neo_geek_1s:
+ 			case aya_neo_kun:
  			case oxp_mini_amd:
  			case oxp_mini_amd_a07:
diff --git a/PKGBUILD/linux/PKGBUILD b/PKGBUILD/linux/PKGBUILD
@@ -6,7 +6,7 @@
 #             Mikael Eriksson <[email protected]>
 
 pkgbase=linux
-pkgver=6.11.9
+pkgver=6.12
 pkgrel=1
 pkgdesc="Linux Stable"
 arch=(x86_64)
@@ -59,7 +59,7 @@ source=(
   0040-vcs-amdgpu-quirks.patch
   0041-air-amdgpu-quirks.patch
   0051-drm-amd-display-let-update_planes_and_stream_state-d.patch
-  0060-asus-patch-series.patch
+  #0060-asus-patch-series.patch
   0099-add-external-device-drivers.patch
 )
 validpgpkeys=(
@@ -76,7 +76,7 @@ sha256sums=('SKIP'
 'aefa22053dbc736d925e4edff86ef39fab98e6668a6cf0e30be43f57e0235c76' # 0008-ayaneo-1s-hp-fix.patch
 'f45ba5d7dbc004474314c9e0329014e8c9d6b111f1e00397b1072b1bde581761' # 0012-HACK-add-KConfig-to-enable-driver-specific-color-mgm.patch
 '683128d044f4df12dcb0a7b2858075f510d870460dc71f0d60f69df89cf62419' # 0013-Don-t-create-color_mgmt_properties-on-asics-SIENNA_C.patch
-'b42fa6bb0e3d93aa8a81f61543c2058fa6f8412b9ad190110ffb49c46e81d5ce' # 0020-add-devices-to-oxp-sensors.patch
+'783178f81727fcec0ff37b279a32c59b6c71702d18e53e472cdf1ee0a23d5241' # 0020-add-devices-to-oxp-sensors.patch
 'd4bc9044e7e3290d6885d08b8360b61744dc4227a723aa178f9041284e062f08' # 0031-IIO-add-aya-neo-tablet-identifier.patch
 'dc8218b5cf4b505a51c77712e54b944f01560d37a0e7630160d5f5776023cfda' # 0032-iio-imu-Add-driver-for-Bosch-BMI260-IMU.patch
 '5508dedc920022b728489eb3ebbf7235fe48a7822d3c654cd678388c743442b9' # 0033-Codec-Add-aw87xxx-codec-with-partial-acpi-implementa.patch
@@ -87,7 +87,7 @@ sha256sums=('SKIP'
 '93087d9449f994dca23c1d5a32919204d31afecc63950d74a2ea41aaa1e3a9ec' # 0040-vcs-amdgpu-quirks.patch
 'ab8a6dccf67cee7d924ee2e3d4690285d404bcb9bab70eced09b05fa2853b288' # 0041-air-amdgpu-quirks.patch
 '7c7df8d4427c807e2cea0f1e147efcdfb1e7c1c5271823cc6bb49f10b1846d19' # 0051-drm-amd-display-let-update_planes_and_stream_state-d.patch
-'8d4d6608dde047fa71520be233ddba33c4d52172c0df5172d68a77b75196a639' # 0060-asus-patch-series.patch
+#'8d4d6608dde047fa71520be233ddba33c4d52172c0df5172d68a77b75196a639' # 0060-asus-patch-series.patch
 '3b1dabc168e4884c6586720538014d6ef8955a0b783d6436dd4937af6622ee42' # 0099-add-external-device-drivers.patch
 )