Commit a8f408dc authored by Brent Lu's avatar Brent Lu Committed by Mark Brown

ASoC: Intel: sof_da7219: use common module for DAI link generation

Use intel_board module to generate DAI link array and update num_links
field in snd_soc_card structure.
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240325221059.206042-13-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 495d5b48
...@@ -624,6 +624,7 @@ config SND_SOC_INTEL_SOF_DA7219_MACH ...@@ -624,6 +624,7 @@ config SND_SOC_INTEL_SOF_DA7219_MACH
select SND_SOC_MAX98357A select SND_SOC_MAX98357A
select SND_SOC_MAX98373_I2C select SND_SOC_MAX98373_I2C
select SND_SOC_DMIC select SND_SOC_DMIC
select SND_SOC_INTEL_SOF_BOARD_HELPERS
select SND_SOC_INTEL_SOF_MAXIM_COMMON select SND_SOC_INTEL_SOF_MAXIM_COMMON
select SND_SOC_INTEL_SOF_SSP_COMMON select SND_SOC_INTEL_SOF_SSP_COMMON
help help
......
...@@ -83,6 +83,17 @@ enum { ...@@ -83,6 +83,17 @@ enum {
(((k6) & SOF_LINK_IDS_MASK) << (SOF_LINK_IDS_SHIFT * 5)) | \ (((k6) & SOF_LINK_IDS_MASK) << (SOF_LINK_IDS_SHIFT * 5)) | \
(((k7) & SOF_LINK_IDS_MASK) << (SOF_LINK_IDS_SHIFT * 6))) (((k7) & SOF_LINK_IDS_MASK) << (SOF_LINK_IDS_SHIFT * 6)))
/*
* sof_da7219_private: private data for da7219 machine driver
*
* @is_jsl_board: true for JSL boards
* @pll_bypass: true for PLL bypass mode
*/
struct sof_da7219_private {
bool is_jsl_board;
bool pll_bypass;
};
/* /*
* sof_rt5682_private: private data for rt5682 machine driver * sof_rt5682_private: private data for rt5682 machine driver
* *
...@@ -112,6 +123,7 @@ struct sof_rt5682_private { ...@@ -112,6 +123,7 @@ struct sof_rt5682_private {
* @amp_link: pointer to speaker amplifier dai link * @amp_link: pointer to speaker amplifier dai link
* @link_order_overwrite: custom DAI link order * @link_order_overwrite: custom DAI link order
* @link_id_overwrite: custom DAI link ID * @link_id_overwrite: custom DAI link ID
* @da7219: private data for da7219 machine driver
* @rt5682: private data for rt5682 machine driver * @rt5682: private data for rt5682 machine driver
*/ */
struct sof_card_private { struct sof_card_private {
...@@ -142,6 +154,7 @@ struct sof_card_private { ...@@ -142,6 +154,7 @@ struct sof_card_private {
unsigned long link_id_overwrite; unsigned long link_id_overwrite;
union { union {
struct sof_da7219_private da7219;
struct sof_rt5682_private rt5682; struct sof_rt5682_private rt5682;
}; };
}; };
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment