Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 836b6b3

Browse files
macchianNorman Bintang
authored andcommitted
ANDROID: fixup! ASoC: Intel: sof_sdw: shift SSP BT mask bits.
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. Bug: 444302600 Test: run #cat /proc/asoc/cards, to check sound card is registered. Link: thesofproject/linux#5501 (The PR has been merged into the Linux GitHub, it will be picked up by kernel.org in the next timing window) Upstream-Task: 455997202 Change-Id: Ic4f9e8af8a2a9ad4f4a7f0f883402fba0afcb501 Signed-off-by: Mac Chiang <mac.chiang@intel.com>
1 parent 8c76ec8 commit 836b6b3

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

sound/soc/intel/boards/sof_sdw_common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ enum {
4646
#define SOC_SDW_NO_AGGREGATION BIT(14)
4747

4848
/* BT audio offload: reserve 3 bits for future */
49-
#define SOF_BT_OFFLOAD_SSP_SHIFT 15
50-
#define SOF_BT_OFFLOAD_SSP_MASK (GENMASK(17, 15))
49+
#define SOF_BT_OFFLOAD_SSP_SHIFT 18
50+
#define SOF_BT_OFFLOAD_SSP_MASK (GENMASK(20, 18))
5151
#define SOF_BT_OFFLOAD_SSP(quirk) \
5252
(((quirk) << SOF_BT_OFFLOAD_SSP_SHIFT) & SOF_BT_OFFLOAD_SSP_MASK)
53-
#define SOF_SSP_BT_OFFLOAD_PRESENT BIT(18)
53+
#define SOF_SSP_BT_OFFLOAD_PRESENT BIT(21)
5454

5555
struct intel_mc_ctx {
5656
struct sof_hdmi_private hdmi;

0 commit comments

Comments
 (0)