Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

3 files changed, 70 insertions, 50 deletions

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 0a53f72077fd..fa69faa886ef 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -18,13 +18,13 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
-#include <asm/hardware/scoop.h>
 #include <mach/pxa-regs.h>
 #include <mach/hardware.h>
 #include <mach/corgi.h>
@@ -54,8 +54,8 @@ static void corgi_ext_control(struct snd_soc_codec *codec)
         switch (corgi_jack_func) {
         case CORGI_HP:
                 /* set = unmute headphone */
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+                gpio_set_value(CORGI_GPIO_MUTE_L, 1);
+                gpio_set_value(CORGI_GPIO_MUTE_R, 1);
                 snd_soc_dapm_disable_pin(codec, "Mic Jack");
                 snd_soc_dapm_disable_pin(codec, "Line Jack");
                 snd_soc_dapm_enable_pin(codec, "Headphone Jack");
@@ -63,24 +63,24 @@ static void corgi_ext_control(struct snd_soc_codec *codec)
                 break;
         case CORGI_MIC:
                 /* reset = mute headphone */
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+                gpio_set_value(CORGI_GPIO_MUTE_L, 0);
+                gpio_set_value(CORGI_GPIO_MUTE_R, 0);
                 snd_soc_dapm_enable_pin(codec, "Mic Jack");
                 snd_soc_dapm_disable_pin(codec, "Line Jack");
                 snd_soc_dapm_disable_pin(codec, "Headphone Jack");
                 snd_soc_dapm_disable_pin(codec, "Headset Jack");
                 break;
         case CORGI_LINE:
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+                gpio_set_value(CORGI_GPIO_MUTE_L, 0);
+                gpio_set_value(CORGI_GPIO_MUTE_R, 0);
                 snd_soc_dapm_disable_pin(codec, "Mic Jack");
                 snd_soc_dapm_enable_pin(codec, "Line Jack");
                 snd_soc_dapm_disable_pin(codec, "Headphone Jack");
                 snd_soc_dapm_disable_pin(codec, "Headset Jack");
                 break;
         case CORGI_HEADSET:
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+                gpio_set_value(CORGI_GPIO_MUTE_L, 0);
+                gpio_set_value(CORGI_GPIO_MUTE_R, 1);
                 snd_soc_dapm_enable_pin(codec, "Mic Jack");
                 snd_soc_dapm_disable_pin(codec, "Line Jack");
                 snd_soc_dapm_disable_pin(codec, "Headphone Jack");
@@ -114,8 +114,8 @@ static int corgi_shutdown(struct snd_pcm_substream *substream)
         struct snd_soc_codec *codec = rtd->socdev->codec;
 
         /* set = unmute headphone */
-        set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
-        set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
+        gpio_set_value(CORGI_GPIO_MUTE_L, 1);
+        gpio_set_value(CORGI_GPIO_MUTE_R, 1);
         return 0;
 }
 
@@ -218,22 +218,14 @@ static int corgi_set_spk(struct snd_kcontrol *kcontrol,
 static int corgi_amp_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *k, int event)
 {
-        if (SND_SOC_DAPM_EVENT_ON(event))
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);
-        else
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);
-
+        gpio_set_value(CORGI_GPIO_APM_ON, SND_SOC_DAPM_EVENT_ON(event));
         return 0;
 }
 
 static int corgi_mic_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *k, int event)
 {
-        if (SND_SOC_DAPM_EVENT_ON(event))
-                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MIC_BIAS);
-        else
-                reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MIC_BIAS);
-
+        gpio_set_value(CORGI_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event));
         return 0;
 }
 
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 8548818eea08..c796b1882776 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -16,6 +16,7 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include <linux/platform_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/initval.h>
@@ -81,7 +82,6 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
 
-        clk_i2s = clk_get(NULL, "I2SCLK");
         if (IS_ERR(clk_i2s))
                 return PTR_ERR(clk_i2s);
 
@@ -152,6 +152,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
         pxa_gpio_mode(gpio_bus[pxa_i2s.master].tx);
         pxa_gpio_mode(gpio_bus[pxa_i2s.master].frm);
         pxa_gpio_mode(gpio_bus[pxa_i2s.master].clk);
+        BUG_ON(IS_ERR(clk_i2s));
         clk_enable(clk_i2s);
         pxa_i2s_wait();
 
