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

Unverified Commit 51f493ae authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs: msm8916-wcd: Fix supported formats 



This codec is configurable for only 16 bit and 32 bit samples, so reflect
this in the supported formats also remove 24bit sample from supported list.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent 4fbd8d19

sound/soc/codecs/msm8916-wcd-analog.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,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;

sound/soc/codecs/msm8916-wcd-digital.c

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ 
				   SNDRV_PCM_RATE_32000 | \

				   SNDRV_PCM_RATE_48000)

#define MSM8916_WCD_DIGITAL_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\

				     SNDRV_PCM_FMTBIT_S24_LE)

				     SNDRV_PCM_FMTBIT_S32_LE)



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, 
				    RX_I2S_CTL_RX_I2S_MODE_MASK,

				    RX_I2S_CTL_RX_I2S_MODE_16);

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

	case SNDRV_PCM_FORMAT_S32_LE:

		snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,

				    TX_I2S_CTL_TX_I2S_MODE_MASK,

				    TX_I2S_CTL_TX_I2S_MODE_32);