From 779ad85447161c8accca5075cba2e86d2f6412e7 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 8 Feb 2012 19:02:24 +0000 Subject: [PATCH] --- yaml --- r: 293312 b: refs/heads/master c: 4c6c0b5eee572a24345fdd1fac6aa670cc937a3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8962.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8ed176f79430..a554db6ac3fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d6761aa9b36e2da18669b9948ee6849064a84e9 +refs/heads/master: 4c6c0b5eee572a24345fdd1fac6aa670cc937a3a diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c index 25b6baed3a29..5e3795d7cdb8 100644 --- a/trunk/sound/soc/codecs/wm8962.c +++ b/trunk/sound/soc/codecs/wm8962.c @@ -2634,6 +2634,9 @@ static int wm8962_hw_params(struct snd_pcm_substream *substream, int adctl3 = 0; wm8962->bclk = snd_soc_params_to_bclk(params); + if (params_channels(params) == 1) + wm8962->bclk *= 2; + wm8962->lrclk = params_rate(params); for (i = 0; i < ARRAY_SIZE(sr_vals); i++) { @@ -3008,14 +3011,14 @@ static struct snd_soc_dai_driver wm8962_dai = { .name = "wm8962", .playback = { .stream_name = "Playback", - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = WM8962_RATES, .formats = WM8962_FORMATS, }, .capture = { .stream_name = "Capture", - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = WM8962_RATES, .formats = WM8962_FORMATS,