[DO NOT MERGE] qualify the complete SP11 beta2 aggregate

Documentation/devicetree/bindings/sound/qcom,sm8250.yaml

@@ -29,6 +29,9 @@ properties:
               - qcom,sm8650-sndcard
               - qcom,sm8750-sndcard
           - const: qcom,sm8450-sndcard
+      - items:
+          - const: microsoft,denali-sndcard
+          - const: qcom,x1e80100-sndcard
       - enum:
           - dell,xps13-9345-sndcard
           - fairphone,fp4-sndcard

Documentation/devicetree/bindings/sound/qcom,wsa8840.yaml

@@ -40,8 +40,39 @@ properties:
     minItems: 6
     maxItems: 6
 
+  qcom,enable-cps:
+    type: boolean
+    description: Enable the dedicated CPS SoundWire source DAI on data port 6.
+
+  qcom,cps-offset1:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    maximum: 255
+    description: |
+      Slave-only SoundWire DP6 OffsetCtrl1 override for CPS. This does not
+      change the physical master-port schedule selected by qcom,port-mapping.
+
+  qcom,visense-channel-mask:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    minimum: 1
+    maximum: 255
+    description: |
+      Native WSA data-port-5 channel-enable mask for the VISENSE protection
+      sidechain. If absent, the codec default is used.
+
+  qcom,speaker-load-ohms:
+    enum: [4, 8]
+    description: |
+      Nominal speaker load impedance in ohms. A 4-ohm load selects the
+      matching PA gain and PBR thresholds when the amplifier reports a 2S
+      VPHX supply. If absent, the existing 8-ohm defaults are retained.
+
   '#sound-dai-cells':
-    const: 0
+    enum: [0, 1]
+    description: |
+      Zero selects the legacy single speaker-playback DAI. With one cell,
+      DAI 0 is speaker playback, DAI 1 is the render-coupled VISENSE
+      protection-feedback sidechain, and DAI 2 is the dedicated CPS feedback
+      sidechain when qcom,enable-cps is present.
 
   vdd-1p8-supply: true
   vdd-io-supply: true
@@ -75,7 +106,7 @@ examples:
             pinctrl-names = "default";
             pinctrl-0 = <&spkr_2_sd_n_active>;
             powerdown-gpios = <&lpass_tlmm 18 GPIO_ACTIVE_LOW>;
-            #sound-dai-cells = <0>;
+            #sound-dai-cells = <1>;
             sound-name-prefix = "SpkrRight";
             vdd-1p8-supply = <&vreg_l15b_1p8>;
             vdd-io-supply = <&vreg_l3g_1p2>;

arch/arm64/boot/dts/qcom/x1-microsoft-denali.dtsi

@@ -322,18 +322,21 @@
 	};
 
 	sound {
-		compatible = "qcom,x1e80100-sndcard";
+		compatible = "microsoft,denali-sndcard",
+			     "qcom,x1e80100-sndcard";
 		model = "X1E80100-Microsoft-Surface-Pro-11";
 		audio-routing = "SpkrLeft IN", "WSA WSA_SPK1 OUT",
 				"SpkrRight IN", "WSA WSA_SPK2 OUT",
 				"VA DMIC0", "vdd-micb",
-				"VA DMIC1", "vdd-micb";
+				"VA DMIC1", "vdd-micb",
+				"TX DMIC0", "vdd-micb",
+				"TX DMIC1", "vdd-micb";
 
 		wsa-dai-link {
 			link-name = "WSA Playback";
 
 			codec {
-				sound-dai = <&left_spkr>, <&right_spkr>,
+				sound-dai = <&left_spkr 0>, <&right_spkr 0>,
 					    <&swr0 0>, <&lpass_wsamacro 0>;
 			};
 
@@ -346,6 +349,51 @@
 			};
 		};
 
