Skip to content

Commit

Permalink
Merge series "ASoC: sync parameter naming : rate / sample_bits" from …
Browse files Browse the repository at this point in the history 
…Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

Hi Mark

snd_pcm_runtime / snd_soc_dai / snd_soc_dai_driver / snd_soc_dai_link
have related parameter which is similar but not same naming.

	struct snd_pcm_runtime {
		...
(A)		unsigned int rate;
		...
(B)		unsigned int sample_bits;
		...
	};

	struct snd_soc_dai {
		...
(A)		unsigned int rate;
(B)		unsigned int sample_bits;
		...
	};

	struct snd_soc_dai_driver {
		...
(A)		unsigned int symmetric_rates:1;
(B)		unsigned int symmetric_samplebits:1;
		...
	};

	struct snd_soc_dai_link {
		...
(A)		unsigned int symmetric_rates:1;
(B)		unsigned int symmetric_samplebits:1;
		...
	};

Because it is similar but not same naming rule,
code can be verbose / can't share macro.

This patch-set sync naming rule
to struct snd_pcm_runtime base.

	- xxx_rates;
	+ xxx_rate;

	- xxx_samplebits;
	+ xxx_sample_bits;

Kuninori Morimoto (44):
  ASoC: soc-pcm: revert soc_pcm_apply_symmetry()
  ASoC: sync parameter naming : rate / sample_bits
  ASoC: adi: sync parameter naming (rate/sample_bits)
  ASoC: atmel: sync parameter naming (rate/sample_bits)
  ASoC: au1x: sync parameter naming (rate/sample_bits)
  ASoC: bcm: sync parameter naming (rate/sample_bits)
  ASoC: cirrus: sync parameter naming (rate/sample_bits)
  ASoC: tegra: sync parameter naming (rate/sample_bits)
  ASoC: rockchip: sync parameter naming (rate/sample_bits)
  ASoC: samsung: sync parameter naming (rate/sample_bits)
  ASoC: sh: sync parameter naming (rate/sample_bits)
  ASoC: ti: sync parameter naming (rate/sample_bits)
  ASoC: pxa: sync parameter naming (rate/sample_bits)
  ASoC: mediatek: sync parameter naming (rate/sample_bits)
  ASoC: fsl: sync parameter naming (rate/sample_bits)
  ASoC: wm*: sync parameter naming (rate/sample_bits)
  ASoC: tlv*: sync parameter naming (rate/sample_bits)
  ASoC: rt*: sync parameter naming (rate/sample_bits)
  ASoC: nau*: sync parameter naming (rate/sample_bits)
  ASoC: tas*: sync parameter naming (rate/sample_bits)
  ASoC: da*: sync parameter naming (rate/sample_bits)
  ASoC: es*: sync parameter naming (rate/sample_bits)
  ASoC: max*: sync parameter naming (rate/sample_bits)
  ASoC: cs*: sync parameter naming (rate/sample_bits)
  ASoC: tscs*: sync parameter naming (rate/sample_bits)
  ASoC: ak*: sync parameter naming (rate/sample_bits)
  ASoC: adau*: sync parameter naming (rate/sample_bits)
  ASoC: jz4740: sync parameter naming (rate/sample_bits)
  ASoC: sunxi: sync parameter naming (rate/sample_bits)
  ASoC: zl38060: sync parameter naming (rate/sample_bits)
  ASoC: ssm2602: sync parameter naming (rate/sample_bits)
  ASoC: sgtl5000: sync parameter naming (rate/sample_bits)
  ASoC: mc13783: sync parameter naming (rate/sample_bits)
  ASoC: mt6660: sync parameter naming (rate/sample_bits)
  ASoC: lochnagar-sc: sync parameter naming (rate/sample_bits)
  ASoC: ab8500: sync parameter naming (rate/sample_bits)
  ASoC: alc5632: sync parameter naming (rate/sample_bits)
  ASoC: cx2072x: sync parameter naming (rate/sample_bits)
  ASoC: inno_rk3036: sync parameter naming (rate/sample_bits)
  ASoC: lm49453: sync parameter naming (rate/sample_bits)
  ASoC: ml26124: sync parameter naming (rate/sample_bits)
  ASoC: soc-dai.h: remove symmetric_rates/samplebits
  ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry()
  ASoC: soc-pcm: cleanup soc_pcm_params_symmetry()

 include/sound/soc-dai.h                    |  4 +-
 include/sound/soc.h                        |  4 +-
 sound/soc/adi/axi-i2s.c                    |  2 +-
 sound/soc/atmel/atmel-i2s.c                |  2 +-
 sound/soc/atmel/mchp-i2s-mcc.c             |  4 +-
 sound/soc/au1x/i2sc.c                      |  2 +-
 sound/soc/bcm/bcm2835-i2s.c                |  4 +-
 sound/soc/bcm/bcm63xx-i2s-whistler.c       |  2 +-
 sound/soc/cirrus/ep93xx-i2s.c              |  2 +-
 sound/soc/codecs/ab8500-codec.c            |  4 +-
 sound/soc/codecs/adau1372.c                |  2 +-
 sound/soc/codecs/adau1373.c                |  6 +-
 sound/soc/codecs/adau1701.c                |  2 +-
 sound/soc/codecs/ak4554.c                  |  2 +-
 sound/soc/codecs/ak4613.c                  |  2 +-
 sound/soc/codecs/ak4641.c                  |  4 +-
 sound/soc/codecs/ak4642.c                  |  2 +-
 sound/soc/codecs/alc5632.c                 |  2 +-
 sound/soc/codecs/cs35l32.c                 |  2 +-
 sound/soc/codecs/cs35l33.c                 |  2 +-
 sound/soc/codecs/cs35l34.c                 |  2 +-
 sound/soc/codecs/cs35l35.c                 |  2 +-
 sound/soc/codecs/cs35l36.c                 |  2 +-
 sound/soc/codecs/cs4234.c                  |  2 +-
 sound/soc/codecs/cs4271.c                  |  2 +-
 sound/soc/codecs/cs42l73.c                 |  6 +-
 sound/soc/codecs/cs43130.c                 |  6 +-
 sound/soc/codecs/cs4341.c                  |  2 +-
 sound/soc/codecs/cs4349.c                  |  2 +-
 sound/soc/codecs/cs47l15.c                 | 12 ++--
 sound/soc/codecs/cs47l24.c                 | 12 ++--
 sound/soc/codecs/cs47l35.c                 | 12 ++--
 sound/soc/codecs/cs47l85.c                 | 16 ++---
 sound/soc/codecs/cs47l90.c                 | 16 ++---
 sound/soc/codecs/cs47l92.c                 | 12 ++--
 sound/soc/codecs/cs53l30.c                 |  2 +-
 sound/soc/codecs/cx2072x.c                 |  2 +-
 sound/soc/codecs/da7210.c                  |  2 +-
 sound/soc/codecs/da7213.c                  |  2 +-
 sound/soc/codecs/da7218.c                  |  4 +-
 sound/soc/codecs/da7219.c                  |  4 +-
 sound/soc/codecs/da9055.c                  |  2 +-
 sound/soc/codecs/es8316.c                  |  2 +-
 sound/soc/codecs/es8328.c                  |  2 +-
 sound/soc/codecs/inno_rk3036.c             |  2 +-
 sound/soc/codecs/jz4740.c                  |  2 +-
 sound/soc/codecs/lm49453.c                 |  2 +-
 sound/soc/codecs/lochnagar-sc.c            | 12 ++--
 sound/soc/codecs/max9860.c                 |  2 +-
 sound/soc/codecs/max9867.c                 |  2 +-
 sound/soc/codecs/mc13783.c                 |  2 +-
 sound/soc/codecs/ml26124.c                 |  2 +-
 sound/soc/codecs/mt6660.c                  |  4 +-
 sound/soc/codecs/nau8810.c                 |  2 +-
 sound/soc/codecs/nau8822.c                 |  2 +-
 sound/soc/codecs/rt274.c                   |  2 +-
 sound/soc/codecs/rt286.c                   |  4 +-
 sound/soc/codecs/rt298.c                   |  4 +-
 sound/soc/codecs/rt5670.c                  |  4 +-
 sound/soc/codecs/sgtl5000.c                |  2 +-
 sound/soc/codecs/ssm2602.c                 |  4 +-
 sound/soc/codecs/tas2764.c                 |  2 +-
 sound/soc/codecs/tas2770.c                 |  2 +-
 sound/soc/codecs/tlv320adcx140.c           |  2 +-
 sound/soc/codecs/tlv320aic31xx.c           |  4 +-
 sound/soc/codecs/tlv320aic32x4.c           |  2 +-
 sound/soc/codecs/tlv320aic3x.c             |  2 +-
 sound/soc/codecs/tscs42xx.c                |  4 +-
 sound/soc/codecs/tscs454.c                 | 12 ++--
 sound/soc/codecs/wm5102.c                  | 12 ++--
 sound/soc/codecs/wm5110.c                  | 12 ++--
 sound/soc/codecs/wm8510.c                  |  2 +-
 sound/soc/codecs/wm8731.c                  |  2 +-
 sound/soc/codecs/wm8770.c                  |  2 +-
 sound/soc/codecs/wm8804.c                  |  2 +-
 sound/soc/codecs/wm8903.c                  |  2 +-
 sound/soc/codecs/wm8904.c                  |  2 +-
 sound/soc/codecs/wm8940.c                  |  2 +-
 sound/soc/codecs/wm8960.c                  |  2 +-
 sound/soc/codecs/wm8962.c                  |  2 +-
 sound/soc/codecs/wm8974.c                  |  2 +-
 sound/soc/codecs/wm8978.c                  |  2 +-
 sound/soc/codecs/wm8983.c                  |  2 +-
 sound/soc/codecs/wm8985.c                  |  2 +-
 sound/soc/codecs/wm8988.c                  |  2 +-
 sound/soc/codecs/wm8993.c                  |  2 +-
 sound/soc/codecs/wm8994.c                  |  4 +-
 sound/soc/codecs/wm8997.c                  |  8 +--
 sound/soc/codecs/wm8998.c                  | 12 ++--
 sound/soc/codecs/wm9713.c                  |  2 +-
 sound/soc/codecs/zl38060.c                 |  4 +-
 sound/soc/fsl/fsl_esai.c                   |  4 +-
 sound/soc/fsl/fsl_sai.c                    |  8 +--
 sound/soc/fsl/fsl_ssi.c                    |  4 +-
 sound/soc/jz4740/jz4740-i2s.c              |  2 +-
 sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 10 +--
 sound/soc/mediatek/mt6797/mt6797-dai-pcm.c |  8 +--
 sound/soc/mediatek/mt8173/mt8173-afe-pcm.c |  2 +-
 sound/soc/mediatek/mt8183/mt8183-dai-pcm.c |  8 +--
 sound/soc/mediatek/mt8192/mt8192-dai-pcm.c |  8 +--
 sound/soc/pxa/pxa2xx-i2s.c                 |  2 +-
 sound/soc/rockchip/rockchip_i2s.c          |  4 +-
 sound/soc/rockchip/rockchip_pdm.c          |  2 +-
 sound/soc/samsung/i2s.c                    |  2 +-
 sound/soc/samsung/pcm.c                    |  2 +-
 sound/soc/sh/rcar/core.c                   |  4 +-
 sound/soc/soc-pcm.c                        | 80 +++++++---------------
 sound/soc/soc-topology.c                   |  8 +--
 sound/soc/sunxi/sun4i-i2s.c                |  2 +-
 sound/soc/sunxi/sun8i-codec.c              | 12 ++--
 sound/soc/tegra/tegra186_dspk.c            |  2 +-
 sound/soc/tegra/tegra20_i2s.c              |  2 +-
 sound/soc/tegra/tegra210_dmic.c            |  2 +-
 sound/soc/tegra/tegra210_i2s.c             |  2 +-
 sound/soc/tegra/tegra30_i2s.c              |  2 +-
 sound/soc/ti/davinci-mcasp.c               |  2 +-
 116 files changed, 253 insertions(+), 283 deletions(-)

