Commit f35bf70f authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown

ASoC: Intel: Make sure BDW based machine drivers build for SOF

BDW uses hard coded IPC calls to set SSP, not needed in SOF as SSP is
configured via topology.
Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7e978fa3
...@@ -180,6 +180,7 @@ static const struct snd_soc_ops bdw_rt5677_ops = { ...@@ -180,6 +180,7 @@ static const struct snd_soc_ops bdw_rt5677_ops = {
.hw_params = bdw_rt5677_hw_params, .hw_params = bdw_rt5677_hw_params,
}; };
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
static int bdw_rt5677_rtd_init(struct snd_soc_pcm_runtime *rtd) static int bdw_rt5677_rtd_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
...@@ -198,6 +199,7 @@ static int bdw_rt5677_rtd_init(struct snd_soc_pcm_runtime *rtd) ...@@ -198,6 +199,7 @@ static int bdw_rt5677_rtd_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
#endif
static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd) static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)
{ {
...@@ -265,7 +267,9 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { ...@@ -265,7 +267,9 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
.dynamic = 1, .dynamic = 1,
.codec_name = "snd-soc-dummy", .codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai", .codec_dai_name = "snd-soc-dummy-dai",
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
.init = bdw_rt5677_rtd_init, .init = bdw_rt5677_rtd_init,
#endif
.trigger = { .trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST SND_SOC_DPCM_TRIGGER_POST
......
...@@ -131,6 +131,7 @@ static const struct snd_soc_ops broadwell_rt286_ops = { ...@@ -131,6 +131,7 @@ static const struct snd_soc_ops broadwell_rt286_ops = {
.hw_params = broadwell_rt286_hw_params, .hw_params = broadwell_rt286_hw_params,
}; };
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd) static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
...@@ -149,6 +150,7 @@ static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd) ...@@ -149,6 +150,7 @@ static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
#endif
/* broadwell digital audio interface glue - connects codec <--> CPU */ /* broadwell digital audio interface glue - connects codec <--> CPU */
static struct snd_soc_dai_link broadwell_rt286_dais[] = { static struct snd_soc_dai_link broadwell_rt286_dais[] = {
...@@ -161,7 +163,9 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { ...@@ -161,7 +163,9 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
.dynamic = 1, .dynamic = 1,
.codec_name = "snd-soc-dummy", .codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai", .codec_dai_name = "snd-soc-dummy-dai",
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
.init = broadwell_rtd_init, .init = broadwell_rtd_init,
#endif
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
......
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