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

Commit 92e9f773 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/ab8500', 'asoc/fix/adau17x1',... 

Merge remote-tracking branches 'asoc/fix/ab8500', 'asoc/fix/adau17x1', 'asoc/fix/adsp', 'asoc/fix/cs42l51', 'asoc/fix/da732x' and 'asoc/fix/fsl-ssi' into asoc-linus
parents 6374fda1 4b606316 7c139db2 15c66570 89300b4e fe9aba13 56e5fd8f

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;

	}

sound/soc/codecs/wm_adsp.c

+4 −4
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol, 
	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	struct wm_adsp *dsp = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.integer.value[0] = dsp[e->shift_l].fw;

	ucontrol->value.enumerated.item[0] = dsp[e->shift_l].fw;



	return 0;

}
@@ -599,10 +599,10 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol, 
	struct wm_adsp *dsp = snd_soc_codec_get_drvdata(codec);

	int ret = 0;



	if (ucontrol->value.integer.value[0] == dsp[e->shift_l].fw)

	if (ucontrol->value.enumerated.item[0] == dsp[e->shift_l].fw)

		return 0;



	if (ucontrol->value.integer.value[0] >= WM_ADSP_NUM_FW)

	if (ucontrol->value.enumerated.item[0] >= WM_ADSP_NUM_FW)

		return -EINVAL;



	mutex_lock(&dsp[e->shift_l].pwr_lock);
@@ -610,7 +610,7 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol, 
	if (dsp[e->shift_l].running || dsp[e->shift_l].compr)

		ret = -EBUSY;

	else

		dsp[e->shift_l].fw = ucontrol->value.integer.value[0];

		dsp[e->shift_l].fw = ucontrol->value.enumerated.item[0];



	mutex_unlock(&dsp[e->shift_l].pwr_lock);