[alsa-devel] ASoC updates for 2.6.30
The following changes since commit 59544d33ff3118f22a484d8be06cdf5cfc2fdca5: Mark Brown (1): ASoC: Remove version display from the WM8753 driver
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30
Mark Brown (2): ASoC: Include I2C headers for corgi and poodle ASoC: Implement SPI device unregistration for WM8731
sound/soc/codecs/wm8731.c | 7 ++++++- sound/soc/pxa/corgi.c | 1 + sound/soc/pxa/poodle.c | 1 +
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/pxa/corgi.c | 1 + sound/soc/pxa/poodle.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index eaa6691..2a309c7 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c @@ -16,6 +16,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/timer.h> +#include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/gpio.h> diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index fd683a0..10e3d70 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/timer.h> +#include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/platform_device.h> #include <sound/core.h>
Completely untested.
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/codecs/wm8731.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index a2c478e..4191bdb 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -655,12 +655,17 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi) codec->hw_write = (hw_write_t)wm8731_spi_write; codec->dev = &spi->dev;
+ spi->dev.driver_data = wm8731; + return wm8731_register(wm8731); }
static int __devexit wm8731_spi_remove(struct spi_device *spi) { - /* FIXME: This isn't actually implemented... */ + struct wm8731_priv *wm8731 = spi->dev.driver_data; + + wm8731_unregister(wm8731); + return 0; }
At Wed, 18 Feb 2009 12:56:26 +0000, Mark Brown wrote:
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com
sound/soc/pxa/corgi.c | 1 + sound/soc/pxa/poodle.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
Better, but now get other errors.
sound/soc/pxa/corgi.c:369: error: implicit declaration of function 'wm8731_i2c_setup' sound/soc/pxa/poodle.c:334: error: implicit declaration of function 'wm8731_i2c_setup'
Looks like a typo of wm8731_i2c_register().
Takashi
On Wed, Feb 18, 2009 at 02:00:35PM +0100, Takashi Iwai wrote:
Better, but now get other errors.
sound/soc/pxa/corgi.c:369: error: implicit declaration of function 'wm8731_i2c_setup' sound/soc/pxa/poodle.c:334: error: implicit declaration of function 'wm8731_i2c_setup'
Looks like a typo of wm8731_i2c_register().
Yes, it is. Pushed out a fixed version - your .config worked, looks like whatever caused me problems in the past has been fixed.
The following changes since commit 59544d33ff3118f22a484d8be06cdf5cfc2fdca5: Mark Brown (1): ASoC: Remove version display from the WM8753 driver
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30
Mark Brown (2): ASoC: Fix build for corgi and poodle ASoC: Implement SPI device unregistration for WM8731
sound/soc/codecs/wm8731.c | 7 ++++++- sound/soc/pxa/corgi.c | 3 ++- sound/soc/pxa/poodle.c | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-)
At Wed, 18 Feb 2009 14:56:57 +0000, Mark Brown wrote:
On Wed, Feb 18, 2009 at 02:00:35PM +0100, Takashi Iwai wrote:
Better, but now get other errors.
sound/soc/pxa/corgi.c:369: error: implicit declaration of function 'wm8731_i2c_setup' sound/soc/pxa/poodle.c:334: error: implicit declaration of function 'wm8731_i2c_setup'
Looks like a typo of wm8731_i2c_register().
Yes, it is. Pushed out a fixed version - your .config worked, looks like whatever caused me problems in the past has been fixed.
The following changes since commit 59544d33ff3118f22a484d8be06cdf5cfc2fdca5: Mark Brown (1): ASoC: Remove version display from the WM8753 driver
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30
Thanks, pulled now.
Takashi
participants (3)
-
Mark Brown -
Mark Brown -
Takashi Iwai