Unverified Commit 06f6e1d4 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: add soc-dai.c 



Current ALSA SoC has many snd_soc_dai_xxx() function which is
using dai->driver->ops->xxx.
But, some of them are implemented as snd_soc_dai_xxx(),
but others are directly using dai->driver->ops->xxx.
Because of it, the code is not easy to read.

This patch creats new soc-dai.c and moves snd_soc_dai_xxx()
functions into it.
One exception is snd_soc_dai_is_dummy() which is based on
soc-utils local variable. We need to keep it as-is there.

Others which is directly using dai->driver->ops->xxx will be
implemented at soc-dai.c by incremental patches.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/871ryij1r6.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 859fd6cb

sound/soc/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o

snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o

snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o

snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o

sound/soc/soc-core.c

+0 −243
Original line number Diff line number Diff line
@@ -2394,26 +2394,6 @@ int snd_soc_add_dai_controls(struct snd_soc_dai *dai, 
}

EXPORT_SYMBOL_GPL(snd_soc_add_dai_controls);



/**

 * snd_soc_dai_set_sysclk - configure DAI system or master clock.

 * @dai: DAI

 * @clk_id: DAI specific clock ID

 * @freq: new clock frequency in Hz

 * @dir: new clock direction - input/output.

 *

 * Configures the DAI master (MCLK) or system (SYSCLK) clocking.

 */

int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,

	unsigned int freq, int dir)

{

	if (dai->driver->ops->set_sysclk)

		return dai->driver->ops->set_sysclk(dai, clk_id, freq, dir);



	return snd_soc_component_set_sysclk(dai->component, clk_id, 0,

					    freq, dir);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk);



/**

 * snd_soc_component_set_sysclk - configure COMPONENT system or master clock.

 * @component: COMPONENT
@@ -2436,48 +2416,6 @@ int snd_soc_component_set_sysclk(struct snd_soc_component *component, 
}

EXPORT_SYMBOL_GPL(snd_soc_component_set_sysclk);



/**

 * snd_soc_dai_set_clkdiv - configure DAI clock dividers.

 * @dai: DAI

 * @div_id: DAI specific clock divider ID

 * @div: new clock divisor.

 *

 * Configures the clock dividers. This is used to derive the best DAI bit and

 * frame clocks from the system or master clock. It's best to set the DAI bit

 * and frame clocks as low as possible to save system power.

 */

int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,

	int div_id, int div)

{

	if (dai->driver->ops->set_clkdiv)

		return dai->driver->ops->set_clkdiv(dai, div_id, div);

	else

		return -EINVAL;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_clkdiv);



/**

 * snd_soc_dai_set_pll - configure DAI PLL.

 * @dai: DAI

 * @pll_id: DAI specific PLL ID

 * @source: DAI specific source for the PLL

 * @freq_in: PLL input clock frequency in Hz

 * @freq_out: requested PLL output clock frequency in Hz

 *

 * Configures and enables PLL to generate output clock based on input clock.

 */

int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int pll_id, int source,

	unsigned int freq_in, unsigned int freq_out)

{

	if (dai->driver->ops->set_pll)

		return dai->driver->ops->set_pll(dai, pll_id, source,

					 freq_in, freq_out);



	return snd_soc_component_set_pll(dai->component, pll_id, source,

					 freq_in, freq_out);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_pll);



/*

 * snd_soc_component_set_pll - configure component PLL.

 * @component: COMPONENT
@@ -2500,187 +2438,6 @@ int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id, 
}

EXPORT_SYMBOL_GPL(snd_soc_component_set_pll);



/**

 * snd_soc_dai_set_bclk_ratio - configure BCLK to sample rate ratio.

 * @dai: DAI

 * @ratio: Ratio of BCLK to Sample rate.

 *

 * Configures the DAI for a preset BCLK to sample rate ratio.

 */

int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)

{

	if (dai->driver->ops->set_bclk_ratio)

		return dai->driver->ops->set_bclk_ratio(dai, ratio);

	else

		return -EINVAL;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio);



/**

 * snd_soc_dai_set_fmt - configure DAI hardware audio format.

 * @dai: DAI

 * @fmt: SND_SOC_DAIFMT_* format value.

 *

 * Configures the DAI hardware format and clocking.

 */

int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)

