Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 42 insertions, 14 deletions

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index cad2c4c0ac95..a51058f66747 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>
@@ -75,7 +76,7 @@ static void poodle_ext_control(struct snd_soc_codec *codec)
 static int poodle_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->socdev->codec;
+        struct snd_soc_codec *codec = rtd->socdev->card->codec;
 
         /* check the jack status at stream startup */
         poodle_ext_control(codec);
@@ -238,19 +239,17 @@ static const struct snd_kcontrol_new wm8731_poodle_controls[] = {
  */
 static int poodle_wm8731_init(struct snd_soc_codec *codec)
 {
-        int i, err;
+        int err;
 
         snd_soc_dapm_nc_pin(codec, "LLINEIN");
         snd_soc_dapm_nc_pin(codec, "RLINEIN");
         snd_soc_dapm_enable_pin(codec, "MICIN");
 
         /* Add poodle specific controls */
-        for (i = 0; i < ARRAY_SIZE(wm8731_poodle_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                        snd_soc_cnew(&wm8731_poodle_controls[i], codec, NULL));
-                if (err < 0)
-                        return err;
-        }
+        err = snd_soc_add_controls(codec, wm8731_poodle_controls,
+                                ARRAY_SIZE(wm8731_poodle_controls));
+        if (err < 0)
+                return err;
 
         /* Add poodle specific widgets */
         snd_soc_dapm_new_controls(codec, wm8731_dapm_widgets,
@@ -281,17 +280,42 @@ static struct snd_soc_card snd_soc_poodle = {
         .num_links = 1,
 };
 
-/* poodle audio private data */
-static struct wm8731_setup_data poodle_wm8731_setup = {
-        .i2c_bus = 0,
-        .i2c_address = 0x1b,
-};
+/*
+ * FIXME: This is a temporary bodge to avoid cross-tree merge issues.
+ * New drivers should register the wm8731 I2C device in the machine
+ * setup code (under arch/arm for ARM systems).
+ */
+static int wm8731_i2c_register(void)
+{
+        struct i2c_board_info info;
+        struct i2c_adapter *adapter;
+        struct i2c_client *client;
+
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        info.addr = 0x1b;
+        strlcpy(info.type, "wm8731", I2C_NAME_SIZE);
+
+        adapter = i2c_get_adapter(0);
+        if (!adapter) {
+                printk(KERN_ERR "can't get i2c adapter 0\n");
+                return -ENODEV;
+        }
+
+        client = i2c_new_device(adapter, &info);
+        i2c_put_adapter(adapter);
+        if (!client) {
+                printk(KERN_ERR "can't add i2c device at 0x%x\n",
+                        (unsigned int)info.addr);
+                return -ENODEV;
+        }
+
+        return 0;
+}
 
 /* poodle audio subsystem */
 static struct snd_soc_device poodle_snd_devdata = {
         .card = &snd_soc_poodle,
         .codec_dev = &soc_codec_dev_wm8731,
-        .codec_data = &poodle_wm8731_setup,
 };
 
 static struct platform_device *poodle_snd_device;
@@ -303,6 +327,10 @@ static int __init poodle_init(void)
         if (!machine_is_poodle())
                 return -ENODEV;
 
+        ret = wm8731_i2c_register();
+        if (ret != 0)
+                return ret;
+
         locomo_gpio_set_dir(&poodle_locomo_device.dev,
                 POODLE_LOCOMO_GPIO_AMP_ON, 0);
         /* should we mute HP at startup - burning power ?*/