Merge branch 'topic/asoc' into for-linus

1 files changed, 77 insertions, 0 deletions

diff --git a/sound/soc/samsung/ln2440sbc_alc650.c b/sound/soc/samsung/ln2440sbc_alc650.c
new file mode 100644
index 000000000000..a2bb34def740
--- /dev/null
+++ b/sound/soc/samsung/ln2440sbc_alc650.c
@@ -0,0 +1,77 @@
+/*
+ * SoC audio for ln2440sbc
+ *
+ * Copyright 2007 KonekTel, a.s.
+ * Author: Ivan Kuten
+ *         ivan.kuten@promwad.com
+ *
+ * Heavily based on smdk2443_wm9710.c
+ * Copyright 2007 Wolfson Microelectronics PLC.
+ * Author: Graeme Gregory
+ *         graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+
+#include "dma.h"
+#include "ac97.h"
+
+static struct snd_soc_card ln2440sbc;
+
+static struct snd_soc_dai_link ln2440sbc_dai[] = {
+{
+        .name = "AC97",
+        .stream_name = "AC97 HiFi",
+        .cpu_dai_name = "samsung-ac97",
+        .codec_dai_name = "ac97-hifi",
+        .codec_name = "ac97-codec",
+        .platform_name = "samsung-audio",
+},
+};
+
+static struct snd_soc_card ln2440sbc = {
+        .name = "LN2440SBC",
+        .dai_link = ln2440sbc_dai,
+        .num_links = ARRAY_SIZE(ln2440sbc_dai),
+};
+
+static struct platform_device *ln2440sbc_snd_ac97_device;
+
+static int __init ln2440sbc_init(void)
+{
+        int ret;
+
+        ln2440sbc_snd_ac97_device = platform_device_alloc("soc-audio", -1);
+        if (!ln2440sbc_snd_ac97_device)
+                return -ENOMEM;
+
+        platform_set_drvdata(ln2440sbc_snd_ac97_device, &ln2440sbc);
+        ret = platform_device_add(ln2440sbc_snd_ac97_device);
+
+        if (ret)
+                platform_device_put(ln2440sbc_snd_ac97_device);
+
+        return ret;
+}
+
+static void __exit ln2440sbc_exit(void)
+{
+        platform_device_unregister(ln2440sbc_snd_ac97_device);
+}
+
+module_init(ln2440sbc_init);
+module_exit(ln2440sbc_exit);
+
+/* Module information */
+MODULE_AUTHOR("Ivan Kuten");
+MODULE_DESCRIPTION("ALSA SoC ALC650 LN2440SBC");
+MODULE_LICENSE("GPL");