{

	if (dai->driver->ops->set_fmt == NULL)

		return -ENOTSUPP;

	return dai->driver->ops->set_fmt(dai, fmt);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt);



/**

 * snd_soc_xlate_tdm_slot - generate tx/rx slot mask.

 * @slots: Number of slots in use.

 * @tx_mask: bitmask representing active TX slots.

 * @rx_mask: bitmask representing active RX slots.

 *

 * Generates the TDM tx and rx slot default masks for DAI.

 */

static int snd_soc_xlate_tdm_slot_mask(unsigned int slots,

				       unsigned int *tx_mask,

				       unsigned int *rx_mask)

{

	if (*tx_mask || *rx_mask)

		return 0;



	if (!slots)

		return -EINVAL;



	*tx_mask = (1 << slots) - 1;

	*rx_mask = (1 << slots) - 1;



	return 0;

}



/**

 * snd_soc_dai_set_tdm_slot() - Configures a DAI for TDM operation

 * @dai: The DAI to configure

 * @tx_mask: bitmask representing active TX slots.

 * @rx_mask: bitmask representing active RX slots.

 * @slots: Number of slots in use.

 * @slot_width: Width in bits for each slot.

 *

 * This function configures the specified DAI for TDM operation. @slot contains

 * the total number of slots of the TDM stream and @slot_with the width of each

 * slot in bit clock cycles. @tx_mask and @rx_mask are bitmasks specifying the

 * active slots of the TDM stream for the specified DAI, i.e. which slots the

 * DAI should write to or read from. If a bit is set the corresponding slot is

 * active, if a bit is cleared the corresponding slot is inactive. Bit 0 maps to

 * the first slot, bit 1 to the second slot and so on. The first active slot

 * maps to the first channel of the DAI, the second active slot to the second

 * channel and so on.

 *

 * TDM mode can be disabled by passing 0 for @slots. In this case @tx_mask,

 * @rx_mask and @slot_width will be ignored.

 *

 * Returns 0 on success, a negative error code otherwise.

 */

int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,

	unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)

{

	if (dai->driver->ops->xlate_tdm_slot_mask)

		dai->driver->ops->xlate_tdm_slot_mask(slots,

						&tx_mask, &rx_mask);

	else

		snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask);



	dai->tx_mask = tx_mask;

	dai->rx_mask = rx_mask;



	if (dai->driver->ops->set_tdm_slot)

		return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask,

				slots, slot_width);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_tdm_slot);



/**

 * snd_soc_dai_set_channel_map - configure DAI audio channel map

 * @dai: DAI

 * @tx_num: how many TX channels

 * @tx_slot: pointer to an array which imply the TX slot number channel

 *           0~num-1 uses

 * @rx_num: how many RX channels

 * @rx_slot: pointer to an array which imply the RX slot number channel

 *           0~num-1 uses

 *

 * configure the relationship between channel number and TDM slot number.

 */

int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai,

	unsigned int tx_num, unsigned int *tx_slot,

	unsigned int rx_num, unsigned int *rx_slot)

{

	if (dai->driver->ops->set_channel_map)

		return dai->driver->ops->set_channel_map(dai, tx_num, tx_slot,

			rx_num, rx_slot);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_channel_map);



/**

 * snd_soc_dai_get_channel_map - Get DAI audio channel map

 * @dai: DAI

 * @tx_num: how many TX channels

 * @tx_slot: pointer to an array which imply the TX slot number channel

 *           0~num-1 uses

 * @rx_num: how many RX channels

 * @rx_slot: pointer to an array which imply the RX slot number channel

 *           0~num-1 uses

 */

int snd_soc_dai_get_channel_map(struct snd_soc_dai *dai,

	unsigned int *tx_num, unsigned int *tx_slot,

	unsigned int *rx_num, unsigned int *rx_slot)

{

	if (dai->driver->ops->get_channel_map)

		return dai->driver->ops->get_channel_map(dai, tx_num, tx_slot,

			rx_num, rx_slot);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_get_channel_map);



/**

 * snd_soc_dai_set_tristate - configure DAI system or master clock.

 * @dai: DAI

 * @tristate: tristate enable

 *

 * Tristates the DAI so that others can use it.

 */

int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate)

{

	if (dai->driver->ops->set_tristate)

		return dai->driver->ops->set_tristate(dai, tristate);

	else

		return -EINVAL;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate);



