| Message ID | 20200812205753.29115-12-cezary.rojewski@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: Intel: Catpt - Lynx and Wildcat point | expand |
On Wed, Aug 12, 2020 at 10:57:51PM +0200, Cezary Rojewski wrote: > Remove code specific to sound/soc/intel/haswell. Update BE dai_link > definition to provide seamless transition to catpt solution. Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> > Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> > --- > sound/soc/intel/boards/broadwell.c | 33 ------------------------------ > 1 file changed, 33 deletions(-) > > diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c > index f6399077d291..ea2818f27105 100644 > --- a/sound/soc/intel/boards/broadwell.c > +++ b/sound/soc/intel/boards/broadwell.c > @@ -14,9 +14,6 @@ > #include <sound/pcm_params.h> > #include <sound/soc-acpi.h> > > -#include "../common/sst-dsp.h" > -#include "../haswell/sst-haswell-ipc.h" > - > #include "../../codecs/rt286.h" > > static struct snd_soc_jack broadwell_headset; > @@ -122,27 +119,6 @@ static const struct snd_soc_ops broadwell_rt286_ops = { > .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) > -{ > - struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); > - struct sst_pdata *pdata = dev_get_platdata(component->dev); > - struct sst_hsw *broadwell = pdata->dsp; > - int ret; > - > - /* Set ADSP SSP port settings */ > - ret = sst_hsw_device_set_config(broadwell, SST_HSW_DEVICE_SSP_0, > - SST_HSW_DEVICE_MCLK_FREQ_24_MHZ, > - SST_HSW_DEVICE_CLOCK_MASTER, 9); > - if (ret < 0) { > - dev_err(rtd->dev, "error: failed to set device config\n"); > - return ret; > - } > - > - return 0; > -} > -#endif > - > static const unsigned int channels[] = { > 2, > }; > @@ -189,10 +165,8 @@ SND_SOC_DAILINK_DEF(platform, > SND_SOC_DAILINK_DEF(codec, > DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT343A:00", "rt286-aif1"))); > > -#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) > SND_SOC_DAILINK_DEF(ssp0_port, > DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port"))); > -#endif > > /* broadwell digital audio interface glue - connects codec <--> CPU */ > static struct snd_soc_dai_link broadwell_rt286_dais[] = { > @@ -201,9 +175,6 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { > .name = "System PCM", > .stream_name = "System Playback/Capture", > .dynamic = 1, > -#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) > - .init = broadwell_rtd_init, > -#endif > .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, > .ops = &broadwell_fe_ops, > .dpcm_playback = 1, > @@ -248,11 +219,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { > .ops = &broadwell_rt286_ops, > .dpcm_playback = 1, > .dpcm_capture = 1, > -#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) > - SND_SOC_DAILINK_REG(dummy, codec, dummy), > -#else > SND_SOC_DAILINK_REG(ssp0_port, codec, platform), > -#endif > }, > }; > > -- > 2.17.1 >
diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index f6399077d291..ea2818f27105 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -14,9 +14,6 @@ #include <sound/pcm_params.h> #include <sound/soc-acpi.h> -#include "../common/sst-dsp.h" -#include "../haswell/sst-haswell-ipc.h" - #include "../../codecs/rt286.h" static struct snd_soc_jack broadwell_headset; @@ -122,27 +119,6 @@ static const struct snd_soc_ops broadwell_rt286_ops = { .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) -{ - struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); - struct sst_pdata *pdata = dev_get_platdata(component->dev); - struct sst_hsw *broadwell = pdata->dsp; - int ret; - - /* Set ADSP SSP port settings */ - ret = sst_hsw_device_set_config(broadwell, SST_HSW_DEVICE_SSP_0, - SST_HSW_DEVICE_MCLK_FREQ_24_MHZ, - SST_HSW_DEVICE_CLOCK_MASTER, 9); - if (ret < 0) { - dev_err(rtd->dev, "error: failed to set device config\n"); - return ret; - } - - return 0; -} -#endif - static const unsigned int channels[] = { 2, }; @@ -189,10 +165,8 @@ SND_SOC_DAILINK_DEF(platform, SND_SOC_DAILINK_DEF(codec, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT343A:00", "rt286-aif1"))); -#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) SND_SOC_DAILINK_DEF(ssp0_port, DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port"))); -#endif /* broadwell digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link broadwell_rt286_dais[] = { @@ -201,9 +175,6 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .name = "System PCM", .stream_name = "System Playback/Capture", .dynamic = 1, -#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) - .init = broadwell_rtd_init, -#endif .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .ops = &broadwell_fe_ops, .dpcm_playback = 1, @@ -248,11 +219,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .ops = &broadwell_rt286_ops, .dpcm_playback = 1, .dpcm_capture = 1, -#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) - SND_SOC_DAILINK_REG(dummy, codec, dummy), -#else SND_SOC_DAILINK_REG(ssp0_port, codec, platform), -#endif }, };
Remove code specific to sound/soc/intel/haswell. Update BE dai_link definition to provide seamless transition to catpt solution. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> --- sound/soc/intel/boards/broadwell.c | 33 ------------------------------ 1 file changed, 33 deletions(-)