--
2.25.1
  • Loading branch information
Mark Brown committed Jan 21, 2021
2 parents 1e92413 + 3a90672 commit ff385c1
Show file tree
Hide file tree
Showing 116 changed files with 253 additions and 283 deletions.
4 changes: 2 additions & 2 deletions include/sound/soc-dai.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,9 @@ struct snd_soc_dai_driver {
/* DAI capabilities */
struct snd_soc_pcm_stream capture;
struct snd_soc_pcm_stream playback;
unsigned int symmetric_rates:1;
unsigned int symmetric_rate:1;
unsigned int symmetric_channels:1;
unsigned int symmetric_samplebits:1;
unsigned int symmetric_sample_bits:1;

/* probe ordering - for components with runtime dependencies */
int probe_order;
Expand Down
4 changes: 2 additions & 2 deletions include/sound/soc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,9 +685,9 @@ struct snd_soc_dai_link {
unsigned int ignore_suspend:1;

/* Symmetry requirements */
unsigned int symmetric_rates:1;
unsigned int symmetric_rate:1;
unsigned int symmetric_channels:1;
unsigned int symmetric_samplebits:1;
unsigned int symmetric_sample_bits:1;

/* Do not create a PCM for this DAI link (Backend link) */
unsigned int no_pcm:1;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/adi/axi-i2s.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ static const struct snd_soc_dai_ops axi_i2s_dai_ops = {
static struct snd_soc_dai_driver axi_i2s_dai = {
.probe = axi_i2s_dai_probe,
.ops = &axi_i2s_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static const struct snd_soc_component_driver axi_i2s_component = {
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/atmel/atmel-i2s.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ static struct snd_soc_dai_driver atmel_i2s_dai = {
.formats = ATMEL_I2S_FORMATS,
},
.ops = &atmel_i2s_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static const struct snd_soc_component_driver atmel_i2s_component = {
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/atmel/mchp-i2s-mcc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -859,8 +859,8 @@ static struct snd_soc_dai_driver mchp_i2s_mcc_dai = {
.formats = MCHP_I2SMCC_FORMATS,
},
.ops = &mchp_i2s_mcc_dai_ops,
.symmetric_rates = 1,
.symmetric_samplebits = 1,
.symmetric_rate = 1,
.symmetric_sample_bits = 1,
.symmetric_channels = 1,
};

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/au1x/i2sc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ static const struct snd_soc_dai_ops au1xi2s_dai_ops = {
};

static struct snd_soc_dai_driver au1xi2s_dai_driver = {
.symmetric_rates = 1,
.symmetric_rate = 1,
.playback = {
.rates = AU1XI2SC_RATES,
.formats = AU1XI2SC_FMTS,
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/bcm/bcm2835-i2s.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,8 +783,8 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = {
| SNDRV_PCM_FMTBIT_S32_LE
},
.ops = &bcm2835_i2s_dai_ops,
.symmetric_rates = 1,
.symmetric_samplebits = 1,
.symmetric_rate = 1,
.symmetric_sample_bits = 1,
};

static bool bcm2835_i2s_volatile_reg(struct device *dev, unsigned int reg)
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/bcm/bcm63xx-i2s-whistler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static struct snd_soc_dai_driver bcm63xx_i2s_dai = {
.formats = SNDRV_PCM_FMTBIT_S32_LE,
},
.ops = &bcm63xx_i2s_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
.symmetric_channels = 1,
};

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/cirrus/ep93xx-i2s.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ static const struct snd_soc_dai_ops ep93xx_i2s_dai_ops = {
#define EP93XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S32_LE)

static struct snd_soc_dai_driver ep93xx_i2s_dai = {
.symmetric_rates= 1,
.symmetric_rate = 1,
.probe = ep93xx_i2s_dai_probe,
.playback = {
.channels_min = 2,
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/ab8500-codec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2384,7 +2384,7 @@ static struct snd_soc_dai_driver ab8500_codec_dai[] = {
.formats = AB8500_SUPPORTED_FMT,
},
.ops = &ab8500_codec_ops,
.symmetric_rates = 1
.symmetric_rate = 1
},
{
.name = "ab8500-codec-dai.1",
Expand All @@ -2397,7 +2397,7 @@ static struct snd_soc_dai_driver ab8500_codec_dai[] = {
.formats = AB8500_SUPPORTED_FMT,
},
.ops = &ab8500_codec_ops,
.symmetric_rates = 1
.symmetric_rate = 1
}
};

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/adau1372.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ static struct snd_soc_dai_driver adau1372_dai_driver = {
.sig_bits = 24,
},
.ops = &adau1372_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static int adau1372_setup_pll(struct adau1372 *adau1372, unsigned int rate)
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/codecs/adau1373.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ static struct snd_soc_dai_driver adau1373_dai_driver[] = {
.formats = ADAU1373_FORMATS,
},
.ops = &adau1373_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.id = 1,
Expand All @@ -1225,7 +1225,7 @@ static struct snd_soc_dai_driver adau1373_dai_driver[] = {
.formats = ADAU1373_FORMATS,
},
.ops = &adau1373_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.id = 2,
Expand All @@ -1245,7 +1245,7 @@ static struct snd_soc_dai_driver adau1373_dai_driver[] = {
.formats = ADAU1373_FORMATS,
},
.ops = &adau1373_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
};

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/adau1701.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ static struct snd_soc_dai_driver adau1701_dai = {
.formats = ADAU1701_FORMATS,
},
.ops = &adau1701_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

#ifdef CONFIG_OF
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4554.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static struct snd_soc_dai_driver ak4554_dai = {
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static const struct snd_soc_component_driver soc_component_dev_ak4554 = {
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4613.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ static struct snd_soc_dai_driver ak4613_dai = {
.formats = AK4613_PCM_FMTBIT,
},
.ops = &ak4613_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static int ak4613_suspend(struct snd_soc_component *component)
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/ak4641.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ static struct snd_soc_dai_driver ak4641_dai[] = {
.formats = AK4641_FORMATS,
},
.ops = &ak4641_i2s_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.name = "ak4641-voice",
Expand All @@ -519,7 +519,7 @@ static struct snd_soc_dai_driver ak4641_dai[] = {
.formats = AK4641_FORMATS,
},
.ops = &ak4641_pcm_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
};

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4642.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ static struct snd_soc_dai_driver ak4642_dai = {
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE },
.ops = &ak4642_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static int ak4642_suspend(struct snd_soc_component *component)
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/alc5632.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ static struct snd_soc_dai_driver alc5632_dai = {
.formats = ALC5632_FORMATS,},

.ops = &alc5632_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

#ifdef CONFIG_PM
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs35l32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ static struct snd_soc_dai_driver cs35l32_dai[] = {
.formats = CS35L32_FORMATS,
},
.ops = &cs35l32_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
}
};

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs35l33.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ static struct snd_soc_dai_driver cs35l33_dai = {
.formats = CS35L33_FORMATS,
},
.ops = &cs35l33_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static int cs35l33_set_hg_data(struct snd_soc_component *component,
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs35l34.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ static struct snd_soc_dai_driver cs35l34_dai = {
.formats = CS35L34_FORMATS,
},
.ops = &cs35l34_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34,
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs35l35.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ static struct snd_soc_dai_driver cs35l35_dai[] = {
.formats = CS35L35_FORMATS,
},
.ops = &cs35l35_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.name = "cs35l35-pdm",
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs35l36.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ static struct snd_soc_dai_driver cs35l36_dai[] = {
.formats = CS35L36_TX_FORMATS,
},
.ops = &cs35l36_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
};

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4234.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ static struct snd_soc_dai_driver cs4234_dai[] = {
.formats = CS4234_FORMATS,
},
.ops = &cs4234_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
};

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4271.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ static struct snd_soc_dai_driver cs4271_dai = {
.formats = CS4271_PCM_FORMATS,
},
.ops = &cs4271_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static int cs4271_reset(struct snd_soc_component *component)
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/codecs/cs42l73.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
.formats = CS42L73_FORMATS,
},
.ops = &cs42l73_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.name = "cs42l73-asp",
Expand All @@ -1201,7 +1201,7 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
.formats = CS42L73_FORMATS,
},
.ops = &cs42l73_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.name = "cs42l73-vsp",
Expand All @@ -1221,7 +1221,7 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
.formats = CS42L73_FORMATS,
},
.ops = &cs42l73_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
}
};

