]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - sound/soc/samsung/smdk_wm8580.c
Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[mv-sheeva.git] / sound / soc / samsung / smdk_wm8580.c
similarity index 55%
rename from sound/soc/s3c24xx/smdk64xx_wm8580.c
rename to sound/soc/samsung/smdk_wm8580.c
index 052e499b68d161c614133bc596bc62b9afa31b2b..b2cff1a44aed6a0ff592553e44a4354f7e6f8263 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  smdk64xx_wm8580.c
+ *  smdk_wm8580.c
  *
  *  Copyright (c) 2009 Samsung Electronics Co. Ltd
  *  Author: Jaswinder Singh <jassi.brar@samsung.com>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
+
+#include <asm/mach-types.h>
 
 #include "../codecs/wm8580.h"
-#include "s3c-dma.h"
-#include "s3c64xx-i2s.h"
+#include "dma.h"
+#include "i2s.h"
 
 /*
  * Default CFG switch settings to use this driver:
  *   SMDK6410: Set CFG1 1-3 Off, CFG2 1-4 On
  */
 
-/* SMDK64XX has a 12MHZ crystal attached to WM8580 */
-#define SMDK64XX_WM8580_FREQ 12000000
+/* SMDK has a 12MHZ crystal attached to WM8580 */
+#define SMDK_WM8580_FREQ 12000000
 
-static int smdk64xx_hw_params(struct snd_pcm_substream *substream,
+static int smdk_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *params)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -96,17 +97,6 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream,
        if (ret < 0)
                return ret;
 
-       ret = snd_soc_dai_set_sysclk(cpu_dai, S3C64XX_CLKSRC_CDCLK,
-                                       0, SND_SOC_CLOCK_IN);
-       if (ret < 0)
-               return ret;
-
-       /* We use PCLK for basic ops in SoC-Slave mode */
-       ret = snd_soc_dai_set_sysclk(cpu_dai, S3C64XX_CLKSRC_PCLK,
-                                       0, SND_SOC_CLOCK_IN);
-       if (ret < 0)
-               return ret;
-
        /* Set WM8580 to drive MCLK from its PLLA */
        ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK,
                                        WM8580_CLKSRC_PLLA);
@@ -114,7 +104,7 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream,
                return ret;
 
        ret = snd_soc_dai_set_pll(codec_dai, WM8580_PLLA, 0,
-                                       SMDK64XX_WM8580_FREQ, pll_out);
+                                       SMDK_WM8580_FREQ, pll_out);
        if (ret < 0)
                return ret;
 
@@ -123,32 +113,24 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream,
        if (ret < 0)
                return ret;
 
-       ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_I2SV2_DIV_BCLK, bfs);
-       if (ret < 0)
-               return ret;
-
-       ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_I2SV2_DIV_RCLK, rfs);
-       if (ret < 0)
-               return ret;
-
        return 0;
 }
 
 /*
- * SMDK64XX WM8580 DAI operations.
+ * SMDK WM8580 DAI operations.
  */
