summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-04 18:58:04 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-04 19:15:44 +0100
commit949e6bc75fea779b433679601641ea641456283b (patch)
treefd6061f54fe678b2925d6ddfeb64896da296b7b5
parent1520ffd218f4aa53bc7652c0f6454da3cb428337 (diff)
downloadlinux-3.10-949e6bc75fea779b433679601641ea641456283b.tar.gz
linux-3.10-949e6bc75fea779b433679601641ea641456283b.tar.bz2
linux-3.10-949e6bc75fea779b433679601641ea641456283b.zip
ASoC: arizona: Rename current rates tables to bclk_rates
They're the rates for the BCLK, not for the sample rate, so rename so that we don't confuse ourselves. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/arizona.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 3b5730b9068..67760b4ea24 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -363,7 +363,7 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
return 0;
}
-static const int arizona_48k_rates[] = {
+static const int arizona_48k_bclk_rates[] = {
-1,
48000,
64000,
@@ -385,7 +385,7 @@ static const int arizona_48k_rates[] = {
24576000,
};
-static const int arizona_44k1_rates[] = {
+static const int arizona_44k1_bclk_rates[] = {
-1,
44100,
58800,
@@ -445,17 +445,17 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
int bclk, lrclk, wl, frame, sr_val;
if (params_rate(params) % 8000)
- rates = &arizona_44k1_rates[0];
+ rates = &arizona_44k1_bclk_rates[0];
else
- rates = &arizona_48k_rates[0];
+ rates = &arizona_48k_bclk_rates[0];
- for (i = 0; i < ARRAY_SIZE(arizona_44k1_rates); i++) {
+ for (i = 0; i < ARRAY_SIZE(arizona_44k1_bclk_rates); i++) {
if (rates[i] == snd_soc_params_to_bclk(params)) {
bclk = i;
break;
}
}
- if (i == ARRAY_SIZE(arizona_44k1_rates)) {
+ if (i == ARRAY_SIZE(arizona_44k1_bclk_rates)) {
arizona_aif_err(dai, "Unsupported sample rate %dHz\n",
params_rate(params));
return -EINVAL;