From 2a4d123739f8bc4e0bc9ebb726fea50a41bc307f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 8 Dec 2013 12:02:18 -0800 Subject: [PATCH] 3.4-stable patches added patches: asoc-wm8731-fix-dsp-mode-configuration.patch asoc-wm8990-mark-the-register-map-as-dirty-when-powering-down.patch --- ...oc-wm8731-fix-dsp-mode-configuration.patch | 37 +++++++++++++++++++ ...ster-map-as-dirty-when-powering-down.patch | 30 +++++++++++++++ queue-3.4/series | 2 + 3 files changed, 69 insertions(+) create mode 100644 queue-3.4/asoc-wm8731-fix-dsp-mode-configuration.patch create mode 100644 queue-3.4/asoc-wm8990-mark-the-register-map-as-dirty-when-powering-down.patch diff --git a/queue-3.4/asoc-wm8731-fix-dsp-mode-configuration.patch b/queue-3.4/asoc-wm8731-fix-dsp-mode-configuration.patch new file mode 100644 index 00000000000..2223c9c0b58 --- /dev/null +++ b/queue-3.4/asoc-wm8731-fix-dsp-mode-configuration.patch @@ -0,0 +1,37 @@ +From b4af6ef99a60c5b56df137d7accd81ba1ee1254e Mon Sep 17 00:00:00 2001 +From: Bo Shen +Date: Tue, 3 Dec 2013 18:04:54 +0800 +Subject: ASoC: wm8731: fix dsp mode configuration + +From: Bo Shen + +commit b4af6ef99a60c5b56df137d7accd81ba1ee1254e upstream. + +According to WM8731 "PD, Rev 4.9 October 2012" datasheet, when it +works in DSP mode A, LRP = 1, while works in DSP mode B, LRP = 0. +So, fix LRP for DSP mode as the datesheet specification. + +Signed-off-by: Bo Shen +Acked-by: Charles Keepax +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm8731.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/wm8731.c ++++ b/sound/soc/codecs/wm8731.c +@@ -406,10 +406,10 @@ static int wm8731_set_dai_fmt(struct snd + iface |= 0x0001; + break; + case SND_SOC_DAIFMT_DSP_A: +- iface |= 0x0003; ++ iface |= 0x0013; + break; + case SND_SOC_DAIFMT_DSP_B: +- iface |= 0x0013; ++ iface |= 0x0003; + break; + default: + return -EINVAL; diff --git a/queue-3.4/asoc-wm8990-mark-the-register-map-as-dirty-when-powering-down.patch b/queue-3.4/asoc-wm8990-mark-the-register-map-as-dirty-when-powering-down.patch new file mode 100644 index 00000000000..d850086bb59 --- /dev/null +++ b/queue-3.4/asoc-wm8990-mark-the-register-map-as-dirty-when-powering-down.patch @@ -0,0 +1,30 @@ +From 2ab2b74277a86afe0dd92976db695a2bb8b93366 Mon Sep 17 00:00:00 2001 +From: Mark Brown +Date: Fri, 22 Nov 2013 14:17:18 +0000 +Subject: ASoC: wm8990: Mark the register map as dirty when powering down + +From: Mark Brown + +commit 2ab2b74277a86afe0dd92976db695a2bb8b93366 upstream. + +Otherwise we'll skip sync on resume. + +Signed-off-by: Mark Brown +Acked-by: Charles Keepax +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm8990.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/soc/codecs/wm8990.c ++++ b/sound/soc/codecs/wm8990.c +@@ -1265,6 +1265,8 @@ static int wm8990_set_bias_level(struct + + /* disable POBCTRL, SOFT_ST and BUFDCOPEN */ + snd_soc_write(codec, WM8990_ANTIPOP2, 0x0); ++ ++ codec->cache_sync = 1; + break; + } + diff --git a/queue-3.4/series b/queue-3.4/series index 7d57e62c801..7cb1d26f8f2 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -1,3 +1,5 @@ crypto-scatterwalk-set-the-chain-pointer-indication-bit.patch crypto-ccm-fix-handling-of-zero-plaintext-when-computing-mac.patch crypto-authenc-find-proper-iv-address-in-ablkcipher-callback.patch +asoc-wm8990-mark-the-register-map-as-dirty-when-powering-down.patch +asoc-wm8731-fix-dsp-mode-configuration.patch -- 2.47.3