Unverified Commit 408a454e authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: intel: rename soundwire common header macros 

Rename sof quirk macros, dai type and dai link macros with "SOC_SDW" tag.

Link: https://github.com/thesofproject/linux/pull/5068


Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-3-Vijendar.Mukunda@amd.com


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

sound/soc/intel/boards/bridge_cs35l56.c

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static const struct snd_soc_dai_link bridge_dai_template = { 
int bridge_cs35l56_count_sidecar(struct snd_soc_card *card,

				 int *num_dais, int *num_devs)

{

	if (sof_sdw_quirk & SOF_SIDECAR_AMPS) {

	if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {

		(*num_dais)++;

		(*num_devs) += ARRAY_SIZE(bridge_cs35l56_name_prefixes);

	}
@@ -110,7 +110,7 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card, 
			       struct snd_soc_dai_link **dai_links,

			       struct snd_soc_codec_conf **codec_conf)

{

	if (sof_sdw_quirk & SOF_SIDECAR_AMPS) {

	if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {

		**dai_links = bridge_dai_template;



		for (int i = 0; i < ARRAY_SIZE(bridge_cs35l56_name_prefixes); i++) {
@@ -130,7 +130,7 @@ int bridge_cs35l56_spk_init(struct snd_soc_card *card, 
			    struct asoc_sdw_codec_info *info,

			    bool playback)

{

	if (sof_sdw_quirk & SOF_SIDECAR_AMPS)

	if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS)

		info->amp_num += ARRAY_SIZE(bridge_cs35l56_name_prefixes);



	return 0;

sound/soc/intel/boards/sof_sdw.c

+92 −92
Original line number Diff line number Diff line
@@ -23,24 +23,24 @@ MODULE_PARM_DESC(quirk, "Board-specific quirk override"); 


static void log_quirks(struct device *dev)

{

	if (SOF_JACK_JDSRC(sof_sdw_quirk))

	if (SOC_SDW_JACK_JDSRC(sof_sdw_quirk))

		dev_dbg(dev, "quirk realtek,jack-detect-source %ld\n",

			SOF_JACK_JDSRC(sof_sdw_quirk));

	if (sof_sdw_quirk & SOF_SDW_FOUR_SPK)

		dev_err(dev, "quirk SOF_SDW_FOUR_SPK enabled but no longer supported\n");

			SOC_SDW_JACK_JDSRC(sof_sdw_quirk));

	if (sof_sdw_quirk & SOC_SDW_FOUR_SPK)

		dev_err(dev, "quirk SOC_SDW_FOUR_SPK enabled but no longer supported\n");

	if (sof_sdw_quirk & SOF_SDW_TGL_HDMI)

		dev_dbg(dev, "quirk SOF_SDW_TGL_HDMI enabled\n");

	if (sof_sdw_quirk & SOF_SDW_PCH_DMIC)

		dev_dbg(dev, "quirk SOF_SDW_PCH_DMIC enabled\n");

	if (sof_sdw_quirk & SOC_SDW_PCH_DMIC)

		dev_dbg(dev, "quirk SOC_SDW_PCH_DMIC enabled\n");

	if (SOF_SSP_GET_PORT(sof_sdw_quirk))

		dev_dbg(dev, "SSP port %ld\n",

			SOF_SSP_GET_PORT(sof_sdw_quirk));

	if (sof_sdw_quirk & SOF_SDW_NO_AGGREGATION)

		dev_err(dev, "quirk SOF_SDW_NO_AGGREGATION enabled but no longer supported\n");

	if (sof_sdw_quirk & SOF_CODEC_SPKR)

		dev_dbg(dev, "quirk SOF_CODEC_SPKR enabled\n");

	if (sof_sdw_quirk & SOF_SIDECAR_AMPS)

		dev_dbg(dev, "quirk SOF_SIDECAR_AMPS enabled\n");

	if (sof_sdw_quirk & SOC_SDW_NO_AGGREGATION)

		dev_err(dev, "quirk SOC_SDW_NO_AGGREGATION enabled but no longer supported\n");

	if (sof_sdw_quirk & SOC_SDW_CODEC_SPKR)

		dev_dbg(dev, "quirk SOC_SDW_CODEC_SPKR enabled\n");

	if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS)

		dev_dbg(dev, "quirk SOC_SDW_SIDECAR_AMPS enabled\n");

}



static int sof_sdw_quirk_cb(const struct dmi_system_id *id)
@@ -57,7 +57,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "CometLake Client"),

		},

		.driver_data = (void *)SOF_SDW_PCH_DMIC,

		.driver_data = (void *)SOC_SDW_PCH_DMIC,

	},

	{

		.callback = sof_sdw_quirk_cb,
@@ -99,7 +99,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Ice Lake Client"),

		},

		.driver_data = (void *)SOF_SDW_PCH_DMIC,

		.driver_data = (void *)SOC_SDW_PCH_DMIC,

	},

	/* TigerLake devices */

	{
@@ -111,7 +111,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					RT711_JD1 |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					SOF_SSP_PORT(SOF_I2S_SSP2)),

	},

	{
@@ -159,7 +159,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Volteer"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},
@@ -170,7 +170,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Ripto"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC),

					SOC_SDW_PCH_DMIC),

	},

	{

		/*
@@ -185,7 +185,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Conv"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					RT711_JD1),

	},

	{
@@ -199,7 +199,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "8709"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					RT711_JD1),

	},

	{
@@ -210,7 +210,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "LAPBC"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					RT711_JD1),

	},

	{
@@ -221,7 +221,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "LAPBC710"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					RT711_JD1),

	},

	{
@@ -232,7 +232,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					RT711_JD2_100K),

	},

	{
@@ -243,7 +243,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "LAPRC710"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					RT711_JD2_100K),

	},

	/* TigerLake-SDCA devices */
@@ -293,7 +293,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Brya"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_SDW_PCH_DMIC |

					SOC_SDW_PCH_DMIC |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},
