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

Commit 6bcbf64a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 51e4152a 0b7dd6ad

sound/soc/codecs/tlv320aic23.c

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		iface_reg |= TLV320AIC23_MS_MASTER;

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

		iface_reg &= ~TLV320AIC23_MS_MASTER;

		break;

	default:

		return -EINVAL;

sound/soc/codecs/tlv320aic3x.c

+1 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		break;

	case SND_SOC_DAIFMT_CBS_CFS:

		aic3x->master = 0;

		iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER);

		break;

	default:

		return -EINVAL;

sound/soc/codecs/wm5100.c

+8 −4
Original line number Diff line number Diff line
@@ -2361,13 +2361,17 @@ static int wm5100_gpio_direction_out(struct gpio_chip *chip, 
{

	struct wm5100_priv *wm5100 = gpio_to_wm5100(chip);

	struct snd_soc_codec *codec = wm5100->codec;

	int val;

	int val, ret;



	val = (1 << WM5100_GP1_FN_SHIFT) | (!!value << WM5100_GP1_LVL_SHIFT);



	return snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,

	ret = snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,

				  WM5100_GP1_FN_MASK | WM5100_GP1_DIR |

				  WM5100_GP1_LVL, val);

	if (ret < 0)

		return ret;

	else

		return 0;

}



static int wm5100_gpio_get(struct gpio_chip *chip, unsigned offset)

sound/soc/codecs/wm8711.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_codec *codec = dai->codec;

	struct wm8711_priv *wm8711 =  snd_soc_codec_get_drvdata(codec);

	u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc;

	u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfff3;

	int i = get_coeff(wm8711->sysclk, params_rate(params));

	u16 srate = (coeff_div[i].sr << 2) |

		(coeff_div[i].bosr << 1) | coeff_div[i].usb;
@@ -232,7 +232,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		unsigned int fmt)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	u16 iface = 0;

	u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0x000c;



	/* set master/slave audio interface */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

sound/soc/codecs/wm8904.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ SOC_ENUM("Right Capture Mode", rin_mode), 
SOC_DOUBLE_R("Capture Volume", WM8904_ANALOGUE_LEFT_INPUT_0,

	     WM8904_ANALOGUE_RIGHT_INPUT_0, 0, 31, 0),

SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0,

	     WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 0),

	     WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 1),



SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0),

SOC_ENUM("High Pass Filter Mode", hpf_mode),