@@ -317,6 +318,43 @@ struct snd_soc_dai pxa_i2s_dai = {
 
 EXPORT_SYMBOL_GPL(pxa_i2s_dai);
 
+static int pxa2xx_i2s_probe(struct platform_device *dev)
+{
+        clk_i2s = clk_get(&dev->dev, "I2SCLK");
+        return IS_ERR(clk_i2s) ? PTR_ERR(clk_i2s) : 0;
+}
+
+static int __devexit pxa2xx_i2s_remove(struct platform_device *dev)
+{
+        clk_put(clk_i2s);
+        clk_i2s = ERR_PTR(-ENOENT);
+        return 0;
+}
+
+static struct platform_driver pxa2xx_i2s_driver = {
+        .probe = pxa2xx_i2s_probe,
+        .remove = __devexit_p(pxa2xx_i2s_remove),
+
+        .driver = {
+                .name = "pxa2xx-i2s",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init pxa2xx_i2s_init(void)
+{
+        clk_i2s = ERR_PTR(-ENOENT);
+        return platform_driver_register(&pxa2xx_i2s_driver);
+}
+
+static void __exit pxa2xx_i2s_exit(void)
+{
+        platform_driver_unregister(&pxa2xx_i2s_driver);
+}
+
+module_init(pxa2xx_i2s_init);
+module_exit(pxa2xx_i2s_exit);
+
 /* Module information */
 MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com");
 MODULE_DESCRIPTION("pxa2xx I2S SoC Interface");
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 37cb768fc933..b89a3edd2183 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -19,16 +19,15 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
-#include <asm/hardware/scoop.h>
 #include <mach/pxa-regs.h>
 #include <mach/hardware.h>
-#include <mach/akita.h>
 #include <mach/spitz.h>
 #include "../codecs/wm8750.h"
 #include "pxa2xx-pcm.h"
@@ -63,8 +62,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                 snd_soc_dapm_disable_pin(codec, "Mic Jack");
                 snd_soc_dapm_disable_pin(codec, "Line Jack");
                 snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 1);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                 break;
         case SPITZ_MIC:
                 /* enable mic jack and bias, mute hp */
@@ -72,8 +71,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                 snd_soc_dapm_disable_pin(codec, "Headset Jack");
                 snd_soc_dapm_disable_pin(codec, "Line Jack");
                 snd_soc_dapm_enable_pin(codec, "Mic Jack");
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         case SPITZ_LINE:
                 /* enable line jack, disable mic bias and mute hp */
@@ -81,8 +80,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                 snd_soc_dapm_disable_pin(codec, "Headset Jack");
                 snd_soc_dapm_disable_pin(codec, "Mic Jack");
                 snd_soc_dapm_enable_pin(codec, "Line Jack");
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         case SPITZ_HEADSET:
                 /* enable and unmute headset jack enable mic bias, mute L hp */
@@ -90,8 +89,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                 snd_soc_dapm_enable_pin(codec, "Mic Jack");
                 snd_soc_dapm_disable_pin(codec, "Line Jack");
                 snd_soc_dapm_enable_pin(codec, "Headset Jack");
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
-                set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                 break;
         case SPITZ_HP_OFF:
 
@@ -100,8 +99,8 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
                 snd_soc_dapm_disable_pin(codec, "Headset Jack");
                 snd_soc_dapm_disable_pin(codec, "Mic Jack");
                 snd_soc_dapm_disable_pin(codec, "Line Jack");
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
-                reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
+                gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
+                gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         }
         snd_soc_dapm_sync(codec);
@@ -215,23 +214,14 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol,
 static int spitz_mic_bias(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *k, int event)
 {
-        if (machine_is_borzoi() || machine_is_spitz()) {
-                if (SND_SOC_DAPM_EVENT_ON(event))
-                        set_scoop_gpio(&spitzscoop2_device.dev,
-                                SPITZ_SCP2_MIC_BIAS);
-                else
-                        reset_scoop_gpio(&spitzscoop2_device.dev,
-                                SPITZ_SCP2_MIC_BIAS);
-        }
+        if (machine_is_borzoi() || machine_is_spitz())
+                gpio_set_value(SPITZ_GPIO_MIC_BIAS,
+                                SND_SOC_DAPM_EVENT_ON(event));
+
+        if (machine_is_akita())
+                gpio_set_value(AKITA_GPIO_MIC_BIAS,
+                                SND_SOC_DAPM_EVENT_ON(event));
 
-        if (machine_is_akita()) {
-                if (SND_SOC_DAPM_EVENT_ON(event))
-                        akita_set_ioexp(&akitaioexp_device.dev,
-                                AKITA_IOEXP_MIC_BIAS);
-                else
-                        akita_reset_ioexp(&akitaioexp_device.dev,
-                                AKITA_IOEXP_MIC_BIAS);
-        }
         return 0;
 }