Merge branch 'pxa' into devel

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig

3 files changed, 31 insertions, 11 deletions

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 484f883459e0..329b33f37ef3 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -48,6 +48,7 @@ config SND_PXA2XX_SOC_POODLE
 config SND_PXA2XX_SOC_TOSA
         tristate "SoC AC97 Audio support for Tosa"
         depends on SND_PXA2XX_SOC && MACH_TOSA
+        depends on MFD_TC6393XB
         select SND_PXA2XX_SOC_AC97
         select SND_SOC_WM9712
         help
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 425071030970..e130346732ba 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/initval.h>
@@ -40,6 +41,7 @@ struct pxa_i2s_port {
         u32 fmt;
 };
 static struct pxa_i2s_port pxa_i2s;
+static struct clk *clk_i2s;
 
 static struct pxa2xx_pcm_dma_params pxa2xx_i2s_pcm_stereo_out = {
         .name                   = "I2S PCM Stereo out",
@@ -82,6 +84,10 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
 
+        clk_i2s = clk_get(NULL, "I2SCLK");
+        if (IS_ERR(clk_i2s))
+                return PTR_ERR(clk_i2s);
+
         if (!cpu_dai->active) {
                 SACR0 |= SACR0_RST;
                 SACR0 = 0;
@@ -149,7 +155,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);
-        pxa_set_cken(CKEN_I2S, 1);
+        clk_enable(clk_i2s);
         pxa_i2s_wait();
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
@@ -234,8 +240,10 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream)
         if (SACR1 & (SACR1_DREC | SACR1_DRPL)) {
                 SACR0 &= ~SACR0_ENB;
                 pxa_i2s_wait();
-                pxa_set_cken(CKEN_I2S, 0);
+                clk_disable(clk_i2s);
         }
+
+        clk_put(clk_i2s);
 }
 
 #ifdef CONFIG_PM
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 7346d7e5d066..c1462c4d139b 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
+#include <linux/gpio.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -31,7 +32,7 @@
 #include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
-#include <asm/hardware/tmio.h>
+#include <asm/arch/tosa.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/audio.h>
@@ -138,10 +139,7 @@ static int tosa_set_spk(struct snd_kcontrol *kcontrol,
 static int tosa_hp_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *k, int event)
 {
-        if (SND_SOC_DAPM_EVENT_ON(event))
-                set_tc6393_gpio(&tc6393_device.dev,TOSA_TC6393_L_MUTE);
-        else
-                reset_tc6393_gpio(&tc6393_device.dev,TOSA_TC6393_L_MUTE);
+        gpio_set_value(TOSA_GPIO_L_MUTE, SND_SOC_DAPM_EVENT_ON(event) ? 1 :0);
         return 0;
 }
 
@@ -261,16 +259,28 @@ static int __init tosa_init(void)
         if (!machine_is_tosa())
                 return -ENODEV;
 
+        ret = gpio_request(TOSA_GPIO_L_MUTE, "Headphone Jack");
+        if (ret)
+                return ret;
+        gpio_direction_output(TOSA_GPIO_L_MUTE, 0);
+
         tosa_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!tosa_snd_device)
-                return -ENOMEM;
+        if (!tosa_snd_device) {
+                ret = -ENOMEM;
+                goto err_alloc;
+        }
 
         platform_set_drvdata(tosa_snd_device, &tosa_snd_devdata);
         tosa_snd_devdata.dev = &tosa_snd_device->dev;
         ret = platform_device_add(tosa_snd_device);
 
-        if (ret)
-                platform_device_put(tosa_snd_device);
+        if (!ret)
+                return 0;
+
+        platform_device_put(tosa_snd_device);
+
+err_alloc:
+        gpio_free(TOSA_GPIO_L_MUTE);
 
         return ret;
 }
@@ -278,6 +288,7 @@ static int __init tosa_init(void)
 static void __exit tosa_exit(void)
 {
         platform_device_unregister(tosa_snd_device);
+        gpio_free(TOSA_GPIO_L_MUTE);
 }
 
 module_init(tosa_init);