aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManoj Vishwanathan2017-05-05 07:41:57 -0500
committerVishal Mahaveer2017-12-17 17:10:09 -0600
commita76e31e968ea2ceb0c29cdc2cf2aaf701d1df2bd (patch)
tree4727965aae20845de31e9da3178ede2ffcb063c0
parentab9f3f5a0efa1ca3ed35d6a9fea06d709dc8a3d9 (diff)
downloadkernel-omap-a76e31e968ea2ceb0c29cdc2cf2aaf701d1df2bd.tar.gz
kernel-omap-a76e31e968ea2ceb0c29cdc2cf2aaf701d1df2bd.tar.xz
kernel-omap-a76e31e968ea2ceb0c29cdc2cf2aaf701d1df2bd.zip
dra71x: lcard: Change sound card setting for stereo
Change the Audio format from I2S to DSP_B in dts. Slot size was not being masked in in hw_params, fix that as well. Change-Id: Ida80a87c1cccee544fa4c3e3b4f8007cd8b276ec Signed-off-by: Manoj Vishwanathan <m-vishwanathan@ti.com>
-rw-r--r--arch/arm/boot/dts/dra71-lcard.dts2
-rw-r--r--sound/soc/codecs/tas6424.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dra71-lcard.dts b/arch/arm/boot/dts/dra71-lcard.dts
index 4e001b7b5cdf..7bc2bce650bc 100644
--- a/arch/arm/boot/dts/dra71-lcard.dts
+++ b/arch/arm/boot/dts/dra71-lcard.dts
@@ -197,7 +197,7 @@
197 snd0: sound@0 { 197 snd0: sound@0 {
198 compatible = "simple-audio-card"; 198 compatible = "simple-audio-card";
199 simple-audio-card,name = "DRA7xx-LCARD"; 199 simple-audio-card,name = "DRA7xx-LCARD";
200 simple-audio-card,format = "i2s"; 200 simple-audio-card,format = "dsp_b";
201 simple-audio-card,bitclock-master = <&sound0_master>; 201 simple-audio-card,bitclock-master = <&sound0_master>;
202 simple-audio-card,frame-master = <&sound0_master>; 202 simple-audio-card,frame-master = <&sound0_master>;
203 203
diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c
index 3e3077cf7b7b..31b373551638 100644
--- a/sound/soc/codecs/tas6424.c
+++ b/sound/soc/codecs/tas6424.c
@@ -107,7 +107,7 @@ static int tas6424_hw_params(struct snd_pcm_substream *substream,
107 } 107 }
108 108
109 ret = snd_soc_update_bits(codec, TAS6424_SAP_CTRL_REG, 109 ret = snd_soc_update_bits(codec, TAS6424_SAP_CTRL_REG,
110 TAS6424_SAP_RATE_MASK, sap_ctrl); 110 TAS6424_SAP_RATE_MASK|TAS6424_SAP_TDM_SLOT_SZ_16, sap_ctrl);
111 if (ret < 0) { 111 if (ret < 0) {
112 dev_err(codec->dev, "error setting sample rate: %d\n", ret); 112 dev_err(codec->dev, "error setting sample rate: %d\n", ret);
113 return ret; 113 return ret;