diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2019-04-12 11:09:03 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-28 02:51:50 +0900 |
| commit | f35bf70f61d389754fafd7fce75efbb3bd2eea87 (patch) | |
| tree | 0c367a71577f38711a3268231827728f2c6f4e03 /sound/soc/intel/boards/bdw-rt5677.c | |
| parent | 7e978fa37df7f771a5d02934ff828a0ee36bcf11 (diff) | |
| download | linux-f35bf70f61d389754fafd7fce75efbb3bd2eea87.tar.gz linux-f35bf70f61d389754fafd7fce75efbb3bd2eea87.tar.bz2 linux-f35bf70f61d389754fafd7fce75efbb3bd2eea87.zip | |
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: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/bdw-rt5677.c')
| -rw-r--r-- | sound/soc/intel/boards/bdw-rt5677.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 1844c88ea4e2..6520a8ea5537 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -180,6 +180,7 @@ static const struct snd_soc_ops bdw_rt5677_ops = { .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) { 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) return 0; } +#endif static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd) { @@ -265,7 +267,9 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .dynamic = 1, .codec_name = "snd-soc-dummy", .codec_dai_name = "snd-soc-dummy-dai", +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) .init = bdw_rt5677_rtd_init, +#endif .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST |