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

Commit 84abd1b3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1

parents aa72f689 6ac34062

sound/soc/codecs/wm8915.c

+2 −1
Original line number Diff line number Diff line
@@ -1835,7 +1835,7 @@ static int wm8915_set_sysclk(struct snd_soc_dai *dai, 
	int old;



	/* Disable SYSCLK while we reconfigure */

	old = snd_soc_read(codec, WM8915_AIF_CLOCKING_1);

	old = snd_soc_read(codec, WM8915_AIF_CLOCKING_1) & WM8915_SYSCLK_ENA;

	snd_soc_update_bits(codec, WM8915_AIF_CLOCKING_1,

			    WM8915_SYSCLK_ENA, 0);
@@ -2034,6 +2034,7 @@ static int wm8915_set_fll(struct snd_soc_codec *codec, int fll_id, int source, 
		break;

	case WM8915_FLL_MCLK2:

		reg = 1;

		break;

	case WM8915_FLL_DACLRCLK1:

		reg = 2;

		break;