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

Commit 7f02bf6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "It's always an ambivalent feeling to send a large pull request at the
  late stage like this, especially when most of patches came from me.
  Anyway, this is a collection of lots of small fixes that slipped from
  the previous pull request.

  All fixes are about ASoC, and the majority of changes are corrections
  of the wrong access types in ALSA ctl enum items.  They are mostly
  harmless on 32bit architectures, but actually buggy on 64bit.  So we
  addressed all these now in a shot.  The rest are various small ASoC
  driver fixes.

  Among them, only two changes have been done to ASoC core, and both of
  them are trivial.  The rest are all device-specific.  So overall, they
  should be safe to apply"

* tag 'sound-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (33 commits)
  ASoC: wm_adsp: Fix enum ctl accesses in a wrong type
  ASoC: wm9081: Fix enum ctl accesses in a wrong type
  ASoC: wm8996: Fix enum ctl accesses in a wrong type
  ASoC: wm8994: Fix enum ctl accesses in a wrong type
  ASoC: wm8985: Fix enum ctl accesses in a wrong type
  ASoC: wm8983: Fix enum ctl accesses in a wrong type
  ASoC: wm8958: Fix enum ctl accesses in a wrong type
  ASoC: wm8904: Fix enum ctl accesses in a wrong type
  ASoC: wm8753: Fix enum ctl accesses in a wrong type
  ASoC: wl1273: Fix enum ctl accesses in a wrong type
  ASoC: tlv320dac33: Fix enum ctl accesses in a wrong type
  ASoC: max98095: Fix enum ctl accesses in a wrong type
  ASoC: max98088: Fix enum ctl accesses in a wrong type
  ASoC: ab8500: Fix enum ctl accesses in a wrong type
  ASoC: da732x: Fix enum ctl accesses in a wrong type
  ASoC: cs42l51: Fix enum ctl accesses in a wrong type
  ASoC: intel: mfld: Fix enum ctl accesses in a wrong type
  ASoC: omap: rx51: Fix enum ctl accesses in a wrong type
  ASoC: omap: n810: Fix enum ctl accesses in a wrong type
  ASoC: pxa: tosa: Fix enum ctl accesses in a wrong type
  ...
parents 1e2a4c7a ad09ef2c

include/trace/events/asoc.h

