Unverified Commit 368fa526 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: extends SOF_RT711_JDSRC to 4 bits 



commit 683b0df2 ("ASoC: rt711: add two jack detection modes")
added two jack detection modes. Rt711 has 4 JD modes now.
Reserve 4 bits in case rt711 adds more JD modes in the future.

Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210712203240.46960-6-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 542d7050

sound/soc/intel/boards/sof_sdw_common.h

+11 −11
Original line number Diff line number Diff line
@@ -41,21 +41,21 @@ enum { 
	SOF_I2S_SSP5 = BIT(5),

};



#define SOF_RT711_JDSRC(quirk)		((quirk) & GENMASK(1, 0))

#define SOF_SDW_FOUR_SPK		BIT(2)

#define SOF_SDW_TGL_HDMI		BIT(3)

#define SOF_SDW_PCH_DMIC		BIT(4)

#define SOF_SSP_PORT(x)		(((x) & GENMASK(5, 0)) << 5)

#define SOF_SSP_GET_PORT(quirk)	(((quirk) >> 5) & GENMASK(5, 0))

#define SOF_RT715_DAI_ID_FIX		BIT(11)

#define SOF_SDW_NO_AGGREGATION		BIT(12)

#define SOF_RT711_JDSRC(quirk)		((quirk) & GENMASK(3, 0))

#define SOF_SDW_FOUR_SPK		BIT(4)

#define SOF_SDW_TGL_HDMI		BIT(5)

#define SOF_SDW_PCH_DMIC		BIT(6)

#define SOF_SSP_PORT(x)		(((x) & GENMASK(5, 0)) << 7)

#define SOF_SSP_GET_PORT(quirk)	(((quirk) >> 7) & GENMASK(5, 0))

#define SOF_RT715_DAI_ID_FIX		BIT(13)

#define SOF_SDW_NO_AGGREGATION		BIT(14)



/* BT audio offload: reserve 3 bits for future */

#define SOF_BT_OFFLOAD_SSP_SHIFT	13

#define SOF_BT_OFFLOAD_SSP_MASK	(GENMASK(15, 13))

#define SOF_BT_OFFLOAD_SSP_SHIFT	15

#define SOF_BT_OFFLOAD_SSP_MASK	(GENMASK(17, 15))

#define SOF_BT_OFFLOAD_SSP(quirk)	\

	(((quirk) << SOF_BT_OFFLOAD_SSP_SHIFT) & SOF_BT_OFFLOAD_SSP_MASK)

#define SOF_SSP_BT_OFFLOAD_PRESENT	BIT(16)

#define SOF_SSP_BT_OFFLOAD_PRESENT	BIT(18)



struct sof_sdw_codec_info {

	const int part_id;