@@ -501,7 +501,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Google"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Rex"),

		},

		.driver_data = (void *)(SOF_SDW_PCH_DMIC |

		.driver_data = (void *)(SOC_SDW_PCH_DMIC |

					SOF_BT_OFFLOAD_SSP(1) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},
@@ -529,7 +529,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CE3")

		},

		.driver_data = (void *)(SOF_SIDECAR_AMPS),

		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS),

	},

	{

		.callback = sof_sdw_quirk_cb,
@@ -537,7 +537,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CE4")

		},

		.driver_data = (void *)(SOF_SIDECAR_AMPS),

		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS),

	},

	{}

};
@@ -738,8 +738,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt700-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.rtd_init = rt700_rtd_init,

				.controls = rt700_controls,

				.num_controls = ARRAY_SIZE(rt700_controls),
@@ -756,8 +756,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt711-sdca-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,
@@ -776,8 +776,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt711-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt711_init,

				.exit = sof_sdw_rt711_exit,

				.rtd_init = rt711_rtd_init,
@@ -796,8 +796,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt712-sdca-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,
@@ -809,8 +809,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "rt712-sdca-aif2",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt712_spk_rtd_init,
@@ -829,8 +829,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "rt712-sdca-dmic-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

			},

		},
@@ -843,8 +843,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt712-sdca-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,
@@ -863,8 +863,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "rt712-sdca-dmic-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

			},

		},
@@ -877,8 +877,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "rt1308-aif",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,
@@ -897,8 +897,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt1316-aif",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,
@@ -916,8 +916,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt1318-aif",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,
@@ -937,8 +937,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "rt715-sdca-aif2",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

			},

		},
@@ -952,8 +952,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "rt715-sdca-aif2",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

			},

		},
@@ -967,8 +967,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "rt715-aif2",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

			},

		},
@@ -982,8 +982,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "rt715-aif2",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

			},

		},
@@ -996,8 +996,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt722-sdca-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,
@@ -1009,9 +1009,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "rt722-sdca-aif2",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				/* No feedback capability is provided by rt722-sdca codec driver*/

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt722_spk_rtd_init,
@@ -1023,8 +1023,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "rt722-sdca-aif3",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

			},

		},
@@ -1036,8 +1036,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "max98373-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_maxim_init,

				.rtd_init = maxim_spk_rtd_init,

				.controls = maxim_controls,
@@ -1054,8 +1054,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "max98363-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_maxim_init,

				.rtd_init = maxim_spk_rtd_init,

				.controls = maxim_controls,
