]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Intel: sof_sdw: shift SSP BT mask bits.
authorMac Chiang <mac.chiang@intel.com>
Fri, 19 Dec 2025 03:49:02 +0000 (11:49 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 22 Dec 2025 09:00:35 +0000 (09:00 +0000)
The SSP BT mask bits overlapped with SOC_SDW_CODEC_SPKR,
SOC_SDW_SIDECAR_AMPS, and SOC_SDW_CODEC_MIC BIT[15–17] in
sdw_utils.h. Shift the SSP BT mask bits to a higher range to
eliminate the conflict.

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20251219034902.3630537-1-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_sdw_common.h

index 3aa1dcec5172caa08e4e69b705e858dadd75c4ed..5390f0a749d6d30f8974a8f1d75d174e007aee06 100644 (file)
@@ -46,11 +46,11 @@ enum {
 #define SOC_SDW_NO_AGGREGATION         BIT(14)
 
 /* BT audio offload: reserve 3 bits for future */
-#define SOF_BT_OFFLOAD_SSP_SHIFT       15
-#define SOF_BT_OFFLOAD_SSP_MASK        (GENMASK(17, 15))
+#define SOF_BT_OFFLOAD_SSP_SHIFT       18
+#define SOF_BT_OFFLOAD_SSP_MASK        (GENMASK(20, 18))
 #define SOF_BT_OFFLOAD_SSP(quirk)      \
        (((quirk) << SOF_BT_OFFLOAD_SSP_SHIFT) & SOF_BT_OFFLOAD_SSP_MASK)
-#define SOF_SSP_BT_OFFLOAD_PRESENT     BIT(18)
+#define SOF_SSP_BT_OFFLOAD_PRESENT     BIT(21)
 
 struct intel_mc_ctx {
        struct sof_hdmi_private hdmi;