/**

 * snd_soc_dai_digital_mute - configure DAI system or master clock.

 * @dai: DAI

 * @mute: mute enable

 * @direction: stream to mute

 *

 * Mutes the DAI DAC.

 */

int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute,

			     int direction)

{

	if (dai->driver->ops->mute_stream)

		return dai->driver->ops->mute_stream(dai, mute, direction);

	else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&

		 dai->driver->ops->digital_mute)

		return dai->driver->ops->digital_mute(dai, mute);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_digital_mute);



static int snd_soc_bind_card(struct snd_soc_card *card)

{

	struct snd_soc_pcm_runtime *rtd;

sound/soc/soc-dai.c

0 → 100644
+254 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// soc-dai.c

//

// Copyright (C) 2019 Renesas Electronics Corp.

// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

//



#include <sound/soc.h>

#include <sound/soc-dai.h>



/**

 * snd_soc_dai_set_sysclk - configure DAI system or master clock.

 * @dai: DAI

 * @clk_id: DAI specific clock ID

 * @freq: new clock frequency in Hz

 * @dir: new clock direction - input/output.

 *

 * Configures the DAI master (MCLK) or system (SYSCLK) clocking.

 */

int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,

			   unsigned int freq, int dir)

{

	if (dai->driver->ops->set_sysclk)

		return dai->driver->ops->set_sysclk(dai, clk_id, freq, dir);



	return snd_soc_component_set_sysclk(dai->component, clk_id, 0,

					    freq, dir);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk);



/**

 * snd_soc_dai_set_clkdiv - configure DAI clock dividers.

 * @dai: DAI

 * @div_id: DAI specific clock divider ID

 * @div: new clock divisor.

 *

 * Configures the clock dividers. This is used to derive the best DAI bit and

 * frame clocks from the system or master clock. It's best to set the DAI bit

 * and frame clocks as low as possible to save system power.

 */

int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,

			   int div_id, int div)

{

	if (dai->driver->ops->set_clkdiv)

		return dai->driver->ops->set_clkdiv(dai, div_id, div);

	else

		return -EINVAL;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_clkdiv);



/**

 * snd_soc_dai_set_pll - configure DAI PLL.

 * @dai: DAI

 * @pll_id: DAI specific PLL ID

 * @source: DAI specific source for the PLL

 * @freq_in: PLL input clock frequency in Hz

 * @freq_out: requested PLL output clock frequency in Hz

 *

 * Configures and enables PLL to generate output clock based on input clock.

 */

int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int pll_id, int source,

			unsigned int freq_in, unsigned int freq_out)

{

	if (dai->driver->ops->set_pll)

		return dai->driver->ops->set_pll(dai, pll_id, source,

						 freq_in, freq_out);



	return snd_soc_component_set_pll(dai->component, pll_id, source,

					 freq_in, freq_out);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_pll);



/**

 * snd_soc_dai_set_bclk_ratio - configure BCLK to sample rate ratio.

 * @dai: DAI

 * @ratio: Ratio of BCLK to Sample rate.

 *

 * Configures the DAI for a preset BCLK to sample rate ratio.

 */

int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)

{

	if (dai->driver->ops->set_bclk_ratio)

		return dai->driver->ops->set_bclk_ratio(dai, ratio);

	else

		return -EINVAL;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio);



/**

 * snd_soc_dai_set_fmt - configure DAI hardware audio format.

 * @dai: DAI

 * @fmt: SND_SOC_DAIFMT_* format value.

 *

 * Configures the DAI hardware format and clocking.

 */

int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)

{

	if (dai->driver->ops->set_fmt == NULL)

		return -ENOTSUPP;

	return dai->driver->ops->set_fmt(dai, fmt);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt);



/**

 * snd_soc_xlate_tdm_slot - generate tx/rx slot mask.

 * @slots: Number of slots in use.

 * @tx_mask: bitmask representing active TX slots.

 * @rx_mask: bitmask representing active RX slots.

 *

 * Generates the TDM tx and rx slot default masks for DAI.

 */

static int snd_soc_xlate_tdm_slot_mask(unsigned int slots,

				       unsigned int *tx_mask,

				       unsigned int *rx_mask)

{

	if (*tx_mask || *rx_mask)

		return 0;



	if (!slots)

		return -EINVAL;



	*tx_mask = (1 << slots) - 1;

	*rx_mask = (1 << slots) - 1;



	return 0;

}