@@ -1072,8 +1072,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "rt5682-sdw",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.rtd_init = rt5682_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),
@@ -1089,8 +1089,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "cs35l56-sdw1",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_cs_amp_init,

				.rtd_init = cs_spk_rtd_init,

				.controls = generic_spk_controls,
@@ -1107,8 +1107,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "cs42l42-sdw",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.rtd_init = cs42l42_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),
@@ -1127,8 +1127,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "cs42l43-dp5",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.rtd_init = cs42l43_hs_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),
@@ -1138,8 +1138,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "cs42l43-dp1",

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = cs42l43_dmic_rtd_init,

				.widgets = generic_dmic_widgets,

				.num_widgets = ARRAY_SIZE(generic_dmic_widgets),
@@ -1147,21 +1147,21 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {false, true},

				.dai_name = "cs42l43-dp2",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

			},

			{

				.direction = {true, false},

				.dai_name = "cs42l43-dp6",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_cs42l43_spk_init,

				.rtd_init = cs42l43_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

				.quirk = SOF_CODEC_SPKR | SOF_SIDECAR_AMPS,

				.quirk = SOC_SDW_CODEC_SPKR | SOC_SDW_SIDECAR_AMPS,

			},

		},

		.dai_num = 4,
@@ -1173,8 +1173,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "sdw-mockup-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

			},

		},

		.dai_num = 1,
@@ -1186,8 +1186,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "sdw-mockup-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

			},

		},

		.dai_num = 1,
@@ -1199,8 +1199,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "sdw-mockup-aif1",

				.dai_type = SOF_SDW_DAI_TYPE_AMP,

				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

			},

		},

		.dai_num = 1,
@@ -1212,8 +1212,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.dai_name = "sdw-mockup-aif1",

				.direction = {false, true},

				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

			},

		},

		.dai_num = 1,
