Skip to content

L
linux
Commit 9fe0c012 authored by Mark Brown's avatar Mark Brown
Browse files
Options

ASoC: pcm3168a: code cleanup 

Merge series from Nikita Yushchenko <nikita.yoush@cogentembedded.com>:

These patches clean up pcm3168a driver, without introducing any
functional change.
parents 3c7a4c24 3e63d3c1
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 80 deletions
sound/soc/codecs/pcm3168a.c
View file @ 9fe0c012
...@@ -33,10 +33,8 @@ ...@@ -33,10 +33,8 @@
#define PCM3168A_FMT_DSP_B 0x5 #define PCM3168A_FMT_DSP_B 0x5
#define PCM3168A_FMT_I2S_TDM 0x6 #define PCM3168A_FMT_I2S_TDM 0x6
#define PCM3168A_FMT_LEFT_J_TDM 0x7 #define PCM3168A_FMT_LEFT_J_TDM 0x7
#define PCM3168A_FMT_DSP_MASK 0x4
#define PCM3168A_NUM_SUPPLIES 6 static const char *const pcm3168a_supply_names[] = {
static const char *const pcm3168a_supply_names[PCM3168A_NUM_SUPPLIES] = {
"VDD1", "VDD1",
"VDD2", "VDD2",
"VCCAD1", "VCCAD1",
...@@ -51,14 +49,14 @@ static const char *const pcm3168a_supply_names[PCM3168A_NUM_SUPPLIES] = { ...@@ -51,14 +49,14 @@ static const char *const pcm3168a_supply_names[PCM3168A_NUM_SUPPLIES] = {
/* ADC/DAC side parameters */ /* ADC/DAC side parameters */
struct pcm3168a_io_params { struct pcm3168a_io_params {
bool master_mode; bool master_mode;
unsigned int fmt; unsigned int format;
int tdm_slots; int tdm_slots;
u32 tdm_mask; u32 tdm_mask;
int slot_width; int slot_width;
}; };
struct pcm3168a_priv { struct pcm3168a_priv {
struct regulator_bulk_data supplies[PCM3168A_NUM_SUPPLIES]; struct regulator_bulk_data supplies[ARRAY_SIZE(pcm3168a_supply_names)];
struct regmap *regmap; struct regmap *regmap;
struct clk *scki; struct clk *scki;
struct gpio_desc *gpio_rst; struct gpio_desc *gpio_rst;
...@@ -329,10 +327,11 @@ static void pcm3168a_update_fixup_pcm_stream(struct snd_soc_dai *dai) ...@@ -329,10 +327,11 @@ static void pcm3168a_update_fixup_pcm_stream(struct snd_soc_dai *dai)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(component); struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(component);
struct pcm3168a_io_params *io_params = &pcm3168a->io_params[dai->id];
u64 formats = SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_LE; u64 formats = SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_LE;
unsigned int channel_max = dai->id == PCM3168A_DAI_DAC ? 8 : 6; unsigned int channel_max = dai->id == PCM3168A_DAI_DAC ? 8 : 6;
if (pcm3168a->io_params[dai->id].fmt == PCM3168A_FMT_RIGHT_J) { if (io_params->format == SND_SOC_DAIFMT_RIGHT_J) {
/* S16_LE is only supported in RIGHT_J mode */ /* S16_LE is only supported in RIGHT_J mode */
formats |= SNDRV_PCM_FMTBIT_S16_LE; formats |= SNDRV_PCM_FMTBIT_S16_LE;
...@@ -340,7 +339,7 @@ static void pcm3168a_update_fixup_pcm_stream(struct snd_soc_dai *dai) ...@@ -340,7 +339,7 @@ static void pcm3168a_update_fixup_pcm_stream(struct snd_soc_dai *dai)
* If multi DIN/DOUT is not selected, RIGHT_J can only support * If multi DIN/DOUT is not selected, RIGHT_J can only support
* two channels (no TDM support) * two channels (no TDM support)
*/ */
if (pcm3168a->io_params[dai->id].tdm_slots != 2) if (io_params->tdm_slots != 2)
channel_max = 2; channel_max = 2;
} }
...@@ -357,24 +356,15 @@ static int pcm3168a_set_dai_fmt(struct snd_soc_dai *dai, unsigned int format) ...@@ -357,24 +356,15 @@ static int pcm3168a_set_dai_fmt(struct snd_soc_dai *dai, unsigned int format)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(component); struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(component);
u32 fmt, reg, mask, shift; struct pcm3168a_io_params *io_params = &pcm3168a->io_params[dai->id];
bool master_mode; bool master_mode;
switch (format & SND_SOC_DAIFMT_FORMAT_MASK) { switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_LEFT_J: case SND_SOC_DAIFMT_LEFT_J:
fmt = PCM3168A_FMT_LEFT_J;
break;
case SND_SOC_DAIFMT_I2S: case SND_SOC_DAIFMT_I2S:
fmt = PCM3168A_FMT_I2S;
break;
case SND_SOC_DAIFMT_RIGHT_J: case SND_SOC_DAIFMT_RIGHT_J:
fmt = PCM3168A_FMT_RIGHT_J;
break;
case SND_SOC_DAIFMT_DSP_A: case SND_SOC_DAIFMT_DSP_A:
fmt = PCM3168A_FMT_DSP_A;
break;
case SND_SOC_DAIFMT_DSP_B: case SND_SOC_DAIFMT_DSP_B:
fmt = PCM3168A_FMT_DSP_B;
break; break;
default: default:
dev_err(component->dev, "unsupported dai format\n"); dev_err(component->dev, "unsupported dai format\n");
...@@ -400,20 +390,8 @@ static int pcm3168a_set_dai_fmt(struct snd_soc_dai *dai, unsigned int format) ...@@ -400,20 +390,8 @@ static int pcm3168a_set_dai_fmt(struct snd_soc_dai *dai, unsigned int format)
return -EINVAL; return -EINVAL;
} }
if (dai->id == PCM3168A_DAI_DAC) { io_params->master_mode = master_mode;
reg = PCM3168A_DAC_PWR_MST_FMT; io_params->format = format & SND_SOC_DAIFMT_FORMAT_MASK;
mask = PCM3168A_DAC_FMT_MASK;
shift = PCM3168A_DAC_FMT_SHIFT;
} else {
reg = PCM3168A_ADC_MST_FMT;
mask = PCM3168A_ADC_FMTAD_MASK;
shift = PCM3168A_ADC_FMTAD_SHIFT;
}
pcm3168a->io_params[dai->id].master_mode = master_mode;
pcm3168a->io_params[dai->id].fmt = fmt;
regmap_update_bits(pcm3168a->regmap, reg, mask, fmt << shift);
pcm3168a_update_fixup_pcm_stream(dai); pcm3168a_update_fixup_pcm_stream(dai);
...@@ -462,41 +440,47 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, ...@@ -462,41 +440,47 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(component); struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(component);
struct pcm3168a_io_params *io_params = &pcm3168a->io_params[dai->id]; struct pcm3168a_io_params *io_params = &pcm3168a->io_params[dai->id];
bool master_mode; bool master_mode, tdm_mode;
u32 val, mask, shift, reg; unsigned int format;
unsigned int rate, fmt, ratio, max_ratio; unsigned int reg, mask, ms, ms_shift, fmt, fmt_shift, ratio, tdm_slots;
unsigned int tdm_slots; int i, num_scki_ratios, slot_width;
int i, slot_width;
rate = params_rate(params);
ratio = pcm3168a->sysclk / rate;
if (dai->id == PCM3168A_DAI_DAC) { if (dai->id == PCM3168A_DAI_DAC) {
max_ratio = PCM3168A_NUM_SCKI_RATIOS_DAC; num_scki_ratios = PCM3168A_NUM_SCKI_RATIOS_DAC;
reg = PCM3168A_DAC_PWR_MST_FMT; reg = PCM3168A_DAC_PWR_MST_FMT;
mask = PCM3168A_DAC_MSDA_MASK; mask = PCM3168A_DAC_MSDA_MASK | PCM3168A_DAC_FMT_MASK;
shift = PCM3168A_DAC_MSDA_SHIFT; ms_shift = PCM3168A_DAC_MSDA_SHIFT;
fmt_shift = PCM3168A_DAC_FMT_SHIFT;
} else { } else {
max_ratio = PCM3168A_NUM_SCKI_RATIOS_ADC; num_scki_ratios = PCM3168A_NUM_SCKI_RATIOS_ADC;
reg = PCM3168A_ADC_MST_FMT; reg = PCM3168A_ADC_MST_FMT;
mask = PCM3168A_ADC_MSAD_MASK; mask = PCM3168A_ADC_MSAD_MASK | PCM3168A_ADC_FMTAD_MASK;
shift = PCM3168A_ADC_MSAD_SHIFT; ms_shift = PCM3168A_ADC_MSAD_SHIFT;
fmt_shift = PCM3168A_ADC_FMTAD_SHIFT;
} }
master_mode = io_params->master_mode; master_mode = io_params->master_mode;
fmt = io_params->fmt;
for (i = 0; i < max_ratio; i++) { if (master_mode) {
if (pcm3168a_scki_ratios[i] == ratio) ratio = pcm3168a->sysclk / params_rate(params);
break;
}
if (i == max_ratio) { for (i = 0; i < num_scki_ratios; i++) {
dev_err(component->dev, "unsupported sysclk ratio\n"); if (pcm3168a_scki_ratios[i] == ratio)
return -EINVAL; break;
}
if (i == num_scki_ratios) {
dev_err(component->dev, "unsupported sysclk ratio\n");
return -EINVAL;
}
ms = (i + 1);
} else {
ms = 0;
} }
format = io_params->format;
if (io_params->slot_width) if (io_params->slot_width)
slot_width = io_params->slot_width; slot_width = io_params->slot_width;
else else
...@@ -504,14 +488,14 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, ...@@ -504,14 +488,14 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream,
switch (slot_width) { switch (slot_width) {
case 16: case 16:
if (master_mode || (fmt != PCM3168A_FMT_RIGHT_J)) { if (master_mode || (format != SND_SOC_DAIFMT_RIGHT_J)) {
dev_err(component->dev, "16-bit slots are supported only for slave mode using right justified\n"); dev_err(component->dev, "16-bit slots are supported only for slave mode using right justified\n");
return -EINVAL; return -EINVAL;
} }
fmt = PCM3168A_FMT_RIGHT_J_16;
break; break;
case 24: case 24:
if (master_mode || (fmt & PCM3168A_FMT_DSP_MASK)) { if (master_mode || (format == SND_SOC_DAIFMT_DSP_A) ||
(format == SND_SOC_DAIFMT_DSP_B)) {
dev_err(component->dev, "24-bit slots not supported in master mode, or slave mode using DSP\n"); dev_err(component->dev, "24-bit slots not supported in master mode, or slave mode using DSP\n");
return -EINVAL; return -EINVAL;
} }
...@@ -536,15 +520,14 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, ...@@ -536,15 +520,14 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream,
* If pcm3168a->tdm_slots is set to 2 then DIN1/2/3/4 and DOUT1/2/3 is * If pcm3168a->tdm_slots is set to 2 then DIN1/2/3/4 and DOUT1/2/3 is
* used in normal mode, no need to switch to TDM modes. * used in normal mode, no need to switch to TDM modes.
*/ */
if (tdm_slots > 2) { tdm_mode = (tdm_slots > 2);
switch (fmt) {
case PCM3168A_FMT_I2S: if (tdm_mode) {
case PCM3168A_FMT_DSP_A: switch (format) {
fmt = PCM3168A_FMT_I2S_TDM; case SND_SOC_DAIFMT_I2S:
break; case SND_SOC_DAIFMT_DSP_A:
case PCM3168A_FMT_LEFT_J: case SND_SOC_DAIFMT_LEFT_J:
case PCM3168A_FMT_DSP_B: case SND_SOC_DAIFMT_DSP_B:
fmt = PCM3168A_FMT_LEFT_J_TDM;
break; break;
default: default:
dev_err(component->dev, dev_err(component->dev,
...@@ -553,22 +536,29 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, ...@@ -553,22 +536,29 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream,
} }
} }
if (master_mode) switch (format) {
val = ((i + 1) << shift); case SND_SOC_DAIFMT_I2S:
else fmt = tdm_mode ? PCM3168A_FMT_I2S_TDM : PCM3168A_FMT_I2S;
val = 0; break;
case SND_SOC_DAIFMT_LEFT_J:
regmap_update_bits(pcm3168a->regmap, reg, mask, val); fmt = tdm_mode ? PCM3168A_FMT_LEFT_J_TDM : PCM3168A_FMT_LEFT_J;
break;
if (dai->id == PCM3168A_DAI_DAC) { case SND_SOC_DAIFMT_RIGHT_J:
mask = PCM3168A_DAC_FMT_MASK; fmt = (slot_width == 16) ? PCM3168A_FMT_RIGHT_J_16 :
shift = PCM3168A_DAC_FMT_SHIFT; PCM3168A_FMT_RIGHT_J;
} else { break;
mask = PCM3168A_ADC_FMTAD_MASK; case SND_SOC_DAIFMT_DSP_A:
shift = PCM3168A_ADC_FMTAD_SHIFT; fmt = tdm_mode ? PCM3168A_FMT_I2S_TDM : PCM3168A_FMT_DSP_A;
break;
case SND_SOC_DAIFMT_DSP_B:
fmt = tdm_mode ? PCM3168A_FMT_LEFT_J_TDM : PCM3168A_FMT_DSP_B;
break;
default:
return -EINVAL;
} }
regmap_update_bits(pcm3168a->regmap, reg, mask, fmt << shift); regmap_update_bits(pcm3168a->regmap, reg, mask,
(ms << ms_shift) | (fmt << fmt_shift));
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7