Merge series "ASoC: adds new .auto_selectable_formats support" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
Hi Mark These are v3 of "ASoC: adds new .get_fmt support", but renamed Subject. This is a little bit challenging patch-set. The idea/code is almost same as v1 / v2. v3 has "priority" support. We need to set dai_link->dai_fmt to select CPU/Codec settings, and it is selected by Sound Card Driver, today. Because of it, Sound Card user need to know both CPU / Codec available dai_fmt, and needs to select it. For example simple-card / audio-graph case, it is selected by "format" and "bitclock/frame-master/inversion" on DT. But, it can be automatically selected if both CPU and Codec drivers indicate it to ALSA SoC Framework, somehow. By this patch, dai_fmt can be automatically selected from each driver if both CPU / Codec driver had .auto_selectable_formats. Automatically selectable *field* is depends on each drivers. For example, some driver want to select format "automatically", but want to select other fields "manually", because of complex limitation. Or other example, in case of both CPU and Codec are possible to be clock provider, but the quality was different. In these case, user need/want to *manually* select each fields from Sound Card driver. It uses Sound Card specified fields preferentially, and try to select non-specific fields from CPU and Codec driver settings if driver had .auto_selectable_formats. In other words, we can select all dai_fmt via Sound Card driver same as before. Select dai_fmt 100% automatically is very difficult and will be very complex, but select automatically some fields only is very easy, I guess. This patch-set is based on such assumption. v1 -> v2 - Add more detail explanation on git-log, code, comment. - Possible to be Clock/Frame provider is depends on driver's situation. v2 -> v3 - has priority - tidyup function explanation for snd_soc_dai_get_fmt() - Each driver don't try to have SND_SOC_DAIFMT_CBx_CFx to avoid confusion Link: https://lore.kernel.org/r/871rb3hypy.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/871racbx0w.wl-kuninori.morimoto.gx@renesas.com Kuninori Morimoto (7): ASoC: soc-core: move snd_soc_runtime_set_dai_fmt() to upside ASoC: soc-core: add snd_soc_runtime_get_dai_fmt() ASoC: ak4613: add .auto_selectable_formats support ASoC: pcm3168a: add .auto_selectable_formats support ASoC: rsnd: add .auto_selectable_formats support ASoC: fsi: add .auto_selectable_formats support ASoC: hdmi-codec: add .auto_selectable_formats support include/sound/soc-dai.h | 55 +++++++ sound/soc/codecs/ak4613.c | 11 ++ sound/soc/codecs/hdmi-codec.c | 21 +++ sound/soc/codecs/pcm3168a.c | 26 +++ sound/soc/sh/fsi.c | 15 ++ sound/soc/sh/rcar/core.c | 31 +++- sound/soc/soc-core.c | 288 ++++++++++++++++++++++++++-------- sound/soc/soc-dai.c | 63 ++++++++ sound/soc/soc-utils.c | 29 ++++ 9 files changed, 475 insertions(+), 64 deletions(-) -- 2.25.1
This commit is contained in:
Mark Brown
Коммит
d08c5b76b2
|
|
@ -36,6 +36,22 @@ struct snd_compr_stream;
|
|||
#define SND_SOC_DAIFMT_MSB SND_SOC_DAIFMT_LEFT_J
|
||||
#define SND_SOC_DAIFMT_LSB SND_SOC_DAIFMT_RIGHT_J
|
||||
|
||||
/* Describes the possible PCM format */
|
||||
/*
|
||||
* use SND_SOC_DAI_FORMAT_xx as eash shift.
|
||||
* see
|
||||
* snd_soc_runtime_get_dai_fmt()
|
||||
*/
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_FORMAT_SHIFT 0
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_FORMAT_MASK (0xFFFF << SND_SOC_POSSIBLE_DAIFMT_FORMAT_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_I2S (1 << SND_SOC_DAI_FORMAT_I2S)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_RIGHT_J (1 << SND_SOC_DAI_FORMAT_RIGHT_J)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_LEFT_J (1 << SND_SOC_DAI_FORMAT_LEFT_J)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_DSP_A (1 << SND_SOC_DAI_FORMAT_DSP_A)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_DSP_B (1 << SND_SOC_DAI_FORMAT_DSP_B)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_AC97 (1 << SND_SOC_DAI_FORMAT_AC97)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_PDM (1 << SND_SOC_DAI_FORMAT_PDM)
|
||||
|
||||
/*
|
||||
* DAI Clock gating.
|
||||
*
|
||||
|
|
@ -45,6 +61,17 @@ struct snd_compr_stream;
|
|||
#define SND_SOC_DAIFMT_CONT (1 << 4) /* continuous clock */
|
||||
#define SND_SOC_DAIFMT_GATED (0 << 4) /* clock is gated */
|
||||
|
||||
/* Describes the possible PCM format */
|
||||
/*
|
||||
* define GATED -> CONT. GATED will be selected if both are selected.
|
||||
* see
|
||||
* snd_soc_runtime_get_dai_fmt()
|
||||
*/
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_SHIFT 16
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_MASK (0xFFFF << SND_SOC_POSSIBLE_DAIFMT_CLOCK_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_GATED (0x1ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CONT (0x2ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_SHIFT)
|
||||
|
||||
/*
|
||||
* DAI hardware signal polarity.
|
||||
*
|
||||
|
|
@ -71,6 +98,14 @@ struct snd_compr_stream;
|
|||
#define SND_SOC_DAIFMT_IB_NF (3 << 8) /* invert BCLK + nor FRM */
|
||||
#define SND_SOC_DAIFMT_IB_IF (4 << 8) /* invert BCLK + FRM */
|
||||
|
||||
/* Describes the possible PCM format */
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT 32
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_INV_MASK (0xFFFFULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_NB_NF (0x1ULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_NB_IF (0x2ULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_IB_NF (0x4ULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_IB_IF (0x8ULL << SND_SOC_POSSIBLE_DAIFMT_INV_SHIFT)
|
||||
|
||||
/*
|
||||
* DAI hardware clock providers/consumers
|
||||
*
|
||||
|
|
@ -89,6 +124,14 @@ struct snd_compr_stream;
|
|||
#define SND_SOC_DAIFMT_CBM_CFS SND_SOC_DAIFMT_CBP_CFC
|
||||
#define SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC
|
||||
|
||||
/* Describes the possible PCM format */
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT 48
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_MASK (0xFFFFULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CBP_CFP (0x1ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CBC_CFP (0x2ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CBP_CFC (0x4ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
|
||||
#define SND_SOC_POSSIBLE_DAIFMT_CBC_CFC (0x8ULL << SND_SOC_POSSIBLE_DAIFMT_CLOCK_PROVIDER_SHIFT)
|
||||
|
||||
#define SND_SOC_DAIFMT_FORMAT_MASK 0x000f
|
||||
#define SND_SOC_DAIFMT_CLOCK_MASK 0x00f0
|
||||
#define SND_SOC_DAIFMT_INV_MASK 0x0f00
|
||||
|
|
@ -131,6 +174,8 @@ int snd_soc_dai_set_pll(struct snd_soc_dai *dai,
|
|||
int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio);
|
||||
|
||||
/* Digital Audio interface formatting */
|
||||
int snd_soc_dai_get_fmt_max_priority(struct snd_soc_pcm_runtime *rtd);
|
||||
u64 snd_soc_dai_get_fmt(struct snd_soc_dai *dai, int priority);
|
||||
int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
|
||||
|
||||
int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,
|
||||
|
|
@ -292,6 +337,16 @@ struct snd_soc_dai_ops {
|
|||
snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,
|
||||
struct snd_soc_dai *);
|
||||
|
||||
/*
|
||||
* Format list for auto selection.
|
||||
* Format will be increased if priority format was
|
||||
* not selected.
|
||||
* see
|
||||
* snd_soc_dai_get_fmt()
|
||||
*/
|
||||
u64 *auto_selectable_formats;
|
||||
int num_auto_selectable_formats;
|
||||
|
||||
/* bit field */
|
||||
unsigned int no_capture_mute:1;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -539,6 +539,15 @@ static int ak4613_dai_trigger(struct snd_pcm_substream *substream, int cmd,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Select below from Sound Card, not Auto
|
||||
* SND_SOC_DAIFMT_CBC_CFC
|
||||
* SND_SOC_DAIFMT_CBP_CFP
|
||||
*/
|
||||
static u64 ak4613_dai_formats =
|
||||
SND_SOC_POSSIBLE_DAIFMT_I2S |
|
||||
SND_SOC_POSSIBLE_DAIFMT_LEFT_J;
|
||||
|
||||
static const struct snd_soc_dai_ops ak4613_dai_ops = {
|
||||
.startup = ak4613_dai_startup,
|
||||
.shutdown = ak4613_dai_shutdown,
|
||||
|
|
@ -546,6 +555,8 @@ static const struct snd_soc_dai_ops ak4613_dai_ops = {
|
|||
.set_fmt = ak4613_dai_set_fmt,
|
||||
.trigger = ak4613_dai_trigger,
|
||||
.hw_params = ak4613_dai_hw_params,
|
||||
.auto_selectable_formats = &ak4613_dai_formats,
|
||||
.num_auto_selectable_formats = 1,
|
||||
};
|
||||
|
||||
#define AK4613_PCM_RATE (SNDRV_PCM_RATE_32000 |\
|
||||
|
|
|
|||
|
|
@ -580,12 +580,33 @@ static int hdmi_codec_mute(struct snd_soc_dai *dai, int mute, int direction)
|
|||
return -ENOTSUPP;
|
||||
}
|
||||
|
||||
/*
|
||||
* This driver can select all SND_SOC_DAIFMT_CBx_CFx,
|
||||
* but need to be selected from Sound Card, not be auto selected.
|
||||
* Because it might be used from other driver.
|
||||
* For example,
|
||||
* ${LINUX}/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
||||
*/
|
||||
static u64 hdmi_codec_formats =
|
||||
SND_SOC_POSSIBLE_DAIFMT_NB_NF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_NB_IF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_IB_NF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_IB_IF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_I2S |
|
||||
SND_SOC_POSSIBLE_DAIFMT_DSP_A |
|
||||
SND_SOC_POSSIBLE_DAIFMT_DSP_B |
|
||||
SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |
|
||||
SND_SOC_POSSIBLE_DAIFMT_LEFT_J |
|
||||
SND_SOC_POSSIBLE_DAIFMT_AC97;
|
||||
|
||||
static const struct snd_soc_dai_ops hdmi_codec_i2s_dai_ops = {
|
||||
.startup = hdmi_codec_startup,
|
||||
.shutdown = hdmi_codec_shutdown,
|
||||
.hw_params = hdmi_codec_hw_params,
|
||||
.set_fmt = hdmi_codec_i2s_set_fmt,
|
||||
.mute_stream = hdmi_codec_mute,
|
||||
.auto_selectable_formats = &hdmi_codec_formats,
|
||||
.num_auto_selectable_formats = 1,
|
||||
};
|
||||
|
||||
static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = {
|
||||
|
|
|
|||
|
|
@ -573,6 +573,30 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static u64 pcm3168a_dai_formats[] = {
|
||||
/*
|
||||
* Select below from Sound Card, not here
|
||||
* SND_SOC_DAIFMT_CBC_CFC
|
||||
* SND_SOC_DAIFMT_CBP_CFP
|
||||
*/
|
||||
|
||||
/*
|
||||
* First Priority
|
||||
*/
|
||||
SND_SOC_POSSIBLE_DAIFMT_I2S |
|
||||
SND_SOC_POSSIBLE_DAIFMT_LEFT_J,
|
||||
/*
|
||||
* Second Priority
|
||||
*
|
||||
* These have picky limitation.
|
||||
* see
|
||||
* pcm3168a_hw_params()
|
||||
*/
|
||||
SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |
|
||||
SND_SOC_POSSIBLE_DAIFMT_DSP_A |
|
||||
SND_SOC_POSSIBLE_DAIFMT_DSP_B,
|
||||
};
|
||||
|
||||
static const struct snd_soc_dai_ops pcm3168a_dai_ops = {
|
||||
.set_fmt = pcm3168a_set_dai_fmt,
|
||||
.set_sysclk = pcm3168a_set_dai_sysclk,
|
||||
|
|
@ -580,6 +604,8 @@ static const struct snd_soc_dai_ops pcm3168a_dai_ops = {
|
|||
.mute_stream = pcm3168a_mute,
|
||||
.set_tdm_slot = pcm3168a_set_tdm_slot,
|
||||
.no_capture_mute = 1,
|
||||
.auto_selectable_formats = pcm3168a_dai_formats,
|
||||
.num_auto_selectable_formats = ARRAY_SIZE(pcm3168a_dai_formats),
|
||||
};
|
||||
|
||||
static struct snd_soc_dai_driver pcm3168a_dais[] = {
|
||||
|
|
|
|||
|
|
@ -1694,12 +1694,27 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Select below from Sound Card, not auto
|
||||
* SND_SOC_DAIFMT_CBC_CFC
|
||||
* SND_SOC_DAIFMT_CBP_CFP
|
||||
*/
|
||||
static u64 fsi_dai_formats =
|
||||
SND_SOC_POSSIBLE_DAIFMT_I2S |
|
||||
SND_SOC_POSSIBLE_DAIFMT_LEFT_J |
|
||||
SND_SOC_POSSIBLE_DAIFMT_NB_NF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_NB_IF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_IB_NF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_IB_IF;
|
||||
|
||||
static const struct snd_soc_dai_ops fsi_dai_ops = {
|
||||
.startup = fsi_dai_startup,
|
||||
.shutdown = fsi_dai_shutdown,
|
||||
.trigger = fsi_dai_trigger,
|
||||
.set_fmt = fsi_dai_set_fmt,
|
||||
.hw_params = fsi_dai_hw_params,
|
||||
.auto_selectable_formats = &fsi_dai_formats,
|
||||
.num_auto_selectable_formats = 1,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -756,10 +756,10 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|||
|
||||
/* set clock master for audio interface */
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBM_CFM:
|
||||
case SND_SOC_DAIFMT_CBP_CFP:
|
||||
rdai->clk_master = 0;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFS:
|
||||
case SND_SOC_DAIFMT_CBC_CFC:
|
||||
rdai->clk_master = 1; /* cpu is master */
|
||||
break;
|
||||
default:
|
||||
|
|
@ -1039,6 +1039,31 @@ static int rsnd_soc_dai_prepare(struct snd_pcm_substream *substream,
|
|||
return rsnd_dai_call(prepare, io, priv);
|
||||
}
|
||||
|
||||
static u64 rsnd_soc_dai_formats[] = {
|
||||
/*
|
||||
* 1st Priority
|
||||
*
|
||||
* Well tested formats.
|
||||
* Select below from Sound Card, not auto
|
||||
* SND_SOC_DAIFMT_CBC_CFC
|
||||
* SND_SOC_DAIFMT_CBP_CFP
|
||||
*/
|
||||
SND_SOC_POSSIBLE_DAIFMT_I2S |
|
||||
SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |
|
||||
SND_SOC_POSSIBLE_DAIFMT_LEFT_J |
|
||||
SND_SOC_POSSIBLE_DAIFMT_NB_NF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_NB_IF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_IB_NF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_IB_IF,
|
||||
/*
|
||||
* 2nd Priority
|
||||
*
|
||||
* Supported, but not well tested
|
||||
*/
|
||||
SND_SOC_POSSIBLE_DAIFMT_DSP_A |
|
||||
SND_SOC_POSSIBLE_DAIFMT_DSP_B,
|
||||
};
|
||||
|
||||
static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
|
||||
.startup = rsnd_soc_dai_startup,
|
||||
.shutdown = rsnd_soc_dai_shutdown,
|
||||
|
|
@ -1046,6 +1071,8 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
|
|||
.set_fmt = rsnd_soc_dai_set_fmt,
|
||||
.set_tdm_slot = rsnd_soc_set_dai_tdm_slot,
|
||||
.prepare = rsnd_soc_dai_prepare,
|
||||
.auto_selectable_formats = rsnd_soc_dai_formats,
|
||||
.num_auto_selectable_formats = ARRAY_SIZE(rsnd_soc_dai_formats),
|
||||
};
|
||||
|
||||
static void rsnd_parse_tdm_split_mode(struct rsnd_priv *priv,
|
||||
|
|
|
|||
|
|
@ -1054,6 +1054,231 @@ _err_defer:
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_add_pcm_runtime);
|
||||
|
||||
static void snd_soc_runtime_get_dai_fmt(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_dai_link *dai_link = rtd->dai_link;
|
||||
struct snd_soc_dai *dai, *not_used;
|
||||
struct device *dev = rtd->dev;
|
||||
u64 pos, possible_fmt;
|
||||
unsigned int mask = 0, dai_fmt = 0;
|
||||
int i, j, priority, pri, until;
|
||||
|
||||
/*
|
||||
* Get selectable format from each DAIs.
|
||||
*
|
||||
****************************
|
||||
* NOTE
|
||||
* Using .auto_selectable_formats is not mandatory,
|
||||
* we can select format manually from Sound Card.
|
||||
* When use it, driver should list well tested format only.
|
||||
****************************
|
||||
*
|
||||
* ex)
|
||||
* auto_selectable_formats (= SND_SOC_POSSIBLE_xxx)
|
||||
* (A) (B) (C)
|
||||
* DAI0_: { 0x000F, 0x00F0, 0x0F00 };
|
||||
* DAI1 : { 0xF000, 0x0F00 };
|
||||
* (X) (Y)
|
||||
*
|
||||
* "until" will be 3 in this case (MAX array size from DAI0 and DAI1)
|
||||
* Here is dev_dbg() message and comments
|
||||
*
|
||||
* priority = 1
|
||||
* DAI0: (pri, fmt) = (1, 000000000000000F) // 1st check (A) DAI1 is not selected
|
||||
* DAI1: (pri, fmt) = (0, 0000000000000000) // Necessary Waste
|
||||
* DAI0: (pri, fmt) = (1, 000000000000000F) // 2nd check (A)
|
||||
* DAI1: (pri, fmt) = (1, 000000000000F000) // (X)
|
||||
* priority = 2
|
||||
* DAI0: (pri, fmt) = (2, 00000000000000FF) // 3rd check (A) + (B)
|
||||
* DAI1: (pri, fmt) = (1, 000000000000F000) // (X)
|
||||
* DAI0: (pri, fmt) = (2, 00000000000000FF) // 4th check (A) + (B)
|
||||
* DAI1: (pri, fmt) = (2, 000000000000FF00) // (X) + (Y)
|
||||
* priority = 3
|
||||
* DAI0: (pri, fmt) = (3, 0000000000000FFF) // 5th check (A) + (B) + (C)
|
||||
* DAI1: (pri, fmt) = (2, 000000000000FF00) // (X) + (Y)
|
||||
* found auto selected format: 0000000000000F00
|
||||
*/
|
||||
until = snd_soc_dai_get_fmt_max_priority(rtd);
|
||||
for (priority = 1; priority <= until; priority++) {
|
||||
|
||||
dev_dbg(dev, "priority = %d\n", priority);
|
||||
for_each_rtd_dais(rtd, j, not_used) {
|
||||
|
||||
possible_fmt = ULLONG_MAX;
|
||||
for_each_rtd_dais(rtd, i, dai) {
|
||||
u64 fmt = 0;
|
||||
|
||||
pri = (j >= i) ? priority : priority - 1;
|
||||
fmt = snd_soc_dai_get_fmt(dai, pri);
|
||||
dev_dbg(dev, "%s: (pri, fmt) = (%d, %016llX)\n", dai->name, pri, fmt);
|
||||
possible_fmt &= fmt;
|
||||
}
|
||||
if (possible_fmt)
|
||||
goto found;
|
||||
}
|
||||
}
|
||||
/* Not Found */
|
||||
return;
|
||||
found:
|
||||
dev_dbg(dev, "found auto selected format: %016llX\n", possible_fmt);
|
||||
|
||||
/*
|
||||
* convert POSSIBLE_DAIFMT to DAIFMT
|
||||
*
|
||||
* Some basic/default settings on each is defined as 0.
|
||||
* see
|
||||
* SND_SOC_DAIFMT_NB_NF
|
||||
* SND_SOC_DAIFMT_GATED
|
||||
*
|
||||
* SND_SOC_DAIFMT_xxx_MASK can't notice it if Sound Card specify
|
||||
* these value, and will be overwrite to auto selected value.
|
||||
*
|
||||
* To avoid such issue, loop from 63 to 0 here.
|
||||
* Small number of SND_SOC_POSSIBLE_xxx will be Hi priority.
|
||||
* Basic/Default settings of each part and aboves are defined
|
||||
* as Hi priority (= small number) of SND_SOC_POSSIBLE_xxx.
|
||||
*/
|
||||
for (i = 63; i >= 0; i--) {
|
||||
pos = 1ULL << i;
|
||||
switch (possible_fmt & pos) {
|
||||
/*
|
||||
* for format
|
||||
*/
|
||||
case SND_SOC_POSSIBLE_DAIFMT_I2S:
|
||||
case SND_SOC_POSSIBLE_DAIFMT_RIGHT_J:
|
||||
case SND_SOC_POSSIBLE_DAIFMT_LEFT_J:
|
||||
case SND_SOC_POSSIBLE_DAIFMT_DSP_A:
|
||||
case SND_SOC_POSSIBLE_DAIFMT_DSP_B:
|
||||
case SND_SOC_POSSIBLE_DAIFMT_AC97:
|
||||
case SND_SOC_POSSIBLE_DAIFMT_PDM:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_FORMAT_MASK) | i;
|
||||
break;
|
||||
/*
|
||||
* for clock
|
||||
*/
|
||||
case SND_SOC_POSSIBLE_DAIFMT_CONT:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_MASK) | SND_SOC_DAIFMT_CONT;
|
||||
break;
|
||||
case SND_SOC_POSSIBLE_DAIFMT_GATED:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_MASK) | SND_SOC_DAIFMT_GATED;
|
||||
break;
|
||||
/*
|
||||
* for clock invert
|
||||
*/
|
||||
case SND_SOC_POSSIBLE_DAIFMT_NB_NF:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_INV_MASK) | SND_SOC_DAIFMT_NB_NF;
|
||||
break;
|
||||
case SND_SOC_POSSIBLE_DAIFMT_NB_IF:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_INV_MASK) | SND_SOC_DAIFMT_NB_IF;
|
||||
break;
|
||||
case SND_SOC_POSSIBLE_DAIFMT_IB_NF:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_INV_MASK) | SND_SOC_DAIFMT_IB_NF;
|
||||
break;
|
||||
case SND_SOC_POSSIBLE_DAIFMT_IB_IF:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_INV_MASK) | SND_SOC_DAIFMT_IB_IF;
|
||||
break;
|
||||
/*
|
||||
* for clock provider / consumer
|
||||
*/
|
||||
case SND_SOC_POSSIBLE_DAIFMT_CBP_CFP:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) | SND_SOC_DAIFMT_CBP_CFP;
|
||||
break;
|
||||
case SND_SOC_POSSIBLE_DAIFMT_CBC_CFP:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) | SND_SOC_DAIFMT_CBC_CFP;
|
||||
break;
|
||||
case SND_SOC_POSSIBLE_DAIFMT_CBP_CFC:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) | SND_SOC_DAIFMT_CBP_CFC;
|
||||
break;
|
||||
case SND_SOC_POSSIBLE_DAIFMT_CBC_CFC:
|
||||
dai_fmt = (dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) | SND_SOC_DAIFMT_CBC_CFC;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Some driver might have very complex limitation.
|
||||
* In such case, user want to auto-select non-limitation part,
|
||||
* and want to manually specify complex part.
|
||||
*
|
||||
* Or for example, if both CPU and Codec can be clock provider,
|
||||
* but because of its quality, user want to specify it manually.
|
||||
*
|
||||
* Use manually specified settings if sound card did.
|
||||
*/
|
||||
if (!(dai_link->dai_fmt & SND_SOC_DAIFMT_FORMAT_MASK))
|
||||
mask |= SND_SOC_DAIFMT_FORMAT_MASK;
|
||||
if (!(dai_link->dai_fmt & SND_SOC_DAIFMT_CLOCK_MASK))
|
||||
mask |= SND_SOC_DAIFMT_CLOCK_MASK;
|
||||
if (!(dai_link->dai_fmt & SND_SOC_DAIFMT_INV_MASK))
|
||||
mask |= SND_SOC_DAIFMT_INV_MASK;
|
||||
if (!(dai_link->dai_fmt & SND_SOC_DAIFMT_MASTER_MASK))
|
||||
mask |= SND_SOC_DAIFMT_MASTER_MASK;
|
||||
|
||||
dai_link->dai_fmt |= (dai_fmt & mask);
|
||||
}
|
||||
|
||||
/**
|
||||
* snd_soc_runtime_set_dai_fmt() - Change DAI link format for a ASoC runtime
|
||||
* @rtd: The runtime for which the DAI link format should be changed
|
||||
* @dai_fmt: The new DAI link format
|
||||
*
|
||||
* This function updates the DAI link format for all DAIs connected to the DAI
|
||||
* link for the specified runtime.
|
||||
*
|
||||
* Note: For setups with a static format set the dai_fmt field in the
|
||||
* corresponding snd_dai_link struct instead of using this function.
|
||||
*
|
||||
* Returns 0 on success, otherwise a negative error code.
|
||||
*/
|
||||
int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
|
||||
unsigned int dai_fmt)
|
||||
{
|
||||
struct snd_soc_dai *cpu_dai;
|
||||
struct snd_soc_dai *codec_dai;
|
||||
unsigned int inv_dai_fmt;
|
||||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
for_each_rtd_codec_dais(rtd, i, codec_dai) {
|
||||
ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
|
||||
if (ret != 0 && ret != -ENOTSUPP)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Flip the polarity for the "CPU" end of a CODEC<->CODEC link
|
||||
* the component which has non_legacy_dai_naming is Codec
|
||||
*/
|
||||
inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;
|
||||
switch (dai_fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBM_CFM:
|
||||
inv_dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBM_CFS:
|
||||
inv_dai_fmt |= SND_SOC_DAIFMT_CBS_CFM;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFM:
|
||||
inv_dai_fmt |= SND_SOC_DAIFMT_CBM_CFS;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFS:
|
||||
inv_dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
|
||||
break;
|
||||
}
|
||||
for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
|
||||
unsigned int fmt = dai_fmt;
|
||||
|
||||
if (cpu_dai->component->driver->non_legacy_dai_naming)
|
||||
fmt = inv_dai_fmt;
|
||||
|
||||
ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
|
||||
if (ret != 0 && ret != -ENOTSUPP)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);
|
||||
|
||||
static int soc_init_pcm_runtime(struct snd_soc_card *card,
|
||||
struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
|
|
@ -1070,6 +1295,7 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,
|
|||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
snd_soc_runtime_get_dai_fmt(rtd);
|
||||
if (dai_link->dai_fmt) {
|
||||
ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);
|
||||
if (ret)
|
||||
|
|
@ -1402,68 +1628,6 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* snd_soc_runtime_set_dai_fmt() - Change DAI link format for a ASoC runtime
|
||||
* @rtd: The runtime for which the DAI link format should be changed
|
||||
* @dai_fmt: The new DAI link format
|
||||
*
|
||||
* This function updates the DAI link format for all DAIs connected to the DAI
|
||||
* link for the specified runtime.
|
||||
*
|
||||
* Note: For setups with a static format set the dai_fmt field in the
|
||||
* corresponding snd_dai_link struct instead of using this function.
|
||||
*
|
||||
* Returns 0 on success, otherwise a negative error code.
|
||||
*/
|
||||
int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
|
||||
unsigned int dai_fmt)
|
||||
{
|
||||
struct snd_soc_dai *cpu_dai;
|
||||
struct snd_soc_dai *codec_dai;
|
||||
unsigned int inv_dai_fmt;
|
||||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
for_each_rtd_codec_dais(rtd, i, codec_dai) {
|
||||
ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
|
||||
if (ret != 0 && ret != -ENOTSUPP)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Flip the polarity for the "CPU" end of a CODEC<->CODEC link
|
||||
* the component which has non_legacy_dai_naming is Codec
|
||||
*/
|
||||
inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;
|
||||
switch (dai_fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBM_CFM:
|
||||
inv_dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBM_CFS:
|
||||
inv_dai_fmt |= SND_SOC_DAIFMT_CBS_CFM;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFM:
|
||||
inv_dai_fmt |= SND_SOC_DAIFMT_CBM_CFS;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFS:
|
||||
inv_dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
|
||||
break;
|
||||
}
|
||||
for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
|
||||
unsigned int fmt = dai_fmt;
|
||||
|
||||
if (cpu_dai->component->driver->non_legacy_dai_naming)
|
||||
fmt = inv_dai_fmt;
|
||||
|
||||
ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
|
||||
if (ret != 0 && ret != -ENOTSUPP)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);
|
||||
|
||||
#ifdef CONFIG_DMI
|
||||
/*
|
||||
* If a DMI filed contain strings in this blacklist (e.g.
|
||||
|
|
|
|||
|
|
@ -134,6 +134,69 @@ int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio);
|
||||
|
||||
int snd_soc_dai_get_fmt_max_priority(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_dai *dai;
|
||||
int i, max = 0;
|
||||
|
||||
/*
|
||||
* return max num if *ALL* DAIs have .auto_selectable_formats
|
||||
*/
|
||||
for_each_rtd_dais(rtd, i, dai) {
|
||||
if (dai->driver->ops &&
|
||||
dai->driver->ops->num_auto_selectable_formats)
|
||||
max = max(max, dai->driver->ops->num_auto_selectable_formats);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
return max;
|
||||
}
|
||||
|
||||
/**
|
||||
* snd_soc_dai_get_fmt - get supported audio format.
|
||||
* @dai: DAI
|
||||
* @priority: priority level of supported audio format.
|
||||
*
|
||||
* This should return only formats implemented with high
|
||||
* quality by the DAI so that the core can configure a
|
||||
* format which will work well with other devices.
|
||||
* For example devices which don't support both edges of the
|
||||
* LRCLK signal in I2S style formats should only list DSP
|
||||
* modes. This will mean that sometimes fewer formats
|
||||
* are reported here than are supported by set_fmt().
|
||||
*/
|
||||
u64 snd_soc_dai_get_fmt(struct snd_soc_dai *dai, int priority)
|
||||
{
|
||||
const struct snd_soc_dai_ops *ops = dai->driver->ops;
|
||||
u64 fmt = 0;
|
||||
int i, max = 0, until = priority;
|
||||
|
||||
/*
|
||||
* Collect auto_selectable_formats until priority
|
||||
*
|
||||
* ex)
|
||||
* auto_selectable_formats[] = { A, B, C };
|
||||
* (A, B, C = SND_SOC_POSSIBLE_DAIFMT_xxx)
|
||||
*
|
||||
* priority = 1 : A
|
||||
* priority = 2 : A | B
|
||||
* priority = 3 : A | B | C
|
||||
* priority = 4 : A | B | C
|
||||
* ...
|
||||
*/
|
||||
if (ops)
|
||||
max = ops->num_auto_selectable_formats;
|
||||
|
||||
if (max < until)
|
||||
until = max;
|
||||
|
||||
for (i = 0; i < until; i++)
|
||||
fmt |= ops->auto_selectable_formats[i];
|
||||
|
||||
return fmt;
|
||||
}
|
||||
|
||||
/**
|
||||
* snd_soc_dai_set_fmt - configure DAI hardware audio format.
|
||||
* @dai: DAI
|
||||
|
|
|
|||
|
|
@ -97,6 +97,34 @@ static const struct snd_soc_component_driver dummy_codec = {
|
|||
SNDRV_PCM_FMTBIT_S32_LE | \
|
||||
SNDRV_PCM_FMTBIT_U32_LE | \
|
||||
SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
|
||||
|
||||
/*
|
||||
* Select these from Sound Card Manually
|
||||
* SND_SOC_POSSIBLE_DAIFMT_CBP_CFP
|
||||
* SND_SOC_POSSIBLE_DAIFMT_CBP_CFC
|
||||
* SND_SOC_POSSIBLE_DAIFMT_CBC_CFP
|
||||
* SND_SOC_POSSIBLE_DAIFMT_CBC_CFC
|
||||
*/
|
||||
static u64 dummy_dai_formats =
|
||||
SND_SOC_POSSIBLE_DAIFMT_I2S |
|
||||
SND_SOC_POSSIBLE_DAIFMT_RIGHT_J |
|
||||
SND_SOC_POSSIBLE_DAIFMT_LEFT_J |
|
||||
SND_SOC_POSSIBLE_DAIFMT_DSP_A |
|
||||
SND_SOC_POSSIBLE_DAIFMT_DSP_B |
|
||||
SND_SOC_POSSIBLE_DAIFMT_AC97 |
|
||||
SND_SOC_POSSIBLE_DAIFMT_PDM |
|
||||
SND_SOC_POSSIBLE_DAIFMT_GATED |
|
||||
SND_SOC_POSSIBLE_DAIFMT_CONT |
|
||||
SND_SOC_POSSIBLE_DAIFMT_NB_NF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_NB_IF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_IB_NF |
|
||||
SND_SOC_POSSIBLE_DAIFMT_IB_IF;
|
||||
|
||||
static const struct snd_soc_dai_ops dummy_dai_ops = {
|
||||
.auto_selectable_formats = &dummy_dai_formats,
|
||||
.num_auto_selectable_formats = 1,
|
||||
};
|
||||
|
||||
/*
|
||||
* The dummy CODEC is only meant to be used in situations where there is no
|
||||
* actual hardware.
|
||||
|
|
@ -122,6 +150,7 @@ static struct snd_soc_dai_driver dummy_dai = {
|
|||
.rates = STUB_RATES,
|
||||
.formats = STUB_FORMATS,
|
||||
},
|
||||
.ops = &dummy_dai_ops,
|
||||
};
|
||||
|
||||
int snd_soc_dai_is_dummy(struct snd_soc_dai *dai)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче