6 files changed, 270 insertions, 4 deletions

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 83be4a76d2bb..d542ea2ff6be 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -98,6 +98,15 @@ config SND_OMAP_SOC_SDP3430
           Say Y if you want to add support for SoC audio on Texas Instruments
           SDP3430.
 
+config SND_OMAP_SOC_SDP4430
+        tristate "SoC Audio support for Texas Instruments SDP4430"
+        depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_4430SDP
+        select SND_OMAP_SOC_MCPDM
+        select SND_SOC_TWL6040
+        help
+          Say Y if you want to add support for SoC audio on Texas Instruments
+          SDP4430.
+
 config SND_OMAP_SOC_OMAP3_PANDORA
         tristate "SoC Audio support for OMAP3 Pandora"
         depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_PANDORA
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index 3a75755f25e4..ba9fc650db28 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -17,6 +17,7 @@ snd-soc-omap2evm-objs := omap2evm.o
 snd-soc-omap3evm-objs := omap3evm.o
 snd-soc-am3517evm-objs := am3517evm.o
 snd-soc-sdp3430-objs := sdp3430.o
+snd-soc-sdp4430-objs := sdp4430.o
 snd-soc-omap3pandora-objs := omap3pandora.o
 snd-soc-omap3beagle-objs := omap3beagle.o
 snd-soc-zoom2-objs := zoom2.o
@@ -31,6 +32,7 @@ obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o
 obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o
 obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o
+obj-$(CONFIG_SND_OMAP_SOC_SDP4430) += snd-soc-sdp4430.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o
 obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o
diff --git a/sound/soc/omap/mcpdm.c b/sound/soc/omap/mcpdm.c
index 479d3b6306d7..90b8bf71c893 100644
--- a/sound/soc/omap/mcpdm.c
+++ b/sound/soc/omap/mcpdm.c
@@ -25,6 +25,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/wait.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
 #include <linux/clk.h>
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 2d33a89f147a..6f44cb4d30b8 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -320,8 +320,18 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
         omap_mcbsp_dai_dma_params[id][substream->stream].dma_req = dma;
         omap_mcbsp_dai_dma_params[id][substream->stream].port_addr = port;
         omap_mcbsp_dai_dma_params[id][substream->stream].sync_mode = sync_mode;
-        omap_mcbsp_dai_dma_params[id][substream->stream].data_type =
-                                                        OMAP_DMA_DATA_TYPE_S16;
+        switch (params_format(params)) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                omap_mcbsp_dai_dma_params[id][substream->stream].data_type =
+                         OMAP_DMA_DATA_TYPE_S16;
+                break;
+        case SNDRV_PCM_FORMAT_S32_LE:
+                omap_mcbsp_dai_dma_params[id][substream->stream].data_type =
+                         OMAP_DMA_DATA_TYPE_S32;
+                break;
+        default:
+                return -EINVAL;
+        }
 
         snd_soc_dai_set_dma_data(cpu_dai, substream,
                 &omap_mcbsp_dai_dma_params[id][substream->stream]);
@@ -356,6 +366,14 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                 regs->xcr2      |= XWDLEN2(OMAP_MCBSP_WORD_16);
                 regs->xcr1      |= XWDLEN1(OMAP_MCBSP_WORD_16);
                 break;
+        case SNDRV_PCM_FORMAT_S32_LE:
+                /* Set word lengths */
+                wlen = 32;
+                regs->rcr2      |= RWDLEN2(OMAP_MCBSP_WORD_32);
+                regs->rcr1      |= RWDLEN1(OMAP_MCBSP_WORD_32);
+                regs->xcr2      |= XWDLEN2(OMAP_MCBSP_WORD_32);
+                regs->xcr1      |= XWDLEN1(OMAP_MCBSP_WORD_32);
+                break;
         default:
                 /* Unsupported PCM format */
                 return -EINVAL;
@@ -659,13 +677,15 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = {
                 .channels_min = 1,                              \
                 .channels_max = 16,                             \
                 .rates = OMAP_MCBSP_RATES,                      \
-                .formats = SNDRV_PCM_FMTBIT_S16_LE,             \
+                .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
+                           SNDRV_PCM_FMTBIT_S32_LE,             \
         },                                                      \
         .capture = {                                            \
                 .channels_min = 1,                              \
                 .channels_max = 16,                             \
                 .rates = OMAP_MCBSP_RATES,                      \
-                .formats = SNDRV_PCM_FMTBIT_S16_LE,             \
+                .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
+                           SNDRV_PCM_FMTBIT_S32_LE,             \
         },                                                      \
         .ops = &omap_mcbsp_dai_ops,                             \
         .private_data = &mcbsp_data[(link_id)].bus_id,          \
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 39456447132c..1e521904ea64 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -23,6 +23,7 @@
  */
 
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
new file mode 100644
index 000000000000..4ebbde6b565f
--- /dev/null
+++ b/sound/soc/omap/sdp4430.c
@@ -0,0 +1,233 @@
+/*
+ * sdp4430.c  --  SoC audio for TI OMAP4430 SDP
+ *
+ * Author: Misael Lopez Cruz <x0052729@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+#include <asm/mach-types.h>
+#include <plat/hardware.h>
+#include <plat/mux.h>
+
+#include "mcpdm.h"
+#include "omap-mcpdm.h"
+#include "omap-pcm.h"
+#include "../codecs/twl6040.h"
+
+static int twl6040_power_mode;
+
+static int sdp4430_hw_params(struct snd_pcm_substream *substream,
+        struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
+        int clk_id, freq;
+        int ret;
+
+        if (twl6040_power_mode) {
+                clk_id = TWL6040_SYSCLK_SEL_HPPLL;
+                freq = 38400000;
+        } else {
+                clk_id = TWL6040_SYSCLK_SEL_LPPLL;
+                freq = 32768;
+        }
+
+        /* set the codec mclk */
+        ret = snd_soc_dai_set_sysclk(codec_dai, clk_id, freq,
+                                SND_SOC_CLOCK_IN);
+        if (ret) {
+                printk(KERN_ERR "can't set codec system clock\n");
+                return ret;
+        }
+}
+
+static struct snd_soc_ops sdp4430_ops = {
+        .hw_params = sdp4430_hw_params,
+};
+
+static int sdp4430_get_power_mode(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        ucontrol->value.integer.value[0] = twl6040_power_mode;
+        return 0;
+}
+
+static int sdp4430_set_power_mode(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        if (twl6040_power_mode == ucontrol->value.integer.value[0])
+                return 0;
+
+        twl6040_power_mode = ucontrol->value.integer.value[0];
+
+        return 1;
+}
+
+static const char *power_texts[] = {"Low-Power", "High-Performance"};
+
+static const struct soc_enum sdp4430_enum[] = {
+        SOC_ENUM_SINGLE_EXT(2, power_texts),
+};
+
+static const struct snd_kcontrol_new sdp4430_controls[] = {
+        SOC_ENUM_EXT("TWL6040 Power Mode", sdp4430_enum[0],
+                sdp4430_get_power_mode, sdp4430_set_power_mode),
+};
+
+/* SDP4430 machine DAPM */
+static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = {
+        SND_SOC_DAPM_MIC("Ext Mic", NULL),
+        SND_SOC_DAPM_SPK("Ext Spk", NULL),
+        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+        SND_SOC_DAPM_HP("Headset Stereophone", NULL),
+        SND_SOC_DAPM_SPK("Earphone Spk", NULL),
+};
+
+static const struct snd_soc_dapm_route audio_map[] = {
+        /* External Mics: MAINMIC, SUBMIC with bias*/
+        {"MAINMIC", NULL, "Main Mic Bias"},
+        {"SUBMIC", NULL, "Main Mic Bias"},
+        {"Main Mic Bias", NULL, "Ext Mic"},
+
+        /* External Speakers: HFL, HFR */
+        {"Ext Spk", NULL, "HFL"},
+        {"Ext Spk", NULL, "HFR"},
+
+        /* Headset Mic: HSMIC with bias */
+        {"HSMIC", NULL, "Headset Mic Bias"},
+        {"Headset Mic Bias", NULL, "Headset Mic"},
+
+        /* Headset Stereophone (Headphone): HSOL, HSOR */
+        {"Headset Stereophone", NULL, "HSOL"},
+        {"Headset Stereophone", NULL, "HSOR"},
+
+        /* Earphone speaker */
+        {"Earphone Spk", NULL, "EP"},
+};
+
+static int sdp4430_twl6040_init(struct snd_soc_codec *codec)
+{
+        int ret;
+
+        /* Add SDP4430 specific controls */
+        ret = snd_soc_add_controls(codec, sdp4430_controls,
+                                ARRAY_SIZE(sdp4430_controls));
+        if (ret)
+                return ret;
+
+        /* Add SDP4430 specific widgets */
+        ret = snd_soc_dapm_new_controls(codec, sdp4430_twl6040_dapm_widgets,
+                                ARRAY_SIZE(sdp4430_twl6040_dapm_widgets));
+        if (ret)
+                return ret;
+
+        /* Set up SDP4430 specific audio path audio_map */
+        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+
+        /* SDP4430 connected pins */
+        snd_soc_dapm_enable_pin(codec, "Ext Mic");
+        snd_soc_dapm_enable_pin(codec, "Ext Spk");
+        snd_soc_dapm_enable_pin(codec, "Headset Mic");
+        snd_soc_dapm_enable_pin(codec, "Headset Stereophone");
+
+        /* TWL6040 not connected pins */
+        snd_soc_dapm_nc_pin(codec, "AFML");
+        snd_soc_dapm_nc_pin(codec, "AFMR");
+
+        ret = snd_soc_dapm_sync(codec);
+
+        return ret;
+}
+
+/* Digital audio interface glue - connects codec <--> CPU */
+static struct snd_soc_dai_link sdp4430_dai = {
+        .name = "TWL6040",
+        .stream_name = "TWL6040",
+        .cpu_dai = &omap_mcpdm_dai,
+        .codec_dai = &twl6040_dai,
+        .init = sdp4430_twl6040_init,
+        .ops = &sdp4430_ops,
+};
+
+/* Audio machine driver */
+static struct snd_soc_card snd_soc_sdp4430 = {
+        .name = "SDP4430",
+        .platform = &omap_soc_platform,
+        .dai_link = &sdp4430_dai,
+        .num_links = 1,
+};
+
+/* Audio subsystem */
+static struct snd_soc_device sdp4430_snd_devdata = {
+        .card = &snd_soc_sdp4430,
+        .codec_dev = &soc_codec_dev_twl6040,
+};
+
+static struct platform_device *sdp4430_snd_device;
+
+static int __init sdp4430_soc_init(void)
+{
+        int ret;
+
+        if (!machine_is_omap_4430sdp()) {
+                pr_debug("Not SDP4430!\n");
+                return -ENODEV;
+        }
+        printk(KERN_INFO "SDP4430 SoC init\n");
+
+        sdp4430_snd_device = platform_device_alloc("soc-audio", -1);
+        if (!sdp4430_snd_device) {
+                printk(KERN_ERR "Platform device allocation failed\n");
+                return -ENOMEM;
+        }
+
+        platform_set_drvdata(sdp4430_snd_device, &sdp4430_snd_devdata);
+        sdp4430_snd_devdata.dev = &sdp4430_snd_device->dev;
+
+        ret = platform_device_add(sdp4430_snd_device);
+        if (ret)
+                goto err;
+
+        /* Codec starts in HP mode */
+        twl6040_power_mode = 1;
+
+        return 0;
+
+err:
+        printk(KERN_ERR "Unable to add platform device\n");
+        platform_device_put(sdp4430_snd_device);
+        return ret;
+}
+module_init(sdp4430_soc_init);
+
+static void __exit sdp4430_soc_exit(void)
+{
+        platform_device_unregister(sdp4430_snd_device);
+}
+module_exit(sdp4430_soc_exit);
+
+MODULE_AUTHOR("Misael Lopez Cruz <x0052729@ti.com>");
+MODULE_DESCRIPTION("ALSA SoC SDP4430");
+MODULE_LICENSE("GPL");
+