From 933a98eb3b16c99eaf0ce7862e921035f43155b7 Mon Sep 17 00:00:00 2001 From: Michal Bachraty Date: Fri, 19 Apr 2013 15:28:44 +0200 Subject: [PATCH] --- yaml --- r: 372041 b: refs/heads/master c: d486fea6babfe3ff0c382c9e4baf18f535fcee7d h: refs/heads/master i: 372039: dc7717c77004925903930b9f6b5b9bd0203ea839 v: v3 --- [refs] | 2 +- trunk/sound/soc/davinci/davinci-mcasp.c | 7 ++++--- trunk/sound/soc/davinci/davinci-mcasp.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 35aec9af9d11..dd7eb08a96c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c21a78104d7f2c155e2c12279282f659d773d05 +refs/heads/master: d486fea6babfe3ff0c382c9e4baf18f535fcee7d diff --git a/trunk/sound/soc/davinci/davinci-mcasp.c b/trunk/sound/soc/davinci/davinci-mcasp.c index 59143373afc6..8b85049daab0 100644 --- a/trunk/sound/soc/davinci/davinci-mcasp.c +++ b/trunk/sound/soc/davinci/davinci-mcasp.c @@ -636,11 +636,12 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev, * callback, take it into account here. That allows us to for example * send 32 bits per channel to the codec, while only 16 of them carry * audio payload. - * The clock ratio is given for a full period of data (both left and - * right channels), so it has to be divided by 2. + * The clock ratio is given for a full period of data (for I2S format + * both left and right channels), so it has to be divided by number of + * tdm-slots (for I2S - divided by 2). */ if (dev->bclk_lrclk_ratio) - word_length = dev->bclk_lrclk_ratio / 2; + word_length = dev->bclk_lrclk_ratio / dev->tdm_slots; /* mapping of the XSSZ bit-field as described in the datasheet */ fmt = (word_length >> 1) - 1; diff --git a/trunk/sound/soc/davinci/davinci-mcasp.h b/trunk/sound/soc/davinci/davinci-mcasp.h index 0edd3b5a37fd..a9ac0c11da71 100644 --- a/trunk/sound/soc/davinci/davinci-mcasp.h +++ b/trunk/sound/soc/davinci/davinci-mcasp.h @@ -38,7 +38,7 @@ struct davinci_audio_dev { u8 num_serializer; u8 *serial_dir; u8 version; - u8 bclk_lrclk_ratio; + u16 bclk_lrclk_ratio; /* McASP FIFO related */ u8 txnumevt;