diff mbox series

[06/56] ASoC: ep93xx: Update to use set_fmt_new callback

Message ID	20220519154318.2153729-7-ckeepax@opensource.cirrus.com
State	New
Headers	show Return-Path: <linux-omap-owner@kernel.org> From: Charles Keepax <ckeepax@opensource.cirrus.com> To: <broonie@kernel.org> CC: <lgirdwood@gmail.com>, <kuninori.morimoto.gx@renesas.com>, <nicolas.ferre@microchip.com>, <nsaenz@kernel.org>, <shawnguo@kernel.org>, <linux-imx@nxp.com>, <cezary.rojewski@intel.com>, <pierre-louis.bossart@linux.intel.com>, <linux-mips@vger.kernel.org>, <linux-mediatek@lists.infradead.org>, <linux-amlogic@lists.infradead.org>, <daniel@zonque.org>, <srinivas.kandagatla@linaro.org>, <linux-rockchip@lists.infradead.org>, <krzk@kernel.org>, <linux-stm32@st-md-mailman.stormreply.com>, <linux-sunxi@lists.linux.dev>, <linux-tegra@vger.kernel.org>, <linux-omap@vger.kernel.org>, <linux-xtensa@linux-xtensa.org>, <peter.ujfalusi@gmail.com>, <jarkko.nikula@bitmer.com>, <heiko@sntech.de>, <jbrunet@baylibre.com>, <kernel@pengutronix.de>, <alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com> Subject: [PATCH 06/56] ASoC: ep93xx: Update to use set_fmt_new callback Date: Thu, 19 May 2022 16:42:28 +0100 Message-ID: <20220519154318.2153729-7-ckeepax@opensource.cirrus.com> In-Reply-To: <20220519154318.2153729-1-ckeepax@opensource.cirrus.com> References: <20220519154318.2153729-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: bulk
Series	Specify clock provider directly to CPU DAIs \| expand [00/56] Specify clock provider directly to CPU DAIs [01/56] ASoC: core: Add set_fmt_new callback that directly specifies provider [02/56] ASoC: amd: vangogh: Update to use set_fmt_new callback [03/56] ASoC: atmel: Update to use set_fmt_new callback [04/56] ASoC: au1x: Update to use set_fmt_new callback [05/56] ASoC: bcm: Update to use set_fmt_new callback [06/56] ASoC: ep93xx: Update to use set_fmt_new callback [07/56] ASoC: dwc: Update to use set_fmt_new callback [08/56] ASoC: fsl: Update to use set_fmt_new callback [09/56] ASoC: hisilicon: Update to use set_fmt_new callback [10/56] ASoC: img: Update to use set_fmt_new callback [11/56] ASoC: Intel: Update to use set_fmt_new callback [12/56] ASoC: js4740-i2s: Update to use set_fmt_new callback [13/56] ASoC: mediatek: Update to use set_fmt_new callback [14/56] ASoC: meson: Update to use set_fmt_new callback [15/56] ASoC: mxs-saif: Update to use set_fmt_new callback [16/56] ASoC: pxa: Update to use set_fmt_new callback [17/56] ASoC: qcom: Update to use set_fmt_new callback [18/56] ASoC: rockchip: Update to use set_fmt_new callback [19/56] ASoC: samsung: Update to use set_fmt_new callback [20/56] ASoC: sh: Update to use set_fmt_new callback [21/56] ASoC: stm: Update to use set_fmt_new callback [22/56] ASoC: sunxi: Update to use set_fmt_new callback [23/56] ASoC: tegra: Update to use set_fmt_new callback [24/56] ASoC: test-component: Update to use set_fmt_new callback [25/56] ASoC: ti: Update to use set_fmt_new callback [26/56] ASoC: ux500: Update to use set_fmt_new callback [27/56] ASoC: xtensa: Update to use set_fmt_new callback [28/56] ASoC: core: Always send the CPU DAI a direct clock specifier [29/56] ASoC: amd: vangogh: Rename set_fmt_new back to set_fmt [30/56] ASoC: atmel: Rename set_fmt_new back to set_fmt [31/56] ASoC: au1x: Rename set_fmt_new back to set_fmt [32/56] ASoC: bcm: Rename set_fmt_new back to set_fmt [33/56] ASoC: ep93xx: Rename set_fmt_new back to set_fmt [34/56] ASoC: dwc: Rename set_fmt_new back to set_fmt [35/56] ASoC: fsl: Rename set_fmt_new back to set_fmt [36/56] ASoC: hisilicon: Rename set_fmt_new back to set_fmt [37/56] ASoC: img: Rename set_fmt_new back to set_fmt [38/56] ASoC: Intel: Rename set_fmt_new back to set_fmt [39/56] ASoC: jz4740-i2s: Rename set_fmt_new back to set_fmt [40/56] ASoC: mediatek: Rename set_fmt_new back to set_fmt [41/56] ASoC: meson: Rename set_fmt_new back to set_fmt [42/56] ASoC: mxs-saif: Rename set_fmt_new back to set_fmt [43/56] ASoC: pxa: Rename set_fmt_new back to set_fmt [44/56] ASoC: qcom: Rename set_fmt_new back to set_fmt [45/56] ASoC: rockchip: Rename set_fmt_new back to set_fmt [46/56] ASoC: samsung: Rename set_fmt_new back to set_fmt [47/56] ASoC: sh: Rename set_fmt_new back to set_fmt [48/56] ASoC: stm: Rename set_fmt_new back to set_fmt [49/56] ASoC: sunxi: Rename set_fmt_new back to set_fmt [50/56] ASoC: tegra: Rename set_fmt_new back to set_fmt [51/56] ASoC: test-component: Rename set_fmt_new back to set_fmt [52/56] ASoC: ti: Rename set_fmt_new back to set_fmt [53/56] ASoC: ux500: Rename set_fmt_new back to set_fmt [54/56] ASoC: xtensa: Rename set_fmt_new back to set_fmt [55/56] ASoC: soc-dai: Remove set_fmt_new callback [56/56] ASoC: simple-card-utils: Move snd_soc_component_is_codec to be local

Commit Message

Charles Keepax May 19, 2022, 3:42 p.m. UTC

As part of updating the core to directly tell drivers if they are clock
provider or consumer update this CPU side driver to use the new direct
callback.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
 sound/soc/cirrus/ep93xx-i2s.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 2c8cd843d049c..2c8b1c76b834c 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -246,12 +246,12 @@  static int ep93xx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 	}
 
 	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
-	case SND_SOC_DAIFMT_CBC_CFC:
+	case SND_SOC_DAIFMT_BP_FP:
 		/* CPU is provider */
 		clk_cfg |= EP93XX_I2S_CLKCFG_MASTER;
 		break;
 
-	case SND_SOC_DAIFMT_CBP_CFP:
+	case SND_SOC_DAIFMT_BC_FC:
 		/* Codec is provider */
 		clk_cfg &= ~EP93XX_I2S_CLKCFG_MASTER;
 		break;
@@ -398,7 +398,7 @@  static const struct snd_soc_dai_ops ep93xx_i2s_dai_ops = {
 	.shutdown	= ep93xx_i2s_shutdown,
 	.hw_params	= ep93xx_i2s_hw_params,
 	.set_sysclk	= ep93xx_i2s_set_sysclk,
-	.set_fmt	= ep93xx_i2s_set_dai_fmt,
+	.set_fmt_new	= ep93xx_i2s_set_dai_fmt,
 };
 
 #define EP93XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S32_LE)