+		wsa-vi-dai-link {
+			link-name = "WSA VI Protection";
+
+			/*
+			 * One two-channel Windows-equivalent feedback transport:
+			 * amplifier VISENSE ports 10/11 -> WSA macro VI ->
+			 * SoundWire DIN0 -> AudioReach WSA TX0.
+			 */
+			codec {
+				sound-dai = <&left_spkr 1>, <&right_spkr 1>,
+					    <&swr0 9>, <&lpass_wsamacro 2>;
+			};
+
+			cpu {
+				sound-dai = <&q6apmbedai WSA_CODEC_DMA_TX_0>;
+			};
+
+			platform {
+				sound-dai = <&q6apm>;
+			};
+		};
+
+		wsa-cps-dai-link {
+			link-name = "WSA CPS Protection";
+
+			/*
+			 * Dedicated CPS sidechain: both WSA8845 DP6 sources share
+			 * physical SoundWire master port 13. swr0 DAI 10 is only
+			 * the independent ASoC/SoundWire stream handle; qcom,port-mapping
+			 * below remains authoritative for the physical master ports.
+			 */
+			codec {
+				sound-dai = <&left_spkr 2>, <&right_spkr 2>,
+					    <&swr0 10>, <&lpass_wsamacro 4>;
+			};
+
+			cpu {
+				sound-dai = <&q6apmbedai WSA_CODEC_DMA_TX_1>;
+			};
+
+			platform {
+				sound-dai = <&q6apm>;
+			};
+		};
+
 		va-dai-link {
 			link-name = "VA Capture";
 
@@ -361,6 +409,22 @@
 				sound-dai = <&q6apm>;
 			};
 		};
+
+		tx-dai-link {
+			link-name = "TX Capture";
+
+			codec {
+				sound-dai = <&lpass_txmacro 0>;
+			};
+
+			cpu {
+				sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>;
+			};
+
+			platform {
+				sound-dai = <&q6apm>;
+			};
+		};
 	};
 
 	wcn7850-pmu {
@@ -1142,23 +1206,31 @@
 		compatible = "sdw20217020400";
 		reg = <0 0>;
 		reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
-		#sound-dai-cells = <0>;
+		#sound-dai-cells = <1>;
 		sound-name-prefix = "SpkrLeft";
 		vdd-1p8-supply = <&vreg_l15b_1p8>;
 		vdd-io-supply = <&vreg_l12b_1p2>;
 		qcom,port-mapping = <1 2 3 7 10 13>;
+		qcom,speaker-load-ohms = <4>;
+		qcom,visense-channel-mask = <3>;
+		qcom,enable-cps;
+		qcom,cps-offset1 = <0>;
 	};
 
 	/* WSA8845, Right Speaker */
 	right_spkr: speaker@0,1 {
 		compatible = "sdw20217020400";
 		reg = <0 1>;
 		reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
-		#sound-dai-cells = <0>;
+		#sound-dai-cells = <1>;
 		sound-name-prefix = "SpkrRight";
 		vdd-1p8-supply = <&vreg_l15b_1p8>;
 		vdd-io-supply = <&vreg_l12b_1p2>;
 		qcom,port-mapping = <4 5 6 7 11 13>;
+		qcom,speaker-load-ohms = <4>;
+		qcom,visense-channel-mask = <3>;
+		qcom,enable-cps;
+		qcom,cps-offset1 = <25>;
 	};
 };
 

debian.qcom-x1e/changelog

@@ -1,3 +1,15 @@
+linux-qcom-x1e (7.2.2-jg-0sp11beta2) resolute; urgency=medium
+
+  * Supersede sp11beta1 with the restored camera parity series.
+
+ -- Leon Silcott <leon@boasi.io>  Wed, 02 Sep 2026 21:25:00 +0100
+
+linux-qcom-x1e (7.2.2-jg-0sp11beta1) resolute; urgency=medium
+
+  * Assemble the guarded SP11 topic stack for qualification.
+
+ -- Leon Silcott <leon@boasi.io>  Wed, 02 Sep 2026 19:30:00 +0100
+
 linux-qcom-x1e (7.2.2-jg-0) resolute; urgency=medium
 
   * arm64: dts: qcom: x1-lenovo-ideacentre-mini-01q8x10: discriminate compatible strings

drivers/acpi/platform_profile.c

