On Wed, Aug 12, 2020 at 10:57:52PM +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@xxxxxxxxxxxxxxx>
> Signed-off-by: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
> ---
> sound/soc/intel/boards/bdw-rt5650.c | 36 -----------------------------
> 1 file changed, 36 deletions(-)
>
> diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c
> index ce7320916b22..c5820787c53e 100644
> --- a/sound/soc/intel/boards/bdw-rt5650.c
> +++ b/sound/soc/intel/boards/bdw-rt5650.c
> @@ -16,9 +16,6 @@
> #include <sound/soc.h>
> #include <sound/soc-acpi.h>
>
> -#include "../common/sst-dsp.h"
> -#include "../haswell/sst-haswell-ipc.h"
> -
> #include "../../codecs/rt5645.h"
>
> struct bdw_rt5650_priv {
> @@ -138,30 +135,6 @@ static struct snd_soc_ops bdw_rt5650_ops = {
> .hw_params = bdw_rt5650_hw_params,
> };
>
> -#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
> -static int bdw_rt5650_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
> - * clock_divider = 4 means BCLK = MCLK/5 = 24MHz/5 = 4.8MHz
> - */
> - ret = sst_hsw_device_set_config(broadwell, SST_HSW_DEVICE_SSP_0,
> - SST_HSW_DEVICE_MCLK_FREQ_24_MHZ,
> - SST_HSW_DEVICE_TDM_CLOCK_MASTER, 4);
> - 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, 4,
> };
> @@ -251,10 +224,8 @@ SND_SOC_DAILINK_DEF(platform,
> SND_SOC_DAILINK_DEF(be,
> DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1")));
>
> -#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
> SND_SOC_DAILINK_DEF(ssp0_port,
> DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));
> -#endif
>
> static struct snd_soc_dai_link bdw_rt5650_dais[] = {
> /* Front End DAI links */
> @@ -263,9 +234,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
> .stream_name = "System Playback",
> .dynamic = 1,
> .ops = &bdw_rt5650_fe_ops,
> -#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
> - .init = bdw_rt5650_rtd_init,
> -#endif
> .trigger = {
> SND_SOC_DPCM_TRIGGER_POST,
> SND_SOC_DPCM_TRIGGER_POST
> @@ -289,11 +257,7 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
> .dpcm_playback = 1,
> .dpcm_capture = 1,
> .init = bdw_rt5650_init,
> -#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
> - SND_SOC_DAILINK_REG(dummy, be, dummy),
> -#else
> SND_SOC_DAILINK_REG(ssp0_port, be, platform),
> -#endif
> },
> };
>
> --
> 2.17.1
>
--
With Best Regards,
Andy Shevchenko
