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

Unverified Commit 033d56f6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/fallthrough',... 

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/fallthrough', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/graph' into asoc-next
parents 67e85d4e 44860b96 9d94305a b48cc1d9 7add71b6 757652dd

Documentation/devicetree/bindings/sound/audio-graph-card.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Below are same as Simple-Card. 
- bitclock-master

- bitclock-inversion

- frame-inversion

- mclk-fs

- dai-tdm-slot-num

- dai-tdm-slot-width

- clocks / system-clock-frequency

sound/soc/codecs/msm8916-wcd-analog.c

+1 −0
Original line number Diff line number Diff line
@@ -615,6 +615,7 @@ static int pm8916_wcd_analog_enable_adc(struct snd_soc_dapm_widget *w, 
		case CDC_A_TX_2_EN:

			snd_soc_update_bits(codec, CDC_A_MICB_1_CTL,

					    MICB_1_CTL_CFILT_REF_SEL_MASK, 0);

			/* fall through */

		case CDC_A_TX_3_EN:

			snd_soc_update_bits(codec, CDC_D_CDC_CONN_TX2_CTL,

					    CONN_TX2_SERIAL_TX2_MUX,

sound/soc/codecs/tlv320aic23.c

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

	case SND_SOC_DAIFMT_DSP_A:

		iface_reg |= TLV320AIC23_LRP_ON;

		/* fall through */

	case SND_SOC_DAIFMT_DSP_B:

		iface_reg |= TLV320AIC23_FOR_DSP;

		break;

sound/soc/codecs/tlv320aic31xx.c

+1 −1
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	case SND_SOC_DAIFMT_I2S:

		break;

	case SND_SOC_DAIFMT_DSP_A:

		dsp_a_val = 0x1;

		dsp_a_val = 0x1; /* fall through */

	case SND_SOC_DAIFMT_DSP_B:

		/* NOTE: BCLKINV bit value 1 equas NB and 0 equals IB */

		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {

sound/soc/codecs/tpa6130a2.c

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ static int tpa6130a2_probe(struct i2c_client *client, 
	default:

		dev_warn(dev, "Unknown TPA model (%d). Assuming 6130A2\n",

			 data->id);

		/* fall through */

	case TPA6130A2:

		regulator = "Vdd";

		break;