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

Commit 0335cd6c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/da7213' into asoc-linus

parents f722406f 61559af1

sound/soc/codecs/da7213.c

+4 −4
Original line number Diff line number Diff line
@@ -1488,17 +1488,17 @@ static int da7213_probe(struct snd_soc_codec *codec) 
				     DA7213_DMIC_DATA_SEL_SHIFT);

			break;

		}

		switch (pdata->dmic_data_sel) {

		switch (pdata->dmic_samplephase) {

		case DA7213_DMIC_SAMPLE_ON_CLKEDGE:

		case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE:

			dmic_cfg |= (pdata->dmic_data_sel <<

			dmic_cfg |= (pdata->dmic_samplephase <<

				     DA7213_DMIC_SAMPLEPHASE_SHIFT);

			break;

		}

		switch (pdata->dmic_data_sel) {

		switch (pdata->dmic_clk_rate) {

		case DA7213_DMIC_CLK_3_0MHZ:

		case DA7213_DMIC_CLK_1_5MHZ:

			dmic_cfg |= (pdata->dmic_data_sel <<

			dmic_cfg |= (pdata->dmic_clk_rate <<

				     DA7213_DMIC_CLK_RATE_SHIFT);

			break;

		}