From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:40:36
As part of moving to remove the old style defines for the bus clocks update
the eureka-tlv320 driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/eukrea-tlv320.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:42:53
As part of moving to remove the old style defines for the bus clocks update
the fsl-asoc-card driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl-asoc-card.c | 54 +++++++++++++++++------------------
1 file changed, 27 insertions(+), 27 deletions(-)
@@ -356,8 +356,8 @@ static int fsl_asoc_card_audmux_init(struct device_node *np,*Ifonly4wiresareneeded,justsetSSIinto*synchronousmodeandenable4PADsinIOMUX.*/-switch(priv->dai_fmt&SND_SOC_DAIFMT_MASTER_MASK){-caseSND_SOC_DAIFMT_CBM_CFM:+switch(priv->dai_fmt&SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK){+caseSND_SOC_DAIFMT_CBP_CFP:int_ptcr=IMX_AUDMUX_V2_PTCR_RFSEL(8|ext_port)|IMX_AUDMUX_V2_PTCR_RCSEL(8|ext_port)|IMX_AUDMUX_V2_PTCR_TFSEL(ext_port)|
@@ -367,7 +367,7 @@ static int fsl_asoc_card_audmux_init(struct device_node *np,IMX_AUDMUX_V2_PTCR_TFSDIR|IMX_AUDMUX_V2_PTCR_TCLKDIR;break;-caseSND_SOC_DAIFMT_CBM_CFS:+caseSND_SOC_DAIFMT_CBP_CFC:int_ptcr=IMX_AUDMUX_V2_PTCR_RCSEL(8|ext_port)|IMX_AUDMUX_V2_PTCR_TCSEL(ext_port)|IMX_AUDMUX_V2_PTCR_RCLKDIR|
@@ -377,7 +377,7 @@ static int fsl_asoc_card_audmux_init(struct device_node *np,IMX_AUDMUX_V2_PTCR_RFSDIR|IMX_AUDMUX_V2_PTCR_TFSDIR;break;-caseSND_SOC_DAIFMT_CBS_CFM:+caseSND_SOC_DAIFMT_CBC_CFP:int_ptcr=IMX_AUDMUX_V2_PTCR_RFSEL(8|ext_port)|IMX_AUDMUX_V2_PTCR_TFSEL(ext_port)|IMX_AUDMUX_V2_PTCR_RFSDIR|
@@ -387,7 +387,7 @@ static int fsl_asoc_card_audmux_init(struct device_node *np,IMX_AUDMUX_V2_PTCR_RCLKDIR|IMX_AUDMUX_V2_PTCR_TCLKDIR;break;-caseSND_SOC_DAIFMT_CBS_CFS:+caseSND_SOC_DAIFMT_CBC_CFC:ext_ptcr=IMX_AUDMUX_V2_PTCR_RFSEL(8|int_port)|IMX_AUDMUX_V2_PTCR_RCSEL(8|int_port)|IMX_AUDMUX_V2_PTCR_TFSEL(int_port)|
@@ -533,8 +533,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)structdevice_node*cpu_np,*codec_np,*asrc_np;structdevice_node*np=pdev->dev.of_node;structplatform_device*asrc_pdev=NULL;-structdevice_node*bitclkmaster=NULL;-structdevice_node*framemaster=NULL;+structdevice_node*bitclkprovider=NULL;+structdevice_node*frameprovider=NULL;structplatform_device*cpu_pdev;structfsl_asoc_card_priv*priv;structdevice*codec_dev=NULL;
@@ -617,29 +617,29 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)priv->cpu_priv.sysclk_dir[TX]=SND_SOC_CLOCK_OUT;priv->cpu_priv.sysclk_dir[RX]=SND_SOC_CLOCK_OUT;priv->cpu_priv.slot_width=32;-priv->dai_fmt|=SND_SOC_DAIFMT_CBS_CFS;+priv->dai_fmt|=SND_SOC_DAIFMT_CBC_CFC;}elseif(of_device_is_compatible(np,"fsl,imx-audio-cs427x")){codec_dai_name="cs4271-hifi";priv->codec_priv.mclk_id=CS427x_SYSCLK_MCLK;-priv->dai_fmt|=SND_SOC_DAIFMT_CBM_CFM;+priv->dai_fmt|=SND_SOC_DAIFMT_CBP_CFP;}elseif(of_device_is_compatible(np,"fsl,imx-audio-sgtl5000")){codec_dai_name="sgtl5000";priv->codec_priv.mclk_id=SGTL5000_SYSCLK;-priv->dai_fmt|=SND_SOC_DAIFMT_CBM_CFM;+priv->dai_fmt|=SND_SOC_DAIFMT_CBP_CFP;}elseif(of_device_is_compatible(np,"fsl,imx-audio-tlv320aic32x4")){codec_dai_name="tlv320aic32x4-hifi";-priv->dai_fmt|=SND_SOC_DAIFMT_CBM_CFM;+priv->dai_fmt|=SND_SOC_DAIFMT_CBP_CFP;}elseif(of_device_is_compatible(np,"fsl,imx-audio-wm8962")){codec_dai_name="wm8962";priv->codec_priv.mclk_id=WM8962_SYSCLK_MCLK;priv->codec_priv.fll_id=WM8962_SYSCLK_FLL;priv->codec_priv.pll_id=WM8962_FLL;-priv->dai_fmt|=SND_SOC_DAIFMT_CBM_CFM;+priv->dai_fmt|=SND_SOC_DAIFMT_CBP_CFP;}elseif(of_device_is_compatible(np,"fsl,imx-audio-wm8960")){codec_dai_name="wm8960-hifi";priv->codec_priv.fll_id=WM8960_SYSCLK_AUTO;priv->codec_priv.pll_id=WM8960_SYSCLK_AUTO;-priv->dai_fmt|=SND_SOC_DAIFMT_CBM_CFM;+priv->dai_fmt|=SND_SOC_DAIFMT_CBP_CFP;}elseif(of_device_is_compatible(np,"fsl,imx-audio-ac97")){codec_dai_name="ac97-hifi";priv->dai_fmt=SND_SOC_DAIFMT_AC97;
@@ -648,7 +648,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)}elseif(of_device_is_compatible(np,"fsl,imx-audio-mqs")){codec_dai_name="fsl-mqs-dai";priv->dai_fmt=SND_SOC_DAIFMT_LEFT_J|-SND_SOC_DAIFMT_CBS_CFS|+SND_SOC_DAIFMT_CBC_CFC|SND_SOC_DAIFMT_NB_NF;priv->dai_link[1].dpcm_capture=0;priv->dai_link[2].dpcm_capture=0;
@@ -656,7 +656,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)priv->card.num_dapm_routes=ARRAY_SIZE(audio_map_tx);}elseif(of_device_is_compatible(np,"fsl,imx-audio-wm8524")){codec_dai_name="wm8524-hifi";-priv->dai_fmt|=SND_SOC_DAIFMT_CBS_CFS;+priv->dai_fmt|=SND_SOC_DAIFMT_CBC_CFC;priv->dai_link[1].dpcm_capture=0;priv->dai_link[2].dpcm_capture=0;priv->cpu_priv.slot_width=32;
@@ -664,12 +664,12 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)priv->card.num_dapm_routes=ARRAY_SIZE(audio_map_tx);}elseif(of_device_is_compatible(np,"fsl,imx-audio-si476x")){codec_dai_name="si476x-codec";-priv->dai_fmt|=SND_SOC_DAIFMT_CBS_CFS;+priv->dai_fmt|=SND_SOC_DAIFMT_CBC_CFC;priv->card.dapm_routes=audio_map_rx;priv->card.num_dapm_routes=ARRAY_SIZE(audio_map_rx);}elseif(of_device_is_compatible(np,"fsl,imx-audio-wm8958")){codec_dai_name="wm8994-aif1";-priv->dai_fmt|=SND_SOC_DAIFMT_CBM_CFM;+priv->dai_fmt|=SND_SOC_DAIFMT_CBP_CFP;priv->codec_priv.mclk_id=WM8994_FLL_SRC_MCLK1;priv->codec_priv.fll_id=WM8994_SYSCLK_FLL1;priv->codec_priv.pll_id=WM8994_FLL1;
@@ -683,29 +683,29 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)}/* Format info from DT is optional. */-snd_soc_daifmt_parse_clock_provider_as_phandle(np,NULL,&bitclkmaster,&framemaster);-if(bitclkmaster||framemaster){+snd_soc_daifmt_parse_clock_provider_as_phandle(np,NULL,&bitclkprovider,&frameprovider);+if(bitclkprovider||frameprovider){unsignedintdaifmt=snd_soc_daifmt_parse_format(np,NULL);-if(codec_np==bitclkmaster)-daifmt|=(codec_np==framemaster)?-SND_SOC_DAIFMT_CBM_CFM:SND_SOC_DAIFMT_CBM_CFS;+if(codec_np==bitclkprovider)+daifmt|=(codec_np==frameprovider)?+SND_SOC_DAIFMT_CBP_CFP:SND_SOC_DAIFMT_CBP_CFC;else-daifmt|=(codec_np==framemaster)?-SND_SOC_DAIFMT_CBS_CFM:SND_SOC_DAIFMT_CBS_CFS;+daifmt|=(codec_np==frameprovider)?+SND_SOC_DAIFMT_CBC_CFP:SND_SOC_DAIFMT_CBC_CFC;/* Override dai_fmt with value from DT */priv->dai_fmt=daifmt;}/* Change direction according to format */-if(priv->dai_fmt&SND_SOC_DAIFMT_CBM_CFM){+if(priv->dai_fmt&SND_SOC_DAIFMT_CBP_CFP){priv->cpu_priv.sysclk_dir[TX]=SND_SOC_CLOCK_IN;priv->cpu_priv.sysclk_dir[RX]=SND_SOC_CLOCK_IN;}-of_node_put(bitclkmaster);-of_node_put(framemaster);+of_node_put(bitclkprovider);+of_node_put(frameprovider);if(!fsl_asoc_card_is_ac97(priv)&&!codec_dev){dev_dbg(&pdev->dev,"failed to find codec device\n");
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:43:03
As part of moving to remove the old style defines for the bus clocks update
the fsl-audmix driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_audmix.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
@@ -257,10 +257,10 @@ static int fsl_audmix_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)return-EINVAL;}-/* For playback the AUDMIX is slave, and for record is master */-switch(fmt&SND_SOC_DAIFMT_MASTER_MASK){-caseSND_SOC_DAIFMT_CBM_CFM:-caseSND_SOC_DAIFMT_CBS_CFS:+/* For playback the AUDMIX is consumer, and for record is provider */+switch(fmt&SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK){+caseSND_SOC_DAIFMT_CBP_CFP:+caseSND_SOC_DAIFMT_CBC_CFC:break;default:return-EINVAL;
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:43:26
As part of moving to remove the old style defines for the bus clocks update
the fsl-esai driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_esai.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
@@ -366,8 +366,8 @@ static int fsl_esai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)u32sub,ratio=hck_rate/freq;intret;-/* Don't apply for fully slave mode or unchanged bclk */-if(esai_priv->slave_mode||esai_priv->sck_rate[tx]==freq)+/* Don't apply for fully consumer mode or unchanged bclk */+if(esai_priv->consumer_mode||esai_priv->sck_rate[tx]==freq)return0;if(ratio*freq>hck_rate)
@@ -476,20 +476,20 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)return-EINVAL;}-esai_priv->slave_mode=false;+esai_priv->consumer_mode=false;-/* DAI clock master masks */-switch(fmt&SND_SOC_DAIFMT_MASTER_MASK){-caseSND_SOC_DAIFMT_CBM_CFM:-esai_priv->slave_mode=true;+/* DAI clock provider masks */+switch(fmt&SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK){+caseSND_SOC_DAIFMT_CBP_CFP:+esai_priv->consumer_mode=true;break;-caseSND_SOC_DAIFMT_CBS_CFM:+caseSND_SOC_DAIFMT_CBC_CFP:xccr|=ESAI_xCCR_xCKD;break;-caseSND_SOC_DAIFMT_CBM_CFS:+caseSND_SOC_DAIFMT_CBP_CFC:xccr|=ESAI_xCCR_xFSD;break;-caseSND_SOC_DAIFMT_CBS_CFS:+caseSND_SOC_DAIFMT_CBC_CFC:xccr|=ESAI_xCCR_xFSD|ESAI_xCCR_xCKD;break;default:
@@ -1016,8 +1016,8 @@ static int fsl_esai_probe(struct platform_device *pdev)/* Set a default slot number */esai_priv->slots=2;-/* Set a default master/slave state */-esai_priv->slave_mode=true;+/* Set a default clock provider state */+esai_priv->consumer_mode=true;/* Determine the FIFO depth */iprop=of_get_property(np,"fsl,fifo-depth",NULL);
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:43:31
As part of moving to remove the old style defines for the bus clocks update
the fsl_ssi driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_ssi.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
@@ -808,7 +808,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,u32wl=SSI_SxCCR_WL(sample_size);intret;-if(fsl_ssi_is_i2s_master(ssi)){+if(fsl_ssi_is_i2s_clock_provider(ssi)){ret=fsl_ssi_set_bclk(substream,dai,hw_params);if(ret)returnret;
@@ -841,7 +841,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,u8i2s_net=ssi->i2s_net;/* Normal + Network mode to send 16-bit data in 32-bit frames */-if(fsl_ssi_is_i2s_cbm_cfs(ssi)&&sample_size==16)+if(fsl_ssi_is_i2s_cbp_cfc(ssi)&&sample_size==16)i2s_net=SSI_SCR_I2S_MODE_NORMAL|SSI_SCR_NET;/* Use Normal mode to send mono data at 1st slot of 2 slots */
@@ -865,7 +865,7 @@ static int fsl_ssi_hw_free(struct snd_pcm_substream *substream,structsnd_soc_pcm_runtime*rtd=asoc_substream_to_rtd(substream);structfsl_ssi*ssi=snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd,0));-if(fsl_ssi_is_i2s_master(ssi)&&+if(fsl_ssi_is_i2s_clock_provider(ssi)&&ssi->baudclk_streams&BIT(substream->stream)){clk_disable_unprepare(ssi->baudclk);ssi->baudclk_streams&=~BIT(substream->stream);
@@ -891,18 +891,18 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi *ssi, unsigned int fmt)ssi->i2s_net=SSI_SCR_NET;switch(fmt&SND_SOC_DAIFMT_FORMAT_MASK){caseSND_SOC_DAIFMT_I2S:-switch(fmt&SND_SOC_DAIFMT_MASTER_MASK){-caseSND_SOC_DAIFMT_CBS_CFS:+switch(fmt&SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK){+caseSND_SOC_DAIFMT_CBC_CFC:if(IS_ERR(ssi->baudclk)){dev_err(ssi->dev,"missing baudclk for master mode\n");return-EINVAL;}fallthrough;-caseSND_SOC_DAIFMT_CBM_CFS:+caseSND_SOC_DAIFMT_CBP_CFC:ssi->i2s_net|=SSI_SCR_I2S_MODE_MASTER;break;-caseSND_SOC_DAIFMT_CBM_CFM:+caseSND_SOC_DAIFMT_CBP_CFP:ssi->i2s_net|=SSI_SCR_I2S_MODE_SLAVE;break;default:
@@ -962,17 +962,17 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi *ssi, unsigned int fmt)return-EINVAL;}-/* DAI clock master masks */-switch(fmt&SND_SOC_DAIFMT_MASTER_MASK){-caseSND_SOC_DAIFMT_CBS_CFS:+/* DAI clock provider masks */+switch(fmt&SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK){+caseSND_SOC_DAIFMT_CBC_CFC:/* Output bit and frame sync clocks */strcr|=SSI_STCR_TFDIR|SSI_STCR_TXDIR;scr|=SSI_SCR_SYS_CLK_EN;break;-caseSND_SOC_DAIFMT_CBM_CFM:+caseSND_SOC_DAIFMT_CBP_CFP:/* Input bit or frame sync clocks */break;-caseSND_SOC_DAIFMT_CBM_CFS:+caseSND_SOC_DAIFMT_CBP_CFC:/* Input bit clock but output frame sync clock */strcr|=SSI_STCR_TFDIR;break;
@@ -1341,7 +1341,7 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev,}}-/* Do not error out for slave cases that live without a baud clock */+/* Do not error out for consumer cases that live without a baud clock */ssi->baudclk=devm_clk_get(dev,"baud");if(IS_ERR(ssi->baudclk))dev_dbg(dev,"failed to get baud clock: %ld\n",
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:43:50
As part of moving to remove the old style defines for the bus clocks update
the fsl-mqs driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_mqs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:43:56
As part of moving to remove the old style defines for the bus clocks update
the fsl_sai driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_sai.c | 34 +++++++++++++++++-----------------
sound/soc/fsl/fsl_sai.h | 2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
@@ -297,23 +297,23 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,return-EINVAL;}-/* DAI clock master masks */-switch(fmt&SND_SOC_DAIFMT_MASTER_MASK){-caseSND_SOC_DAIFMT_CBS_CFS:+/* DAI clock provider masks */+switch(fmt&SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK){+caseSND_SOC_DAIFMT_CBC_CFC:val_cr2|=FSL_SAI_CR2_BCD_MSTR;val_cr4|=FSL_SAI_CR4_FSD_MSTR;-sai->is_slave_mode=false;+sai->is_consumer_mode=false;break;-caseSND_SOC_DAIFMT_CBM_CFM:-sai->is_slave_mode=true;+caseSND_SOC_DAIFMT_CBP_CFP:+sai->is_consumer_mode=true;break;-caseSND_SOC_DAIFMT_CBS_CFM:+caseSND_SOC_DAIFMT_CBC_CFP:val_cr2|=FSL_SAI_CR2_BCD_MSTR;-sai->is_slave_mode=false;+sai->is_consumer_mode=false;break;-caseSND_SOC_DAIFMT_CBM_CFS:+caseSND_SOC_DAIFMT_CBP_CFC:val_cr4|=FSL_SAI_CR4_FSD_MSTR;-sai->is_slave_mode=true;+sai->is_consumer_mode=true;break;default:return-EINVAL;
@@ -356,8 +356,8 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)u32id;intret=0;-/* Don't apply to slave mode */-if(sai->is_slave_mode)+/* Don't apply to consumer mode */+if(sai->is_consumer_mode)return0;/*
@@ -462,7 +462,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,pins=DIV_ROUND_UP(channels,slots);-if(!sai->is_slave_mode){+if(!sai->is_consumer_mode){if(sai->bclk_ratio)ret=fsl_sai_set_bclk(cpu_dai,tx,sai->bclk_ratio*
@@ -502,12 +502,12 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,val_cr4|=FSL_SAI_CR4_CHMOD;/*-*ForSAImastermode,whenTx(Rx)syncwithRx(Tx)clock,Rx(Tx)will+*ForSAIprovidermode,whenTx(Rx)syncwithRx(Tx)clock,Rx(Tx)will*generatebclkandframeclockforTx(Rx),weshouldsetRCR4(TCR4),*RCR5(TCR5)forplayback(capture),ortherewillbesyncerror.*/-if(!sai->is_slave_mode&&fsl_sai_dir_is_synced(sai,adir)){+if(!sai->is_consumer_mode&&fsl_sai_dir_is_synced(sai,adir)){regmap_update_bits(sai->regmap,FSL_SAI_xCR4(!tx,ofs),FSL_SAI_CR4_SYWD_MASK|FSL_SAI_CR4_FRSZ_MASK|FSL_SAI_CR4_CHMOD_MASK,
@@ -543,7 +543,7 @@ static int fsl_sai_hw_free(struct snd_pcm_substream *substream,regmap_update_bits(sai->regmap,FSL_SAI_xCR3(tx,ofs),FSL_SAI_CR3_TRCE_MASK,0);-if(!sai->is_slave_mode&&+if(!sai->is_consumer_mode&&sai->mclk_streams&BIT(substream->stream)){clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[tx]]);sai->mclk_streams&=~BIT(substream->stream);
@@ -577,7 +577,7 @@ static void fsl_sai_config_disable(struct fsl_sai *sai, int dir)*Thisisahardwarebug,andwillbefixinthe*nextsaiversion.*/-if(!sai->is_slave_mode){+if(!sai->is_consumer_mode){/* Software Reset */regmap_write(sai->regmap,FSL_SAI_xCSR(tx,ofs),FSL_SAI_CSR_SR);/* Clear SR bit to finish the reset */
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:43:58
As part of moving to remove the old style defines for the bus clocks update
the imx-audmix driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/imx-audmix.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
@@ -80,8 +80,8 @@ static int imx_audmix_fe_hw_params(struct snd_pcm_substream *substream,u32channels=params_channels(params);intret,dir;-/* For playback the AUDMIX is slave, and for record is master */-fmt|=tx?SND_SOC_DAIFMT_CBS_CFS:SND_SOC_DAIFMT_CBM_CFM;+/* For playback the AUDMIX is consumer, and for record is provider */+fmt|=tx?SND_SOC_DAIFMT_CBC_CFC:SND_SOC_DAIFMT_CBP_CFP;dir=tx?SND_SOC_CLOCK_OUT:SND_SOC_CLOCK_IN;/* set DAI configuration */
@@ -121,8 +121,8 @@ static int imx_audmix_be_hw_params(struct snd_pcm_substream *substream,if(!tx)return0;-/* For playback the AUDMIX is slave */-fmt|=SND_SOC_DAIFMT_CBM_CFM;+/* For playback the AUDMIX is consumer */+fmt|=SND_SOC_DAIFMT_CBP_CFP;/* set AUDMIX DAI configuration */ret=snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd,0),fmt);
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:45:00
As part of moving to remove the old style defines for the bus clocks update
the imx-card driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/imx-card.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:46:36
As part of moving to remove the old style defines for the bus clocks update
the imx-es8328 driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/imx-es8328.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:47:38
As part of moving to remove the old style defines for the bus clocks update
the imx-hdmi driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/imx-hdmi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:48:08
As part of moving to remove the old style defines for the bus clocks update
the imx-rpmsg driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/imx-rpmsg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:49:06
As part of moving to remove the old style defines for the bus clocks update
the imx-sgtl5000 driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/imx-sgtl5000.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:50:28
As part of moving to remove the old style defines for the bus clocks update
the mpc8610_hpcd driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/mpc8610_hpcd.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:50:59
As part of moving to remove the old style defines for the bus clocks update
the pl1022_ds driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/p1022_ds.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
From: Mark Brown <broonie@kernel.org> Date: 2021-09-21 21:51:51
As part of moving to remove the old style defines for the bus clocks update
the pl1022_rdk driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/p1022_rdk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
On Tue, Sep 21, 2021 at 6:36 PM Mark Brown [off-list ref] wrote:
As part of moving to remove the old style defines for the bus clocks update
the eureka-tlv320 driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
For the whole series:
Reviewed-by: Fabio Estevam <festevam@gmail.com>
From: Mark Brown <broonie@kernel.org> Date: 2021-09-22 14:24:49
On Tue, 21 Sep 2021 22:35:27 +0100, Mark Brown wrote:
As part of moving to remove the old style defines for the bus clocks update
the eureka-tlv320 driver to use more modern terminology for clocking.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/16] ASoC: eureka-tlv320: Update to modern clocking terminology
commit: 4348be6330a18b123fa82494df9f5a134feecb7f
[02/16] ASoC: fsl-asoc-card: Update to modern clocking terminology
commit: 8fcfd3493426c229f4f28bc5757dd3359e02cee8
[03/16] ASoC: fsl-audmix: Update to modern clocking terminology
commit: 2757b340b25dd2cb3afc748d48c1dff6c9689f80
[04/16] ASoC: fsl-esai: Update to modern clocking terminology
commit: e0b64fa34c7f444908549c32dd68f81ac436299e
[05/16] ASoC: fsl-mqs: Update to modern clocking terminology
commit: a51da9dc9b3a844460a355cd10d0db4320f4d726
[06/16] ASoC: fsl_sai: Update to modern clocking terminology
commit: 361284a4eb598eaf28e8458c542f214d3689b134
[07/16] ASoC: fsl_ssi: Update to modern clocking terminology
commit: 89efbdaaa444d63346bf1bdf3b58dfb421de91f1
[08/16] ASoC: imx-audmix: Update to modern clocking terminology
commit: bf101022487091032fd8102c835b1157b8283c43
[09/16] ASoC: imx-card: Update to modern clocking terminology
commit: d689e280121abf1cdf0d37734b0b306098a774ed
[10/16] ASoC: imx-es8328: Update to modern clocking terminology
commit: 56b69e4e4bc24c732b68ff6df54be83226a3b4e6
[11/16] ASoC: imx-hdmi: Update to modern clocking terminology
commit: a90f847ad2f1c8575f6a7980e5ee9937d1a5eeb4
[12/16] ASoC: imx-rpmsg: Update to modern clocking terminology
commit: caa0a6075a6e9239e49690a40a131496398602ab
[13/16] ASoC: imx-sgtl5000: Update to modern clocking terminology
commit: 419099b4c3318a3c486f9f65b015760e71d53f0a
[14/16] ASoC: mpc8610_hpcd: Update to modern clocking terminology
commit: 8a7f299b857b81a10566fe19c585fae4d1c1f8ef
[15/16] ASoC: pl1022_ds: Update to modern clocking terminology
commit: fcd444bf6a29a22e529510de07c72555b7e46224
[16/16] ASoC: pl1022_rdk: Update to modern clocking terminology
commit: 39e178a4cc7d042cd6353e73f3024d87e79a86ca
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark