diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:29:03 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:29:03 -0400 |
| commit | 94e759fcc6e0a19afe3857465991063ff139d462 (patch) | |
| tree | 620216375cf1beb970c4eb62d05ea5c91881211a | |
| parent | 5727a98ffeea8efee3e937ece992216814517421 (diff) | |
| download | longterm-queue-4.12-94e759fcc6e0a19afe3857465991063ff139d462.tar.gz | |
ASoC: refresh ctxt
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ASoC-codecs-msm8916-wcd-Fix-supported-formats.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/ASoC-codecs-msm8916-wcd-Fix-supported-formats.patch b/queue/ASoC-codecs-msm8916-wcd-Fix-supported-formats.patch index dd60d08..e64f2c2 100644 --- a/queue/ASoC-codecs-msm8916-wcd-Fix-supported-formats.patch +++ b/queue/ASoC-codecs-msm8916-wcd-Fix-supported-formats.patch @@ -1,4 +1,4 @@ -From 51f493ae71adc2c49a317a13c38e54e1cdf46005 Mon Sep 17 00:00:00 2001 +From fcb6cfd8694fe5eaaa625f391672bf02b1d2da80 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Thu, 30 Nov 2017 10:15:02 +0000 Subject: [PATCH] ASoC: codecs: msm8916-wcd: Fix supported formats @@ -11,22 +11,23 @@ this in the supported formats also remove 24bit sample from supported list. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c -index 5f3c42c4f74a..066ea2f4ce7b 100644 +index bc1a8a5d2356..f67c8dea9629 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c -@@ -267,7 +267,7 @@ +@@ -211,7 +211,7 @@ #define MSM8916_WCD_ANALOG_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000) #define MSM8916_WCD_ANALOG_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ - SNDRV_PCM_FMTBIT_S24_LE) + SNDRV_PCM_FMTBIT_S32_LE) - static int btn_mask = SND_JACK_BTN_0 | SND_JACK_BTN_1 | - SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_BTN_4; + static const char * const supply_names[] = { + "vdd-cdc-io", diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c -index a10a724eb448..13354d6304a8 100644 +index f690442af8c9..8ad7164e096b 100644 --- a/sound/soc/codecs/msm8916-wcd-digital.c +++ b/sound/soc/codecs/msm8916-wcd-digital.c @@ -194,7 +194,7 @@ @@ -38,7 +39,7 @@ index a10a724eb448..13354d6304a8 100644 struct msm8916_wcd_digital_priv { struct clk *ahbclk, *mclk; -@@ -645,7 +645,7 @@ static int msm8916_wcd_digital_hw_params(struct snd_pcm_substream *substream, +@@ -620,7 +620,7 @@ static int msm8916_wcd_digital_hw_params(struct snd_pcm_substream *substream, RX_I2S_CTL_RX_I2S_MODE_MASK, RX_I2S_CTL_RX_I2S_MODE_16); break; |