Skip to contentSkip to conversation

ASoC updates for 2.6.30

PATCH In review Mark Brown 3 participants 6 messages Feb 18, 2009

Subsystems (4)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

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 +
author
#1 lore raw

PATCH 1/2 ASoC: Include I2C headers for corgi and poodle

---
 sound/soc/pxa/corgi.c  |    1 +
 sound/soc/pxa/poodle.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
sound/soc/pxa/corgi.c +1 -0
index eaa6691..2a309c7 100644
@@ -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>
sound/soc/pxa/poodle.c +1 -0
index fd683a0..10e3d70 100644
@@ -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>
Signature · 1 line
1.5.6.3
author
#2 lore raw

PATCH 2/2 ASoC: Implement SPI device unregistration for WM8731

Completely untested.

---
 sound/soc/codecs/wm8731.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
sound/soc/codecs/wm8731.c +6 -1
index a2c478e..4191bdb 100644
@@ -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;
 }
 
Signature · 1 line
1.5.6.3
#3 lore raw

Re: [PATCH 1/2] ASoC: Include I2C headers for corgi and poodle

In reply to Mark Brown

At Wed, 18 Feb 2009 12:56:26 +0000,

Quoted 6 lines · Mark Brown
---
 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

#4 lore raw

Re: [PATCH 1/2] ASoC: Include I2C headers for corgi and poodle

Quoted 6 lines · Takashi Iwai

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(-)
#5 lore raw

Re: [PATCH 1/2] ASoC: Include I2C headers for corgi and poodle

At Wed, 18 Feb 2009 14:56:57 +0000,

Quoted 13 lines · Mark Brown
Quoted 6 lines · Takashi Iwai

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.

Quoted 7 lines

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