@@ -43,6 +43,13 @@ static const char * const profile_names[] = {
 static_assert(ARRAY_SIZE(profile_names) == PLATFORM_PROFILE_LAST);
 
 static DEFINE_IDA(platform_profile_ida);
+static bool platform_profile_legacy_registered;
+
+static void platform_profile_legacy_notify(void)
+{
+	if (platform_profile_legacy_registered)
+		sysfs_notify(acpi_kobj, NULL, "platform_profile");
+}
 
 /**
  * _commmon_choices_show - Show the available profile choices
@@ -216,7 +223,7 @@ static ssize_t profile_store(struct device *dev,
 			return ret;
 	}
 
-	sysfs_notify(acpi_kobj, NULL, "platform_profile");
+	platform_profile_legacy_notify();
 
 	return count;
 }
@@ -436,7 +443,7 @@ static ssize_t platform_profile_store(struct kobject *kobj,
 			return ret;
 	}
 
-	sysfs_notify(acpi_kobj, NULL, "platform_profile");
+	platform_profile_legacy_notify();
 
 	return count;
 }
@@ -473,6 +480,14 @@ static const struct attribute_group platform_profile_group = {
 	.is_visible = profile_class_is_visible,
 };
 
+static int platform_profile_legacy_update_group(void)
+{
+	if (!platform_profile_legacy_registered)
+		return 0;
+
+	return sysfs_update_group(acpi_kobj, &platform_profile_group);
+}
+
 /**
  * platform_profile_notify - Notify class device and legacy sysfs interface
  * @dev: The class device
@@ -482,7 +497,7 @@ void platform_profile_notify(struct device *dev)
 	scoped_cond_guard(mutex_intr, return, &profile_lock) {
 		_notify_class_profile(dev, NULL);
 	}
-	sysfs_notify(acpi_kobj, NULL, "platform_profile");
+	platform_profile_legacy_notify();
 }
 EXPORT_SYMBOL_GPL(platform_profile_notify);
 
@@ -532,7 +547,7 @@ int platform_profile_cycle(void)
 			return err;
 	}
 
-	sysfs_notify(acpi_kobj, NULL, "platform_profile");
+	platform_profile_legacy_notify();
 
 	return 0;
 }
@@ -605,9 +620,9 @@ struct device *platform_profile_register(struct device *dev, const char *name,
 		goto cleanup_ida;
 	}
 
-	sysfs_notify(acpi_kobj, NULL, "platform_profile");
+	platform_profile_legacy_notify();
 
-	err = sysfs_update_group(acpi_kobj, &platform_profile_group);
+	err = platform_profile_legacy_update_group();
 	if (err)
 		goto cleanup_cur;
 
@@ -641,8 +656,8 @@ void platform_profile_remove(struct device *dev)
 	ida_free(&platform_profile_ida, pprof->minor);
 	device_unregister(&pprof->dev);
 
-	sysfs_notify(acpi_kobj, NULL, "platform_profile");
-	sysfs_update_group(acpi_kobj, &platform_profile_group);
+	platform_profile_legacy_notify();
+	platform_profile_legacy_update_group();
 }
 EXPORT_SYMBOL_GPL(platform_profile_remove);
 
@@ -690,23 +705,26 @@ static int __init platform_profile_init(void)
 {
 	int err;
 
-	if (acpi_disabled)
-		return -EOPNOTSUPP;
-
 	err = class_register(&platform_profile_class);
 	if (err)
 		return err;
 
+	if (acpi_disabled || !acpi_kobj)
+		return 0;
+
 	err = sysfs_create_group(acpi_kobj, &platform_profile_group);
 	if (err)
 		class_unregister(&platform_profile_class);
+	else
+		platform_profile_legacy_registered = true;
 
 	return err;
 }
 
 static void __exit platform_profile_exit(void)
 {
-	sysfs_remove_group(acpi_kobj, &platform_profile_group);
+	if (platform_profile_legacy_registered)
+		sysfs_remove_group(acpi_kobj, &platform_profile_group);
 	class_unregister(&platform_profile_class);
 }
 module_init(platform_profile_init);