@@ -1767,7 +1767,7 @@ static int create_sdw_dailinks(struct snd_soc_card *card, 
	int ret, i;



	for (i = 0; i < SDW_MAX_LINKS; i++)

		ctx->sdw_pin_index[i] = SDW_INTEL_BIDIR_PDI_BASE;

		ctx->sdw_pin_index[i] = SOC_SDW_INTEL_BIDIR_PDI_BASE;



	/* generate DAI links by each sdw link */

	while (sof_dais->initialised) {
@@ -1971,7 +1971,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
		hdmi_num = SOF_PRE_TGL_HDMI_COUNT;



	/* enable dmic01 & dmic16k */

	if (sof_sdw_quirk & SOF_SDW_PCH_DMIC || mach_params->dmic_num)

	if (sof_sdw_quirk & SOC_SDW_PCH_DMIC || mach_params->dmic_num)

		dmic_num = 2;



	if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)

sound/soc/intel/boards/sof_sdw_common.h

+23 −23
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@ 
#include <sound/soc.h>

#include "sof_hdmi_common.h"



#define MAX_NO_PROPS 2

#define SOC_SDW_MAX_NO_PROPS 2

#define MAX_HDMI_NUM 4

#define SDW_UNUSED_DAI_ID -1

#define SDW_JACK_OUT_DAI_ID 0

#define SDW_JACK_IN_DAI_ID 1

#define SDW_AMP_OUT_DAI_ID 2

#define SDW_AMP_IN_DAI_ID 3

#define SDW_DMIC_DAI_ID 4

#define SDW_MAX_CPU_DAIS 16

#define SDW_INTEL_BIDIR_PDI_BASE 2

#define SOC_SDW_UNUSED_DAI_ID -1

#define SOC_SDW_JACK_OUT_DAI_ID 0

#define SOC_SDW_JACK_IN_DAI_ID 1

#define SOC_SDW_AMP_OUT_DAI_ID 2

#define SOC_SDW_AMP_IN_DAI_ID 3

#define SOC_SDW_DMIC_DAI_ID 4

#define SOC_SDW_MAX_CPU_DAIS 16

#define SOC_SDW_INTEL_BIDIR_PDI_BASE 2



#define SDW_MAX_LINKS		4
@@ -44,27 +44,27 @@ enum { 
	SOF_I2S_SSP5 = BIT(5),

};



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

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

/* Deprecated and no longer supported by the code */

#define SOF_SDW_FOUR_SPK		BIT(4)

#define SOC_SDW_FOUR_SPK		BIT(4)

#define SOF_SDW_TGL_HDMI		BIT(5)

#define SOF_SDW_PCH_DMIC		BIT(6)

#define SOC_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))

/* Deprecated and no longer supported by the code */

#define SOF_SDW_NO_AGGREGATION		BIT(14)

#define SOC_SDW_NO_AGGREGATION		BIT(14)

/* If a CODEC has an optional speaker output, this quirk will enable it */

#define SOF_CODEC_SPKR			BIT(15)

#define SOC_SDW_CODEC_SPKR		BIT(15)

/*

 * If the CODEC has additional devices attached directly to it.

 *

 * For the cs42l43:

 *   - 0 - No speaker output

 *   - SOF_CODEC_SPKR - CODEC internal speaker

 *   - SOF_SIDECAR_AMPS - 2x Sidecar amplifiers + CODEC internal speaker

 *   - SOF_CODEC_SPKR | SOF_SIDECAR_AMPS - Not currently supported

 *   - SOC_SDW_CODEC_SPKR - CODEC internal speaker

 *   - SOC_SDW_SIDECAR_AMPS - 2x Sidecar amplifiers + CODEC internal speaker

 *   - SOC_SDW_CODEC_SPKR | SOC_SDW_SIDECAR_AMPS - Not currently supported

 */

#define SOF_SIDECAR_AMPS		BIT(16)

#define SOC_SDW_SIDECAR_AMPS		BIT(16)



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

#define SOF_BT_OFFLOAD_SSP_SHIFT	15
@@ -73,11 +73,11 @@ enum { 
	(((quirk) << SOF_BT_OFFLOAD_SSP_SHIFT) & SOF_BT_OFFLOAD_SSP_MASK)

#define SOF_SSP_BT_OFFLOAD_PRESENT	BIT(18)



#define SOF_SDW_DAI_TYPE_JACK		0

#define SOF_SDW_DAI_TYPE_AMP		1

#define SOF_SDW_DAI_TYPE_MIC		2

#define SOC_SDW_DAI_TYPE_JACK		0

#define SOC_SDW_DAI_TYPE_AMP		1

#define SOC_SDW_DAI_TYPE_MIC		2



#define SOF_SDW_MAX_DAI_NUM		8

#define SOC_SDW_MAX_DAI_NUM		8



struct asoc_sdw_codec_info;
@@ -108,7 +108,7 @@ struct asoc_sdw_codec_info { 
	const u8 acpi_id[ACPI_ID_LEN];

	const bool ignore_pch_dmic;

	const struct snd_soc_ops *ops;

	struct asoc_sdw_dai_info dais[SOF_SDW_MAX_DAI_NUM];

	struct asoc_sdw_dai_info dais[SOC_SDW_MAX_DAI_NUM];

	const int dai_num;



	int (*codec_card_late_probe)(struct snd_soc_card *card);

sound/soc/intel/boards/sof_sdw_cs42l43.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *da 
	struct snd_soc_card *card = rtd->card;

	int ret;



	if (!(sof_sdw_quirk & SOF_SIDECAR_AMPS)) {

	if (!(sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS)) {

		/* Will be set by the bridge code in this case */

		card->components = devm_kasprintf(card->dev, GFP_KERNEL,

						  "%s spk:cs42l43-spk",

sound/soc/intel/boards/sof_sdw_rt711.c

+3 −3
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 
 */

static int rt711_add_codec_device_props(struct device *sdw_dev)

{

	struct property_entry props[MAX_NO_PROPS] = {};

	struct property_entry props[SOC_SDW_MAX_NO_PROPS] = {};

	struct fwnode_handle *fwnode;

	int ret;



	if (!SOF_JACK_JDSRC(sof_sdw_quirk))

	if (!SOC_SDW_JACK_JDSRC(sof_sdw_quirk))

		return 0;

	props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", SOF_JACK_JDSRC(sof_sdw_quirk));

	props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", SOC_SDW_JACK_JDSRC(sof_sdw_quirk));



	fwnode = fwnode_create_software_node(props, NULL);

	if (IS_ERR(fwnode))