Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db2ecdfd authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fmtbit',... 

Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fmtbit', 'asoc/fix/max98925', 'asoc/fix/rcar' and 'asoc/fix/ux500' into asoc-linus
parents 0357fe0b 15575ed5 e712bfca 0b51601d 7667f716 72f0095e

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
				  "renesas,rcar_sound-gen1" if generation1, and

				  "renesas,rcar_sound-gen2" if generation2

				  Examples with soctypes are:

				    - "renesas,rcar_sound-r8a7778" (R-Car M1A)

				    - "renesas,rcar_sound-r8a7790" (R-Car H2)

				    - "renesas,rcar_sound-r8a7791" (R-Car M2-W)

- reg				: Should contain the register physical address.

sound/soc/codecs/88pm860x-codec.c

+8 −8
Original line number Diff line number Diff line
@@ -1187,16 +1187,16 @@ static struct snd_soc_dai_driver pm860x_dai[] = { 
			.channels_min	= 2,

			.channels_max	= 2,

			.rates		= PM860X_RATES,

			.formats	= SNDRV_PCM_FORMAT_S16_LE | \

					  SNDRV_PCM_FORMAT_S18_3LE,

			.formats	= SNDRV_PCM_FMTBIT_S16_LE | \

					  SNDRV_PCM_FMTBIT_S18_3LE,

		},

		.capture = {

			.stream_name	= "PCM Capture",

			.channels_min	= 2,

			.channels_max	= 2,

			.rates		= PM860X_RATES,

			.formats	= SNDRV_PCM_FORMAT_S16_LE | \

					  SNDRV_PCM_FORMAT_S18_3LE,

			.formats	= SNDRV_PCM_FMTBIT_S16_LE | \

					  SNDRV_PCM_FMTBIT_S18_3LE,

		},

		.ops	= &pm860x_pcm_dai_ops,

	}, {
@@ -1208,16 +1208,16 @@ static struct snd_soc_dai_driver pm860x_dai[] = { 
			.channels_min	= 2,

			.channels_max	= 2,

			.rates		= SNDRV_PCM_RATE_8000_48000,

			.formats	= SNDRV_PCM_FORMAT_S16_LE | \

					  SNDRV_PCM_FORMAT_S18_3LE,

			.formats	= SNDRV_PCM_FMTBIT_S16_LE | \

					  SNDRV_PCM_FMTBIT_S18_3LE,

		},

		.capture = {

			.stream_name	= "I2S Capture",

			.channels_min	= 2,

			.channels_max	= 2,

			.rates		= SNDRV_PCM_RATE_8000_48000,

			.formats	= SNDRV_PCM_FORMAT_S16_LE | \

					  SNDRV_PCM_FORMAT_S18_3LE,

			.formats	= SNDRV_PCM_FMTBIT_S16_LE | \

					  SNDRV_PCM_FMTBIT_S18_3LE,

		},

		.ops	= &pm860x_i2s_dai_ops,

	},

sound/soc/codecs/max98925.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int max98925_dai_set_fmt(struct snd_soc_dai *codec_dai, 
	}



	regmap_update_bits(max98925->regmap, MAX98925_FORMAT,

			M98925_DAI_BCI_MASK, invert);

			M98925_DAI_BCI_MASK | M98925_DAI_WCI_MASK, invert);

	return 0;

}

sound/soc/codecs/stac9766.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static struct snd_soc_dai_driver stac9766_dai[] = { 
		.channels_max = 2,

		.rates = SNDRV_PCM_RATE_32000 | \

			SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,

		.formats = SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE,

		.formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE,

	},

	/* alsa ops */

	.ops = &stac9766_dai_ops_digital,

sound/soc/codecs/wm5102.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct wm5102_priv { 
static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0);

static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);

static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);

static DECLARE_TLV_DB_SCALE(noise_tlv, 0, 600, 0);

static DECLARE_TLV_DB_SCALE(noise_tlv, -13200, 600, 0);

static DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);



static const struct wm_adsp_region wm5102_dsp1_regions[] = {