diff options
| author | Vijay Mali <vmali@nvidia.com> | 2013-02-14 11:41:05 +0530 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-03-01 12:45:49 -0800 |
| commit | 63788161d7a5d98b164e170f44f0835ac2b10ea2 (patch) | |
| tree | d9f1788ff3cfb56dd73a98e111d122badecb21b0 /sound | |
| parent | 2552d1b51485daba66ac80f261427af3d4d61fa8 (diff) | |
asoc: codecs: Set ASI1 I2S Port as Master
Remove code for seting WCLK and BCLK divisor.
AIC3262 firmware should configure the divisors.
Bug 1235898
Change-Id: I89abdbb07372b36573048b8a1fca149173a82f07
Signed-off-by: Vijay Mali <vmali@nvidia.com>
Reviewed-on: http://git-master/r/200683
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/tlv320aic326x.c | 11 | ||||
| -rw-r--r-- | sound/soc/codecs/tlv320aic326x.h | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sound/soc/codecs/tlv320aic326x.c b/sound/soc/codecs/tlv320aic326x.c index b6ce31419319..38380a80c1b4 100644 --- a/sound/soc/codecs/tlv320aic326x.c +++ b/sound/soc/codecs/tlv320aic326x.c @@ -2214,8 +2214,7 @@ int aic3262_hw_params(struct snd_pcm_substream *substream, value = value | 0xC0; break; default: - bclk_div = 0x04; - wclk_div = 0x20; + break; } mutex_lock(&aic3262->mutex); @@ -2223,12 +2222,12 @@ int aic3262_hw_params(struct snd_pcm_substream *substream, snd_soc_update_bits(codec, AIC3262_ASI1_CHNL_SETUP, AIC3262_ASI1_CHNL_MASK, value); - snd_soc_update_bits(codec, AIC3262_ASI1_BCLK_N, + if (channels > 2) { + snd_soc_update_bits(codec, AIC3262_ASI1_BCLK_N, AIC3262_ASI1_BCLK_N_MASK, bclk_div); - - snd_soc_update_bits(codec, AIC3262_ASI1_WCLK_N, + snd_soc_update_bits(codec, AIC3262_ASI1_WCLK_N, AIC3262_ASI1_WCLK_N_MASK, wclk_div); - + } val = snd_soc_read(codec, AIC3262_ASI1_BUS_FMT); val = snd_soc_read(codec, AIC3262_ASI1_CHNL_SETUP); diff --git a/sound/soc/codecs/tlv320aic326x.h b/sound/soc/codecs/tlv320aic326x.h index e8d11a531f7c..b8c57f8e4e53 100644 --- a/sound/soc/codecs/tlv320aic326x.h +++ b/sound/soc/codecs/tlv320aic326x.h @@ -35,8 +35,8 @@ #define AIC3262_VERSION "1.1" /* Macro to enable the inclusion of tiload kernel driver */ #define AIC3262_TiLoad +#define AIC3262_ASI1_MASTER #undef AIC3262_SYNC_MODE -#undef AIC3262_ASI1_MASTER #undef AIC3262_ASI2_MASTER #undef AIC3262_ASI3_MASTER /* Macro for McBsp master / slave configuration */ |