+4 −4
Original line number Diff line number Diff line
@@ -231,13 +231,13 @@ TRACE_EVENT(snd_soc_jack_report, 
	TP_ARGS(jack, mask, val),



	TP_STRUCT__entry(

		__string(	name,		jack->jack->name	)

		__string(	name,		jack->jack->id		)

		__field(	int,		mask			)

		__field(	int,		val			)

	),



	TP_fast_assign(

		__assign_str(name, jack->jack->name);

		__assign_str(name, jack->jack->id);

		__entry->mask = mask;

		__entry->val = val;

	),
@@ -253,12 +253,12 @@ TRACE_EVENT(snd_soc_jack_notify, 
	TP_ARGS(jack, val),



	TP_STRUCT__entry(

		__string(	name,		jack->jack->name	)

		__string(	name,		jack->jack->id		)

		__field(	int,		val			)

	),



	TP_fast_assign(

		__assign_str(name, jack->jack->name);

		__assign_str(name, jack->jack->id);

		__entry->val = val;

	),

sound/soc/codecs/ab8500-codec.c

+4 −4
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ static int sid_status_control_get(struct snd_kcontrol *kcontrol, 
	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);



	mutex_lock(&drvdata->ctrl_lock);

	ucontrol->value.integer.value[0] = drvdata->sid_status;

	ucontrol->value.enumerated.item[0] = drvdata->sid_status;

	mutex_unlock(&drvdata->ctrl_lock);



	return 0;
@@ -1147,7 +1147,7 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol, 


	dev_dbg(codec->dev, "%s: Enter\n", __func__);



	if (ucontrol->value.integer.value[0] != SID_APPLY_FIR) {

	if (ucontrol->value.enumerated.item[0] != SID_APPLY_FIR) {

		dev_err(codec->dev,

			"%s: ERROR: This control supports '%s' only!\n",

			__func__, enum_sid_state[SID_APPLY_FIR]);
@@ -1199,7 +1199,7 @@ static int anc_status_control_get(struct snd_kcontrol *kcontrol, 
	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);



	mutex_lock(&drvdata->ctrl_lock);

	ucontrol->value.integer.value[0] = drvdata->anc_status;

	ucontrol->value.enumerated.item[0] = drvdata->anc_status;

	mutex_unlock(&drvdata->ctrl_lock);



	return 0;
@@ -1220,7 +1220,7 @@ static int anc_status_control_put(struct snd_kcontrol *kcontrol, 


	mutex_lock(&drvdata->ctrl_lock);



	req = ucontrol->value.integer.value[0];

	req = ucontrol->value.enumerated.item[0];

	if (req >= ARRAY_SIZE(enum_anc_state)) {

		status = -EINVAL;

		goto cleanup;

sound/soc/codecs/adau17x1.h

+3 −3
Original line number Diff line number Diff line
@@ -103,9 +103,9 @@ bool adau17x1_has_dsp(struct adau *adau); 
#define ADAU17X1_CLOCK_CONTROL_CORECLK_SRC_PLL	BIT(3)

#define ADAU17X1_CLOCK_CONTROL_SYSCLK_EN	BIT(0)



#define ADAU17X1_SERIAL_PORT1_BCLK32		(0x0 << 5)

#define ADAU17X1_SERIAL_PORT1_BCLK48		(0x1 << 5)

#define ADAU17X1_SERIAL_PORT1_BCLK64		(0x2 << 5)

#define ADAU17X1_SERIAL_PORT1_BCLK64		(0x0 << 5)

#define ADAU17X1_SERIAL_PORT1_BCLK32		(0x1 << 5)

#define ADAU17X1_SERIAL_PORT1_BCLK48		(0x2 << 5)

#define ADAU17X1_SERIAL_PORT1_BCLK128		(0x3 << 5)

#define ADAU17X1_SERIAL_PORT1_BCLK256		(0x4 << 5)

#define ADAU17X1_SERIAL_PORT1_BCLK_MASK		(0x7 << 5)

sound/soc/codecs/cs42l51.c

+4 −4
Original line number Diff line number Diff line
@@ -60,15 +60,15 @@ static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol, 
	switch (value) {

	default:

	case 0:

		ucontrol->value.integer.value[0] = 0;

		ucontrol->value.enumerated.item[0] = 0;

		break;

	/* same value : (L+R)/2 and (R+L)/2 */

	case 1:

	case 2:

		ucontrol->value.integer.value[0] = 1;

		ucontrol->value.enumerated.item[0] = 1;

		break;

	case 3:

		ucontrol->value.integer.value[0] = 2;

		ucontrol->value.enumerated.item[0] = 2;

		break;

	}
@@ -85,7 +85,7 @@ static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	unsigned char val;



	switch (ucontrol->value.integer.value[0]) {

	switch (ucontrol->value.enumerated.item[0]) {

	default:

	case 0:

		val = CHAN_MIX_NORMAL;

sound/soc/codecs/da732x.c

+4 −4
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int da732x_hpf_set(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value;

	unsigned int reg = enum_ctrl->reg;

	unsigned int sel = ucontrol->value.integer.value[0];

	unsigned int sel = ucontrol->value.enumerated.item[0];

	unsigned int bits;



	switch (sel) {
@@ -368,13 +368,13 @@ static int da732x_hpf_get(struct snd_kcontrol *kcontrol, 


	switch (val) {

	case DA732X_HPF_VOICE_EN:

		ucontrol->value.integer.value[0] = DA732X_HPF_VOICE;

		ucontrol->value.enumerated.item[0] = DA732X_HPF_VOICE;

		break;

	case DA732X_HPF_MUSIC_EN:

		ucontrol->value.integer.value[0] = DA732X_HPF_MUSIC;

		ucontrol->value.enumerated.item[0] = DA732X_HPF_MUSIC;

		break;

	default:

		ucontrol->value.integer.value[0] = DA732X_HPF_DISABLED;

		ucontrol->value.enumerated.item[0] = DA732X_HPF_DISABLED;

		break;

	}