/**

 * snd_soc_dai_set_tdm_slot() - Configures a DAI for TDM operation

 * @dai: The DAI to configure

 * @tx_mask: bitmask representing active TX slots.

 * @rx_mask: bitmask representing active RX slots.

 * @slots: Number of slots in use.

 * @slot_width: Width in bits for each slot.

 *

 * This function configures the specified DAI for TDM operation. @slot contains

 * the total number of slots of the TDM stream and @slot_with the width of each

 * slot in bit clock cycles. @tx_mask and @rx_mask are bitmasks specifying the

 * active slots of the TDM stream for the specified DAI, i.e. which slots the

 * DAI should write to or read from. If a bit is set the corresponding slot is

 * active, if a bit is cleared the corresponding slot is inactive. Bit 0 maps to

 * the first slot, bit 1 to the second slot and so on. The first active slot

 * maps to the first channel of the DAI, the second active slot to the second

 * channel and so on.

 *

 * TDM mode can be disabled by passing 0 for @slots. In this case @tx_mask,

 * @rx_mask and @slot_width will be ignored.

 *

 * Returns 0 on success, a negative error code otherwise.

 */

int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,

			     unsigned int tx_mask, unsigned int rx_mask,

			     int slots, int slot_width)

{

	if (dai->driver->ops->xlate_tdm_slot_mask)

		dai->driver->ops->xlate_tdm_slot_mask(slots,

						      &tx_mask, &rx_mask);

	else

		snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask);



	dai->tx_mask = tx_mask;

	dai->rx_mask = rx_mask;



	if (dai->driver->ops->set_tdm_slot)

		return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask,

						      slots, slot_width);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_tdm_slot);



/**

 * snd_soc_dai_set_channel_map - configure DAI audio channel map

 * @dai: DAI

 * @tx_num: how many TX channels

 * @tx_slot: pointer to an array which imply the TX slot number channel

 *           0~num-1 uses

 * @rx_num: how many RX channels

 * @rx_slot: pointer to an array which imply the RX slot number channel

 *           0~num-1 uses

 *

 * configure the relationship between channel number and TDM slot number.

 */

int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai,

				unsigned int tx_num, unsigned int *tx_slot,

				unsigned int rx_num, unsigned int *rx_slot)

{

	if (dai->driver->ops->set_channel_map)

		return dai->driver->ops->set_channel_map(dai, tx_num, tx_slot,

							 rx_num, rx_slot);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_channel_map);



/**

 * snd_soc_dai_get_channel_map - Get DAI audio channel map

 * @dai: DAI

 * @tx_num: how many TX channels

 * @tx_slot: pointer to an array which imply the TX slot number channel

 *           0~num-1 uses

 * @rx_num: how many RX channels

 * @rx_slot: pointer to an array which imply the RX slot number channel

 *           0~num-1 uses

 */

int snd_soc_dai_get_channel_map(struct snd_soc_dai *dai,

				unsigned int *tx_num, unsigned int *tx_slot,

				unsigned int *rx_num, unsigned int *rx_slot)

{

	if (dai->driver->ops->get_channel_map)

		return dai->driver->ops->get_channel_map(dai, tx_num, tx_slot,

							 rx_num, rx_slot);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_get_channel_map);



/**

 * snd_soc_dai_set_tristate - configure DAI system or master clock.

 * @dai: DAI

 * @tristate: tristate enable

 *

 * Tristates the DAI so that others can use it.

 */

int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate)

{

	if (dai->driver->ops->set_tristate)

		return dai->driver->ops->set_tristate(dai, tristate);

	else

		return -EINVAL;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate);



/**

 * snd_soc_dai_digital_mute - configure DAI system or master clock.

 * @dai: DAI

 * @mute: mute enable

 * @direction: stream to mute

 *

 * Mutes the DAI DAC.

 */

int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute,

			     int direction)

{

	if (dai->driver->ops->mute_stream)

		return dai->driver->ops->mute_stream(dai, mute, direction);

	else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&

		 dai->driver->ops->digital_mute)

		return dai->driver->ops->digital_mute(dai, mute);

	else

		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_digital_mute);

CRA Git | Maintained and supported by SUSTech CRA and CCSE