4 files changed, 154 insertions, 2 deletions

diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 16ec2a2dba4d..8f49e165f4d1 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -11,10 +11,19 @@ config SND_KIRKWOOD_SOC_I2S
 
 config SND_KIRKWOOD_SOC_OPENRD
         tristate "SoC Audio support for Kirkwood Openrd Client"
-        depends on SND_KIRKWOOD_SOC && MACH_OPENRD_CLIENT
+        depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)
         select SND_KIRKWOOD_SOC_I2S
         select SND_SOC_CS42L51
         help
           Say Y if you want to add support for SoC audio on
           Openrd Client.
 
+config SND_KIRKWOOD_SOC_T5325
+        tristate "SoC Audio support for HP t5325"
+        depends on SND_KIRKWOOD_SOC && MACH_T5325
+        select SND_KIRKWOOD_SOC_I2S
+        select SND_SOC_ALC5623
+        help
+          Say Y if you want to add support for SoC audio on
+          the HP t5325 thin client.
+
diff --git a/sound/soc/kirkwood/Makefile b/sound/soc/kirkwood/Makefile
index 33a16dcab5b5..3e62ae9e7bbe 100644
--- a/sound/soc/kirkwood/Makefile
+++ b/sound/soc/kirkwood/Makefile
@@ -5,5 +5,7 @@ obj-$(CONFIG_SND_KIRKWOOD_SOC) += snd-soc-kirkwood.o
 obj-$(CONFIG_SND_KIRKWOOD_SOC_I2S) += snd-soc-kirkwood-i2s.o
 
 snd-soc-openrd-objs := kirkwood-openrd.o
+snd-soc-t5325-objs := kirkwood-t5325.o
 
 obj-$(CONFIG_SND_KIRKWOOD_SOC_OPENRD) += snd-soc-openrd.o
+obj-$(CONFIG_SND_KIRKWOOD_SOC_T5325) += snd-soc-t5325.o
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
index 9d7c81e921f1..d863afb3ee52 100644
--- a/sound/soc/kirkwood/kirkwood-openrd.c
+++ b/sound/soc/kirkwood/kirkwood-openrd.c
@@ -86,7 +86,7 @@ static int __init openrd_client_init(void)
 {
         int ret;
 
-        if (!machine_is_openrd_client())
+        if (!machine_is_openrd_client() && !machine_is_openrd_ultimate())
                 return 0;
 
         openrd_client_snd_device = platform_device_alloc("soc-audio", -1);
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
new file mode 100644
index 000000000000..c8d21956ab52
--- /dev/null
+++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -0,0 +1,141 @@
+/*
+ * kirkwood-t5325.c
+ *
+ * (c) 2010 Arnaud Patard <arnaud.patard@rtp-net.org>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <sound/soc.h>
+#include <mach/kirkwood.h>
+#include <plat/audio.h>
+#include <asm/mach-types.h>
+#include "../codecs/alc5623.h"
+
+static int t5325_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->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        int ret;
+        unsigned int freq, fmt;
+
+        fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS;
+        ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
+        if (ret < 0)
+                return ret;
+
+        ret = snd_soc_dai_set_fmt(codec_dai, fmt);
+        if (ret < 0)
+                return ret;
+
+        freq = params_rate(params) * 256;
+
+        return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN);
+
+}
+
+static struct snd_soc_ops t5325_ops = {
+        .hw_params = t5325_hw_params,
+};
+
+static const struct snd_soc_dapm_widget t5325_dapm_widgets[] = {
+        SND_SOC_DAPM_HP("Headphone Jack", NULL),
+        SND_SOC_DAPM_SPK("Speaker", NULL),
+        SND_SOC_DAPM_MIC("Mic Jack", NULL),
+};
+
+static const struct snd_soc_dapm_route t5325_route[] = {
+        { "Headphone Jack",     NULL,   "HPL" },
+        { "Headphone Jack",     NULL,   "HPR" },
+
+        {"Speaker",             NULL,   "SPKOUT"},
+        {"Speaker",             NULL,   "SPKOUTN"},
+
+        { "MIC1",               NULL,   "Mic Jack" },
+        { "MIC2",               NULL,   "Mic Jack" },
+};
+
+static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, t5325_dapm_widgets,
+                                ARRAY_SIZE(t5325_dapm_widgets));
+
+        snd_soc_dapm_add_routes(dapm, t5325_route, ARRAY_SIZE(t5325_route));
+
+        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
+        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+        snd_soc_dapm_enable_pin(dapm, "Speaker");
+
+        snd_soc_dapm_sync(dapm);
+
+        return 0;
+}
+
+static struct snd_soc_dai_link t5325_dai[] = {
+{
+        .name = "ALC5621",
+        .stream_name = "ALC5621 HiFi",
+        .cpu_dai_name = "kirkwood-i2s",
+        .platform_name = "kirkwood-pcm-audio",
+        .codec_dai_name = "alc5621-hifi",
+        .codec_name = "alc562x-codec.0-001a",
+        .ops = &t5325_ops,
+        .init = t5325_dai_init,
+},
+};
+
+
+static struct snd_soc_card t5325 = {
+        .name = "t5325",
+        .dai_link = t5325_dai,
+        .num_links = ARRAY_SIZE(t5325_dai),
+};
+
+static struct platform_device *t5325_snd_device;
+
+static int __init t5325_init(void)
+{
+        int ret;
+
+        if (!machine_is_t5325())
+                return 0;
+
+        t5325_snd_device = platform_device_alloc("soc-audio", -1);
+        if (!t5325_snd_device)
+                return -ENOMEM;
+
+        platform_set_drvdata(t5325_snd_device,
+                        &t5325);
+
+        ret = platform_device_add(t5325_snd_device);
+        if (ret) {
+                printk(KERN_ERR "%s: platform_device_add failed\n", __func__);
+                platform_device_put(t5325_snd_device);
+        }
+
+        return ret;
+}
+module_init(t5325_init);
+
+static void __exit t5325_exit(void)
+{
+        platform_device_unregister(t5325_snd_device);
+}
+module_exit(t5325_exit);
+
+MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
+MODULE_DESCRIPTION("ALSA SoC t5325 audio client");
+MODULE_LICENSE("GPL");