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

Commit 921c038d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/wm2200' into tmp

parents 28f2675d 0cc411b9

sound/soc/codecs/wm2200.c

+1 −7
Original line number Diff line number Diff line
@@ -1566,15 +1566,9 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	case SND_SOC_DAIFMT_DSP_A:

		fmt_val = 0;

		break;

	case SND_SOC_DAIFMT_DSP_B:

		fmt_val = 1;

		break;

	case SND_SOC_DAIFMT_I2S:

		fmt_val = 2;

		break;

	case SND_SOC_DAIFMT_LEFT_J:

		fmt_val = 3;

		break;

	default:

		dev_err(codec->dev, "Unsupported DAI format %d\n",

			fmt & SND_SOC_DAIFMT_FORMAT_MASK);
@@ -1626,7 +1620,7 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
			    WM2200_AIF1TX_LRCLK_MSTR | WM2200_AIF1TX_LRCLK_INV,

			    lrclk);

	snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_5,

			    WM2200_AIF1_FMT_MASK << 1, fmt_val << 1);

			    WM2200_AIF1_FMT_MASK, fmt_val);



	return 0;

}