-static struct snd_soc_ops smdk64xx_ops = {
-       .hw_params = smdk64xx_hw_params,
+static struct snd_soc_ops smdk_ops = {
+       .hw_params = smdk_hw_params,
 };
 
-/* SMDK64xx Playback widgets */
+/* SMDK Playback widgets */
 static const struct snd_soc_dapm_widget wm8580_dapm_widgets_pbk[] = {
        SND_SOC_DAPM_HP("Front", NULL),
        SND_SOC_DAPM_HP("Center+Sub", NULL),
        SND_SOC_DAPM_HP("Rear", NULL),
 };
 
-/* SMDK64xx Capture widgets */
+/* SMDK Capture widgets */
 static const struct snd_soc_dapm_widget wm8580_dapm_widgets_cpt[] = {
        SND_SOC_DAPM_MIC("MicIn", NULL),
        SND_SOC_DAPM_LINE("LineIn", NULL),
@@ -179,94 +161,132 @@ static const struct snd_soc_dapm_route audio_map_rx[] = {
        {"Rear", NULL, "VOUT3R"},
 };
 
-static int smdk64xx_wm8580_init_paiftx(struct snd_soc_pcm_runtime *rtd)
+static int smdk_wm8580_init_paiftx(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_codec *codec = rtd->codec;
+       struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-       /* Add smdk64xx specific Capture widgets */
-       snd_soc_dapm_new_controls(codec, wm8580_dapm_widgets_cpt,
+       /* Add smdk specific Capture widgets */
+       snd_soc_dapm_new_controls(dapm, wm8580_dapm_widgets_cpt,
                                  ARRAY_SIZE(wm8580_dapm_widgets_cpt));
 
        /* Set up PAIFTX audio path */
-       snd_soc_dapm_add_routes(codec, audio_map_tx, ARRAY_SIZE(audio_map_tx));
+       snd_soc_dapm_add_routes(dapm, audio_map_tx, ARRAY_SIZE(audio_map_tx));
 
        /* Enabling the microphone requires the fitting of a 0R
         * resistor to connect the line from the microphone jack.
         */
-       snd_soc_dapm_disable_pin(codec, "MicIn");
+       snd_soc_dapm_disable_pin(dapm, "MicIn");
 
        /* signal a DAPM event */
-       snd_soc_dapm_sync(codec);
+       snd_soc_dapm_sync(dapm);
 
        return 0;
 }
 
-static int smdk64xx_wm8580_init_paifrx(struct snd_soc_pcm_runtime *rtd)
+static int smdk_wm8580_init_paifrx(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_codec *codec = rtd->codec;
+       struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-       /* Add smdk64xx specific Playback widgets */
-       snd_soc_dapm_new_controls(codec, wm8580_dapm_widgets_pbk,
+       /* Add smdk specific Playback widgets */
+       snd_soc_dapm_new_controls(dapm, wm8580_dapm_widgets_pbk,
                                  ARRAY_SIZE(wm8580_dapm_widgets_pbk));
 
        /* Set up PAIFRX audio path */
-       snd_soc_dapm_add_routes(codec, audio_map_rx, ARRAY_SIZE(audio_map_rx));
+       snd_soc_dapm_add_routes(dapm, audio_map_rx, ARRAY_SIZE(audio_map_rx));
 
        /* signal a DAPM event */
-       snd_soc_dapm_sync(codec);
+       snd_soc_dapm_sync(dapm);
 
        return 0;
 }
 
-static struct snd_soc_dai_link smdk64xx_dai[] = {
-{ /* Primary Playback i/f */
-       .name = "WM8580 PAIF RX",
-       .stream_name = "Playback",
-       .cpu_dai_name = "s3c64xx-iis-v4",
-       .codec_dai_name = "wm8580-hifi-playback",
-       .platform_name = "s3c24xx-pcm-audio",
-       .codec_name = "wm8580-codec.0-001b",
-       .init = smdk64xx_wm8580_init_paifrx,
-       .ops = &smdk64xx_ops,
-},
-{ /* Primary Capture i/f */
-       .name = "WM8580 PAIF TX",
-       .stream_name = "Capture",
-       .cpu_dai_name = "s3c64xx-iis-v4",
-       .codec_dai_name = "wm8580-hifi-capture",
-       .platform_name = "s3c24xx-pcm-audio",
-       .codec_name = "wm8580-codec.0-001b",
-       .init = smdk64xx_wm8580_init_paiftx,
-       .ops = &smdk64xx_ops,
-},
+enum {
+       PRI_PLAYBACK = 0,
+       PRI_CAPTURE,
+       SEC_PLAYBACK,
+};
+
+static struct snd_soc_dai_link smdk_dai[] = {
+       [PRI_PLAYBACK] = { /* Primary Playback i/f */
+               .name = "WM8580 PAIF RX",
+               .stream_name = "Playback",
+               .cpu_dai_name = "samsung-i2s.0",
+               .codec_dai_name = "wm8580-hifi-playback",
+               .platform_name = "samsung-audio",
+               .codec_name = "wm8580-codec.0-001b",
+               .init = smdk_wm8580_init_paifrx,
+               .ops = &smdk_ops,
+       },
+       [PRI_CAPTURE] = { /* Primary Capture i/f */
+               .name = "WM8580 PAIF TX",
+               .stream_name = "Capture",
+               .cpu_dai_name = "samsung-i2s.0",
+               .codec_dai_name = "wm8580-hifi-capture",
+               .platform_name = "samsung-audio",
+               .codec_name = "wm8580-codec.0-001b",
+               .init = smdk_wm8580_init_paiftx,
+               .ops = &smdk_ops,
+       },
+       [SEC_PLAYBACK] = { /* Sec_Fifo Playback i/f */
+               .name = "Sec_FIFO TX",
+               .stream_name = "Playback",
+               .cpu_dai_name = "samsung-i2s.x",
+               .codec_dai_name = "wm8580-hifi-playback",
+               .platform_name = "samsung-audio",
+               .codec_name = "wm8580-codec.0-001b",
+               .init = smdk_wm8580_init_paifrx,
+               .ops = &smdk_ops,
+       },
 };
 
-static struct snd_soc_card smdk64xx = {
-       .name = "SMDK64xx 5.1",
-       .dai_link = smdk64xx_dai,
-       .num_links = ARRAY_SIZE(smdk64xx_dai),
+static struct snd_soc_card smdk = {
+       .name = "SMDK-I2S",
+       .dai_link = smdk_dai,
+       .num_links = 2,
 };
 
-static struct platform_device *smdk64xx_snd_device;
+static struct platform_device *smdk_snd_device;
 
-static int __init smdk64xx_audio_init(void)
+static int __init smdk_audio_init(void)
 {
        int ret;
+       char *str;
+
+       if (machine_is_smdkc100() || machine_is_smdk6442()
+                       || machine_is_smdkv210() || machine_is_smdkc110()) {
+               smdk.num_links = 3;
+               /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */
+               str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name;
+               str[strlen(str) - 1] = '0' + SAMSUNG_I2S_SECOFF;
+       } else if (machine_is_smdk6410()) {
+               str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
+               str[strlen(str) - 1] = '2';
+               str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
+               str[strlen(str) - 1] = '2';
+       }
 
-       smdk64xx_snd_device = platform_device_alloc("soc-audio", -1);
-       if (!smdk64xx_snd_device)
+       smdk_snd_device = platform_device_alloc("soc-audio", -1);
+       if (!smdk_snd_device)
                return -ENOMEM;
 
-       platform_set_drvdata(smdk64xx_snd_device, &smdk64xx);
-       ret = platform_device_add(smdk64xx_snd_device);
+       platform_set_drvdata(smdk_snd_device, &smdk);
+       ret = platform_device_add(smdk_snd_device);
 
        if (ret)
-               platform_device_put(smdk64xx_snd_device);
+               platform_device_put(smdk_snd_device);
 
        return ret;
 }
-module_init(smdk64xx_audio_init);
+module_init(smdk_audio_init);
+
+static void __exit smdk_audio_exit(void)
+{
+       platform_device_unregister(smdk_snd_device);
+}
+module_exit(smdk_audio_exit);
 
 MODULE_AUTHOR("Jaswinder Singh, jassi.brar@samsung.com");
-MODULE_DESCRIPTION("ALSA SoC SMDK64XX WM8580");
+MODULE_DESCRIPTION("ALSA SoC SMDK WM8580");
 MODULE_LICENSE("GPL");