ASoC: WM8940: incorrect mask for BCLKDIV
Subsystems (3)
PATCH 1/1 ASoC: WM8940: incorrect mask for BCLKDIV
corrected bitmask in BCLKDIV setting (wm8940_set_dai_clkdiv) and bias_level in wm8940 register function.
best regards,
Grzegorz Daniluk
----
sound/soc/codecs/wm8940.c 2010-09-29 14:12:17.263497290 +0000 renamed from sound/soc/codecs/wm8940.c 2010-04-16 11:10:10.000000000 +0000 +5 -4
@@ -514,7 +514,7 @@ if ((Ndiv < 6) || (Ndiv > 12)) printk(KERN_WARNING - "WM8940 N value %d outwith recommended range!d\n", + "WM8940 N value %d outwith recommended range!\n", Ndiv); pll_div.n = Ndiv;
@@ -604,7 +604,7 @@ switch (div_id) { case WM8940_BCLKDIV: - reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFEF3; + reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3; ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2)); break; case WM8940_MCLKDIV:
@@ -800,9 +800,10 @@ wm8940_dai.dev = codec->dev; - wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + wm8940_set_bias_level(codec, SND_SOC_BIAS_PREPARE); - ret = snd_soc_write(codec, WM8940_POWER1, 0x180); + reg = snd_soc_read(codec, WM8940_POWER1); + ret = snd_soc_write(codec, WM8940_POWER1, reg | 0x180); if (ret < 0) return ret;
Quoted 2 lines · Grzegorz Daniluk
corrected bitmask in BCLKDIV setting (
wm8940_set_dai_clkdiv) andbias_levelin wm8940 register function.
This doesn't correspond to the contents of the patch?
You also need to provide a Signed-off-by for your patches - the meaning and purpose of this is covered in Documentation/SubmittingPatches. Please remember to CC maintainers on patches also.
sound/soc/codecs/wm8940.c 2010-09-29 14:12:17.263497290 +0000 line 520
Quoted 13 lines
----
diff -urNa/sound/soc/codecs/wm8940.cb/sound/soc/codecs/wm8940.csound/soc/codecs/wm8940.c 2010-09-29 14:12:17.263497290 +0000 renamed from sound/soc/codecs/wm8940.c 2010-04-16 11:10:10.000000000 +0000 +1
-1@@ -514,7 +514,7 @@ if ((Ndiv < 6) || (Ndiv > 12)) printk(KERN_WARNING - "WM8940 N value %d outwith recommended range!d\n", + "WM8940 N value %d outwith recommended range!\n", Ndiv); pll_div.n = Ndiv;
This is a typo fix, it's fine but should ideally be submitted as a separate patch and should at least be noted in the changelog.
sound/soc/codecs/wm8940.c 2010-09-29 14:12:17.263497290 +0000 line 610
Quoted 9 lines
sound/soc/codecs/wm8940.c 2010-09-29 14:12:17.263497290 +0000 renamed from sound/soc/codecs/wm8940.c 2010-04-16 11:10:10.000000000 +0000 +1
-1@@ -604,7 +604,7 @@ switch (div_id) { case WM8940_BCLKDIV: - reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFEF3; + reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3; ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2)); break; case WM8940_MCLKDIV:
This is the bit from the changelog, this looks like a good fix.
sound/soc/codecs/wm8940.c 2010-09-29 14:12:17.263497290 +0000 line 808
Quoted 12 lines
sound/soc/codecs/wm8940.c 2010-09-29 14:12:17.263497290 +0000 renamed from sound/soc/codecs/wm8940.c 2010-04-16 11:10:10.000000000 +0000 +3
-2@@ -800,9 +800,10 @@ wm8940_dai.dev = codec->dev; - wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + wm8940_set_bias_level(codec, SND_SOC_BIAS_PREPARE); - ret = snd_soc_write(codec, WM8940_POWER1, 0x180); + reg = snd_soc_read(codec, WM8940_POWER1); + ret = snd_soc_write(codec, WM8940_POWER1, reg | 0x180); if (ret < 0) return ret;
These are another separate change which wasn't mentioned in the changelog. I don't understand the purpose of this change but it doesn't look like a change I'd expect to see made.