3.7-stable patches

added patches:
	asoc-arizona-correct-fll-source-definitions.patch
	asoc-arizona-do-proper-shift-for-setting-aif-rate.patch
	asoc-arizona-remove-dsp-b-and-left-justified-aif-modes.patch

diff --git a/queue-3.7/asoc-arizona-correct-fll-source-definitions.patch b/queue-3.7/asoc-arizona-correct-fll-source-definitions.patch
new file mode 100644 (file)
index 0000000..cafb099
--- /dev/null
+++ b/queue-3.7/asoc-arizona-correct-fll-source-definitions.patch
@@ -0,0 +1,48 @@
+From a8c02db029385fb4426e0396e108ab23cd08f384 Mon Sep 17 00:00:00 2001
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Date: Tue, 18 Dec 2012 14:05:01 +0000
+Subject: ASoC: arizona: Correct FLL source definitions
+
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+
+commit a8c02db029385fb4426e0396e108ab23cd08f384 upstream.
+
+The FLL source constants were numbered as a simple enumeration but were
+being used in the code as direct values to be written to the registers.
+Renumber the constants to reflect the usage.
+
+Reported-by: Ryo Tsutsui <Ryo.Tsutsui@wolfsonmicro.com>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/arizona.h |   18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+--- a/sound/soc/codecs/arizona.h
++++ b/sound/soc/codecs/arizona.h
+@@ -32,15 +32,15 @@
+ 
+ #define ARIZONA_FLL_SRC_MCLK1      0
+ #define ARIZONA_FLL_SRC_MCLK2      1
+-#define ARIZONA_FLL_SRC_SLIMCLK    2
+-#define ARIZONA_FLL_SRC_FLL1       3
+-#define ARIZONA_FLL_SRC_FLL2       4
+-#define ARIZONA_FLL_SRC_AIF1BCLK   5
+-#define ARIZONA_FLL_SRC_AIF2BCLK   6
+-#define ARIZONA_FLL_SRC_AIF3BCLK   7
+-#define ARIZONA_FLL_SRC_AIF1LRCLK  8
+-#define ARIZONA_FLL_SRC_AIF2LRCLK  9
+-#define ARIZONA_FLL_SRC_AIF3LRCLK 10
++#define ARIZONA_FLL_SRC_SLIMCLK    3
++#define ARIZONA_FLL_SRC_FLL1       4
++#define ARIZONA_FLL_SRC_FLL2       5
++#define ARIZONA_FLL_SRC_AIF1BCLK   8
++#define ARIZONA_FLL_SRC_AIF2BCLK   9
++#define ARIZONA_FLL_SRC_AIF3BCLK  10
++#define ARIZONA_FLL_SRC_AIF1LRCLK 12
++#define ARIZONA_FLL_SRC_AIF2LRCLK 13
++#define ARIZONA_FLL_SRC_AIF3LRCLK 14
+ 
+ #define ARIZONA_MIXER_VOL_MASK             0x00FE
+ #define ARIZONA_MIXER_VOL_SHIFT                 1

diff --git a/queue-3.7/asoc-arizona-do-proper-shift-for-setting-aif-rate.patch b/queue-3.7/asoc-arizona-do-proper-shift-for-setting-aif-rate.patch
new file mode 100644 (file)
index 0000000..d0e8f0a
--- /dev/null
+++ b/queue-3.7/asoc-arizona-do-proper-shift-for-setting-aif-rate.patch
@@ -0,0 +1,32 @@
+From 7110a287ff2b1f3780905d1686a1a4edccb95133 Mon Sep 17 00:00:00 2001
+From: Axel Lin <axel.lin@ingics.com>
+Date: Thu, 20 Dec 2012 23:29:42 +0800
+Subject: ASoC: arizona: Do proper shift for setting AIF rate
+
+From: Axel Lin <axel.lin@ingics.com>
+
+commit 7110a287ff2b1f3780905d1686a1a4edccb95133 upstream.
+
+ARIZONA_AIF1_RATE_MASK is 0x7800 /* AIF1_RATE - [14:11] */
+Thus we need left shift ARIZONA_AIF1_RATE_SHIFT when setting aif1 rate.
+
+Signed-off-by: Axel Lin <axel.lin@ingics.com>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/arizona.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sound/soc/codecs/arizona.c
++++ b/sound/soc/codecs/arizona.c
+@@ -677,7 +677,8 @@ static int arizona_hw_params(struct snd_
+               snd_soc_update_bits(codec, ARIZONA_ASYNC_SAMPLE_RATE_1,
+                                   ARIZONA_ASYNC_SAMPLE_RATE_MASK, sr_val);
+               snd_soc_update_bits(codec, base + ARIZONA_AIF_RATE_CTRL,
+-                                  ARIZONA_AIF1_RATE_MASK, 8);
++                                  ARIZONA_AIF1_RATE_MASK,
++                                  8 << ARIZONA_AIF1_RATE_SHIFT);
+               break;
+       default:
+               arizona_aif_err(dai, "Invalid clock %d\n", dai_priv->clk);

diff --git a/queue-3.7/asoc-arizona-remove-dsp-b-and-left-justified-aif-modes.patch b/queue-3.7/asoc-arizona-remove-dsp-b-and-left-justified-aif-modes.patch
new file mode 100644 (file)
index 0000000..493b015
--- /dev/null
+++ b/queue-3.7/asoc-arizona-remove-dsp-b-and-left-justified-aif-modes.patch
@@ -0,0 +1,36 @@
+From d71753e22b24548911b377db28f80870cf50d07b Mon Sep 17 00:00:00 2001
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Date: Fri, 4 Jan 2013 10:48:02 +0000
+Subject: ASoC: arizona: Remove DSP B and left justified AIF modes
+
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+
+commit d71753e22b24548911b377db28f80870cf50d07b upstream.
+
+These are not supported.
+
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/arizona.c |    6 ------
+ 1 file changed, 6 deletions(-)
+
+--- a/sound/soc/codecs/arizona.c
++++ b/sound/soc/codecs/arizona.c
+@@ -409,15 +409,9 @@ static int arizona_set_fmt(struct snd_so
+       case SND_SOC_DAIFMT_DSP_A:
+               mode = 0;
+               break;
+-      case SND_SOC_DAIFMT_DSP_B:
+-              mode = 1;
+-              break;
+       case SND_SOC_DAIFMT_I2S:
+               mode = 2;
+               break;
+-      case SND_SOC_DAIFMT_LEFT_J:
+-              mode = 3;
+-              break;
+       default:
+               arizona_aif_err(dai, "Unsupported DAI format %d\n",
+                               fmt & SND_SOC_DAIFMT_FORMAT_MASK);

diff --git a/queue-3.7/series b/queue-3.7/series
index a181b838dc24d480b793c57cb8cbfb5573cfd9aa..ded25ac2ddb5a67c67115a78bf73acea9453c1bd 100644 (file)
--- a/queue-3.7/series
+++ b/queue-3.7/series
@@ -120,3 +120,6 @@ acpi-do-not-use-lid-and-sleep-button-for-s5-wakeup.patch
 regmap-debugfs-avoid-overflows-for-very-small-reads.patch
 epoll-prevent-missed-events-on-epoll_ctl_mod.patch
 hid-add-quirk-for-freescale-i.mx23-rom-recovery.patch
+asoc-arizona-correct-fll-source-definitions.patch
+asoc-arizona-do-proper-shift-for-setting-aif-rate.patch
+asoc-arizona-remove-dsp-b-and-left-justified-aif-modes.patch