Commit Graph

68 Commits

Author SHA1 Message Date
Mark Brown
4c0bccbe66 Merge branch 'upstream/wm8974' into for-2.6.33 2009-09-30 15:48:38 +01:00
Mark Brown
c36b2fc73a ASoC: Clean up WM8974 PLL configuration
Don't use a static for WM8974 PLL factors - we don't support more than
one device so it won't happen but no sense in leaving the race condition
hanging around.  Also, pre_div is a single bit and it's a bit simpler if
we move the handling of the factor of 4 in the output into the
coefficient setup.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-09-30 15:45:25 +01:00
Mark Brown
9f072b7b22 Merge branch 'for-2.6.32' into for-2.6.33 2009-09-18 15:09:44 +01:00
Huang Weiyi
d4e54e871f ASoC: remove unused #include <linux/version.h>
Remove unused #include <linux/version.h>('s) in
  sound/soc/codecs/ad1836.c
  sound/soc/codecs/ad1938.c
  sound/soc/codecs/wm8974.c

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-09-16 21:08:54 +01:00
Mark Brown
85488037bb ASoC: Add source argument to PLL configuration
More and more devices feature PLLs and FLLs with the ability to select
between multiple input clocks. In order to better support these devices
a new argument, source, has been added to the set_pll() configuration
API. Using set_clkdiv() is often difficult due to the need to stop the
PLL/FLL before any reconfiguration can be done.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-09-05 18:52:16 +01:00
Mark Brown
1e97f50b70 ASoC: Factor out cache I/O from WM8974
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-08-15 12:15:10 +01:00
javier Martin
25cbf46520 ASoC: Correct a bug with "ADC Inversion Switch" in wm8974 codec.
This corrects a bug with ADC Inversion Switch in wm8974 codec.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-07-22 00:13:27 +01:00
Mark Brown
8a123ee2a4 ASoC: WM8974 DAPM cleanups
Also implement AUX mode control.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-06-30 21:30:42 +01:00
Mark Brown
8b83a19367 ASoC: WM8974 cosmetic cleanups
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-06-30 21:30:35 +01:00
Mark Brown
cb11d39ead ASoC: Use symmetric rates for WM8974
The chip has a single LRCLK.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-06-30 21:30:25 +01:00
Mark Brown
a5f8d2f1b8 ASoC: Add WM8974 TLV information
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-06-30 19:34:32 +01:00
Mark Brown
91d0c3ecba ASoC: Refresh WM8974 PLL configuration
Move away from a fixed table to runtime calculation.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-06-30 19:34:23 +01:00
Mark Brown
33d81af4d1 ASoC: Declare 2 channels for WM8974
The device is a mono device but it can read two channel data and
many I2S controllers only understand 2 channels.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-06-30 19:34:16 +01:00
Mark Brown
df1ef7a38d ASoC: Refresh WM8974 bias configuration
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-06-30 19:34:09 +01:00
Mark Brown
372a14a4a4 ASoC: Remove unreferenced wm8974_add_controls()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-06-29 16:14:19 +01:00
Mark Brown
4fcbbb67a3 ASoC: Update WM8974 to use standard I2C device probe methods
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-05-23 16:43:12 +01:00
Mark Brown
1a55b3f6ed ASoC: WM8974 checkpatch cleanups
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-05-23 11:31:40 +01:00
Mark Brown
0a1bf55335 ASoC: Add WM8974 CODEC driver
The WM8974 is a low power, high quality mono CODEC designed for portable
applications such as digital still cameras or digital voice recorders.

This driver was originally written by Graeme Gregory and Liam Girdwood
and has since been maintained by myself with some updates contributed by
Brett Saunders and Javier Martin.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-05-23 11:28:03 +01:00