Expand Down
6 changes: 3 additions & 3 deletions sound/soc/codecs/cs43130.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,7 @@ static struct snd_soc_dai_driver cs43130_dai[] = {
.formats = CS43130_PCM_FORMATS,
},
.ops = &cs43130_pcm_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.name = "cs43130-asp-dop",
Expand All @@ -1594,7 +1594,7 @@ static struct snd_soc_dai_driver cs43130_dai[] = {
.formats = CS43130_DOP_FORMATS,
},
.ops = &cs43130_dop_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.name = "cs43130-xsp-dop",
Expand All @@ -1607,7 +1607,7 @@ static struct snd_soc_dai_driver cs43130_dai[] = {
.formats = CS43130_DOP_FORMATS,
},
.ops = &cs43130_dop_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
},
{
.name = "cs43130-xsp-dsd",
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4341.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static struct snd_soc_dai_driver cs4341_dai = {
SNDRV_PCM_FMTBIT_S24_LE,
},
.ops = &cs4341_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static const struct snd_soc_component_driver soc_component_cs4341 = {
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4349.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ static struct snd_soc_dai_driver cs4349_dai = {
.formats = CS4349_PCM_FORMATS,
},
.ops = &cs4349_dai_ops,
.symmetric_rates = 1,
.symmetric_rate = 1,
};

static const struct snd_soc_component_driver soc_component_dev_cs4349 = {
Expand Down
12 changes: 6 additions & 6 deletions sound/soc/codecs/cs47l15.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1160,8 +1160,8 @@ static struct snd_soc_dai_driver cs47l15_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
.symmetric_rates = 1,
.symmetric_samplebits = 1,
.symmetric_rate = 1,
.symmetric_sample_bits = 1,
},
{
.name = "cs47l15-aif2",
Expand All @@ -1182,8 +1182,8 @@ static struct snd_soc_dai_driver cs47l15_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
.symmetric_rates = 1,
.symmetric_samplebits = 1,
.symmetric_rate = 1,
.symmetric_sample_bits = 1,
},
{
.name = "cs47l15-aif3",
Expand All @@ -1204,8 +1204,8 @@ static struct snd_soc_dai_driver cs47l15_dai[] = {
.formats = MADERA_FORMATS,
},
.ops = &madera_dai_ops,
.symmetric_rates = 1,
.symmetric_samplebits = 1,
.symmetric_rate = 1,
.symmetric_sample_bits = 1,
},
{
.name = "cs47l15-cpu-trace",
Expand Down
Loading

0 comments on commit ff385c1

Please sign in to comment.