* [PATCH 3/3] ASoC: SAMSUNG: Add WM8580 PCM Machine driver
2011-04-09 1:57 [PATCH V2 0/3] Add WM8580 PCM Machine driver for Samsung SoCs Sangbeom Kim
@ 2011-04-09 1:57 ` Sangbeom Kim
2011-04-09 4:52 ` Jassi Brar
2011-04-11 20:32 ` Mark Brown
2011-04-09 1:58 ` [PATCH 1/3] ARM: S5PV210: Add PCM audio support for WM8580 Sangbeom Kim
2011-04-09 1:58 ` [PATCH 3/3] ARM: S5P64X0: " Sangbeom Kim
2 siblings, 2 replies; 9+ messages in thread
From: Sangbeom Kim @ 2011-04-09 1:57 UTC (permalink / raw)
To: alsa-devel, linux-samsung-soc
Cc: jassisinghbrar, lrg, broonie, kgene.kim, ben-linux, Sangbeom Kim
This patch add WM8580 PCM machine driver to support PCM audio
on SMDKC110, SMDKV210, SMDK6450, SMDK6440 boards.
Playback and Capture supports 8kHz sampling rates.
and It is tested on SMDKC110, SMDKV210, SMDK6450
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
---
sound/soc/samsung/Kconfig | 8 ++
sound/soc/samsung/Makefile | 2 +
sound/soc/samsung/smdk_wm8580pcm.c | 206 ++++++++++++++++++++++++++++++++++++
3 files changed, 216 insertions(+), 0 deletions(-)
create mode 100644 sound/soc/samsung/smdk_wm8580pcm.c
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index a3fdfb6..b8c7a2e 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -162,3 +162,11 @@ config SND_SOC_SAMSUNG_SMDK_SPDIF
select SND_SAMSUNG_SPDIF
help
Say Y if you want to add support for SoC S/PDIF audio on the SMDK.
+
+config SND_SOC_SMDK_WM8580_PCM
+ tristate "SoC PCM Audio support for WM8580 on SMDK"
+ depends on SND_SOC_SAMSUNG && (MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
+ select SND_SOC_WM8580
+ select SND_SAMSUNG_PCM
+ help
+ Say Y if you want to add support for SoC audio on the SMDK.
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 294dec0..6c598fc 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -34,6 +34,7 @@ snd-soc-smdk-wm9713-objs := smdk_wm9713.o
snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o
snd-soc-goni-wm8994-objs := goni_wm8994.o
snd-soc-smdk-spdif-objs := smdk_spdif.o
+snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o
obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
@@ -51,3 +52,4 @@ obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o
obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o
obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o
obj-$(CONFIG_SND_SOC_GONI_AQUILA_WM8994) += snd-soc-goni-wm8994.o
+obj-$(CONFIG_SND_SOC_SMDK_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o
diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c
new file mode 100644
index 0000000..0d12092
--- /dev/null
+++ b/sound/soc/samsung/smdk_wm8580pcm.c
@@ -0,0 +1,206 @@
+/*
+ * sound/soc/samsung/smdk_wm8580pcm.c
+ *
+ * Copyright (c) 2011 Samsung Electronics Co. Ltd
+ *
+ * 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 <sound/soc.h>
+#include <sound/pcm_params.h>
+#include <sound/pcm.h>
+
+#include <asm/mach-types.h>
+
+#include "../codecs/wm8580.h"
+#include "dma.h"
+#include "pcm.h"
+
+/*
+ * Board Settings:
+ * o '1' means 'ON'
+ * o '0' means 'OFF'
+ * o 'X' means 'Don't care'
+ *
+ * SMDK6410, SMDK6440, SMDK6450 Base B/D: CFG1-0000, CFG2-1111
+ * SMDKC110, SMDKV210: CFGB11-100100, CFGB12-0000
+ */
+
+#define SMDK_WM8580_EXT_OSC 12000000
+#define SMDK_WM8580_EXT_MCLK 4096000
+#define SMDK_WM8580_EXT_VOICE 2048000
+
+static unsigned long mclk_freq;
+static unsigned long xtal_freq;
+
+/*
+ * If MCLK clock directly gets from XTAL, we don't have to use PLL
+ * to make MCLK, but if XTAL clock source connects with other codec
+ * pin (like XTI), we should have to set codec's PLL to make MCLK.
+ * Because Samsung SoC does not support pcmcdclk output like I2S.
+ */
+
+static int smdk_wm8580_pcm_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 rfs, ret;
+
+ switch (params_rate(params)) {
+ case 8000:
+ break;
+ default:
+ printk(KERN_ERR "%s:%d Sampling Rate %u not supported!\n",
+ __func__, __LINE__, params_rate(params));
+ return -EINVAL;
+ }
+
+ rfs = mclk_freq / params_rate(params) / 2;
+
+ /* Set the codec DAI configuration */
+ ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B
+ | SND_SOC_DAIFMT_IB_NF
+ | SND_SOC_DAIFMT_CBS_CFS);
+ if (ret < 0)
+ return ret;
+
+ /* Set the cpu DAI configuration */
+ ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_B
+ | SND_SOC_DAIFMT_IB_NF
+ | SND_SOC_DAIFMT_CBS_CFS);
+ if (ret < 0)
+ return ret;
+
+ if (mclk_freq == xtal_freq) {
+ ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_MCLK,
+ mclk_freq, SND_SOC_CLOCK_IN);
+ if (ret < 0)
+ return ret;
+
+ ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK,
+ WM8580_CLKSRC_MCLK);
+ if (ret < 0)
+ return ret;
+ } else {
+ ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_PLLA,
+ mclk_freq, SND_SOC_CLOCK_IN);
+ if (ret < 0)
+ return ret;
+
+ ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK,
+ WM8580_CLKSRC_PLLA);
+ if (ret < 0)
+ return ret;
+
+ ret = snd_soc_dai_set_pll(codec_dai, WM8580_PLLA, 0,
+ xtal_freq, mclk_freq);
+ if (ret < 0)
+ return ret;
+ }
+
+ /* Set PCM source clock on CPU */
+ ret = snd_soc_dai_set_sysclk(cpu_dai, S3C_PCM_CLKSRC_MUX,
+ mclk_freq, SND_SOC_CLOCK_IN);
+ if (ret < 0)
+ return ret;
+
+ /* Set SCLK_DIV for making bclk */
+ ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_PCM_SCLK_PER_FS, rfs);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static struct snd_soc_ops smdk_wm8580_pcm_ops = {
+ .hw_params = smdk_wm8580_pcm_hw_params,
+};
+
+static struct snd_soc_dai_link smdk_dai[] = {
+ {
+ .name = "WM8580 PAIF PCM RX",
+ .stream_name = "Playback",
+ .cpu_dai_name = "samsung-pcm.0",
+ .codec_dai_name = "wm8580-hifi-playback",
+ .platform_name = "samsung-audio",
+ .codec_name = "wm8580-codec.0-001b",
+ .ops = &smdk_wm8580_pcm_ops,
+ }, {
+ .name = "WM8580 PAIF PCM TX",
+ .stream_name = "Capture",
+ .cpu_dai_name = "samsung-pcm.0",
+ .codec_dai_name = "wm8580-hifi-capture",
+ .platform_name = "samsung-audio",
+ .codec_name = "wm8580-codec.0-001b",
+ .ops = &smdk_wm8580_pcm_ops,
+ },
+};
+
+static struct snd_soc_card smdk_pcm = {
+ .name = "SMDK-PCM",
+ .dai_link = smdk_dai,
+ .num_links = 2,
+};
+
+/*
+ * After SMDKC110 Base Board's Rev is '0.1', 12MHz External OSC(X1)
+ * is absent (or not connected), so we connect EXT_VOICE_CLK(OSC4),
+ * 2.0484Mhz, directly with MCLK both Codec and SoC.
+ */
+static int __devinit snd_smdk_probe(struct platform_device *pdev)
+{
+ int ret = 0;
+
+ xtal_freq = SMDK_WM8580_EXT_OSC;
+ mclk_freq = SMDK_WM8580_EXT_MCLK;
+
+ if (machine_is_smdkc110() || machine_is_smdkv210())
+ xtal_freq = mclk_freq = SMDK_WM8580_EXT_VOICE;
+
+ smdk_pcm.dev = &pdev->dev;
+ ret = snd_soc_register_card(&smdk_pcm);
+ if (ret) {
+ dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int __devexit snd_smdk_remove(struct platform_device *pdev)
+{
+ snd_soc_unregister_card(&smdk_pcm);
+ platform_set_drvdata(pdev, NULL);
+ return 0;
+}
+
+static struct platform_driver snd_smdk_driver = {
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "samsung-smdk-pcm",
+ },
+ .probe = snd_smdk_probe,
+ .remove = __devexit_p(snd_smdk_remove),
+};
+
+static int __init smdk_audio_init(void)
+{
+ return platform_driver_register(&snd_smdk_driver);
+}
+
+module_init(smdk_audio_init);
+
+static void __exit smdk_audio_exit(void)
+{
+ platform_driver_unregister(&snd_smdk_driver);
+}
+
+module_exit(smdk_audio_exit);
+
+MODULE_AUTHOR("Sangbeom Kim, <sbkim73@samsung.com>");
+MODULE_DESCRIPTION("ALSA SoC SMDK WM8580 for PCM");
+MODULE_LICENSE("GPL");
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/3] ASoC: SAMSUNG: Add WM8580 PCM Machine driver
2011-04-09 1:57 ` [PATCH 3/3] ASoC: SAMSUNG: Add WM8580 PCM Machine driver Sangbeom Kim
@ 2011-04-09 4:52 ` Jassi Brar
2011-04-11 19:55 ` [alsa-devel] " Liam Girdwood
2011-04-11 20:32 ` Mark Brown
1 sibling, 1 reply; 9+ messages in thread
From: Jassi Brar @ 2011-04-09 4:52 UTC (permalink / raw)
To: Sangbeom Kim
Cc: alsa-devel, kgene.kim, broonie, linux-samsung-soc, ben-linux, lrg
On Sat, Apr 9, 2011 at 7:27 AM, Sangbeom Kim <sbkim73@samsung.com> wrote:
> This patch add WM8580 PCM machine driver to support PCM audio
> on SMDKC110, SMDKV210, SMDK6450, SMDK6440 boards.
> Playback and Capture supports 8kHz sampling rates.
> and It is tested on SMDKC110, SMDKV210, SMDK6450
>
> Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [alsa-devel] [PATCH 3/3] ASoC: SAMSUNG: Add WM8580 PCM Machine driver
2011-04-09 4:52 ` Jassi Brar
@ 2011-04-11 19:55 ` Liam Girdwood
0 siblings, 0 replies; 9+ messages in thread
From: Liam Girdwood @ 2011-04-11 19:55 UTC (permalink / raw)
To: Jassi Brar
Cc: Sangbeom Kim, alsa-devel, kgene.kim, broonie, linux-samsung-soc,
ben-linux
On Sat, 2011-04-09 at 10:22 +0530, Jassi Brar wrote:
> On Sat, Apr 9, 2011 at 7:27 AM, Sangbeom Kim <sbkim73@samsung.com> wrote:
> > This patch add WM8580 PCM machine driver to support PCM audio
> > on SMDKC110, SMDKV210, SMDK6450, SMDK6440 boards.
> > Playback and Capture supports 8kHz sampling rates.
> > and It is tested on SMDKC110, SMDKV210, SMDK6450
> >
> > Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
>
> Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] ASoC: SAMSUNG: Add WM8580 PCM Machine driver
2011-04-09 1:57 ` [PATCH 3/3] ASoC: SAMSUNG: Add WM8580 PCM Machine driver Sangbeom Kim
2011-04-09 4:52 ` Jassi Brar
@ 2011-04-11 20:32 ` Mark Brown
1 sibling, 0 replies; 9+ messages in thread
From: Mark Brown @ 2011-04-11 20:32 UTC (permalink / raw)
To: Sangbeom Kim
Cc: alsa-devel, linux-samsung-soc, jassisinghbrar, lrg, kgene.kim,
ben-linux
On Sat, Apr 09, 2011 at 10:57:59AM +0900, Sangbeom Kim wrote:
> This patch add WM8580 PCM machine driver to support PCM audio
> on SMDKC110, SMDKV210, SMDK6450, SMDK6440 boards.
> Playback and Capture supports 8kHz sampling rates.
> and It is tested on SMDKC110, SMDKV210, SMDK6450
>
> Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] ARM: S5PV210: Add PCM audio support for WM8580
2011-04-09 1:57 [PATCH V2 0/3] Add WM8580 PCM Machine driver for Samsung SoCs Sangbeom Kim
2011-04-09 1:57 ` [PATCH 3/3] ASoC: SAMSUNG: Add WM8580 PCM Machine driver Sangbeom Kim
@ 2011-04-09 1:58 ` Sangbeom Kim
2011-04-11 9:05 ` Kukjin Kim
2011-04-12 8:38 ` Seungwhan Youn
2011-04-09 1:58 ` [PATCH 3/3] ARM: S5P64X0: " Sangbeom Kim
2 siblings, 2 replies; 9+ messages in thread
From: Sangbeom Kim @ 2011-04-09 1:58 UTC (permalink / raw)
To: alsa-devel, linux-samsung-soc
Cc: jassisinghbrar, lrg, broonie, kgene.kim, ben-linux, Sangbeom Kim
This patch add pcm audio configuration for SMDKV210 and SMDKC110.
Platform device and pcm clock initialization code is added.
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
---
arch/arm/mach-s5pv210/clock.c | 90 ++++++++++++++++++++++-
arch/arm/mach-s5pv210/cpu.c | 7 ++-
arch/arm/mach-s5pv210/include/mach/map.h | 2 +
arch/arm/mach-s5pv210/include/mach/regs-audss.h | 45 +++++++++++
arch/arm/mach-s5pv210/mach-smdkc110.c | 7 ++
arch/arm/mach-s5pv210/mach-smdkv210.c | 7 ++
arch/arm/plat-s5p/include/plat/map-s5p.h | 1 +
7 files changed, 155 insertions(+), 4 deletions(-)
create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-audss.h
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index 2d59949..a964e1c 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -21,6 +21,7 @@
#include <linux/io.h>
#include <mach/map.h>
+#include <mach/regs-audss.h>
#include <plat/cpu-freq.h>
#include <mach/regs-clock.h>
@@ -185,6 +186,11 @@ static int s5pv210_clk_mask1_ctrl(struct clk *clk, int enable)
return s5p_gatectrl(S5P_CLK_SRC_MASK1, clk, enable);
}
+static int s5pv210_clk_audss_ctrl(struct clk *clk, int enable)
+{
+ return s5p_gatectrl(S5P_CLKGATE_AUDSS, clk, enable);
+}
+
static struct clk clk_sclk_hdmi27m = {
.name = "sclk_hdmi27m",
.id = -1,
@@ -208,17 +214,28 @@ static struct clk clk_sclk_usbphy1 = {
static struct clk clk_pcmcdclk0 = {
.name = "pcmcdclk",
- .id = -1,
+ .id = 0,
+ .rate = 2048000,
};
static struct clk clk_pcmcdclk1 = {
.name = "pcmcdclk",
- .id = -1,
+ .id = 1,
};
static struct clk clk_pcmcdclk2 = {
.name = "pcmcdclk",
- .id = -1,
+ .id = 2,
+};
+
+static struct clk clk_i2scdclk0 = {
+ .name = "i2scdclk",
+ .id = 0,
+};
+
+static struct clk clk_i2scdclk1 = {
+ .name = "i2scdclk",
+ .id = 1,
};
static struct clk *clkset_vpllsrc_list[] = {
@@ -490,6 +507,24 @@ static struct clk init_clocks_off[] = {
.parent = &clk_p,
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1 << 0),
+ }, {
+ .name = "pcm",
+ .id = 0,
+ .parent = &clk_pclk_psys.clk,
+ .enable = s5pv210_clk_ip3_ctrl,
+ .ctrlbit = (1 << 28),
+ }, {
+ .name = "pcm",
+ .id = 1,
+ .parent = &clk_pclk_psys.clk,
+ .enable = s5pv210_clk_ip3_ctrl,
+ .ctrlbit = (1 << 29),
+ }, {
+ .name = "pcm",
+ .id = 2,
+ .parent = &clk_pclk_psys.clk,
+ .enable = s5pv210_clk_ip3_ctrl,
+ .ctrlbit = (1 << 30),
},
};
@@ -714,6 +749,48 @@ static struct clksrc_clk clk_sclk_audio2 = {
.reg_div = { .reg = S5P_CLK_DIV6, .shift = 8, .size = 4 },
};
+static struct clk *clkset_mout_audss_list[] = {
+ NULL,
+ &clk_fout_epll,
+};
+
+static struct clksrc_sources clkset_mout_audss = {
+ .sources = clkset_mout_audss_list,
+ .nr_sources = ARRAY_SIZE(clkset_mout_audss_list),
+};
+
+static struct clksrc_clk clk_mout_audss = {
+ .clk = {
+ .name = "mout_audss",
+ .id = -1,
+ },
+ .sources = &clkset_mout_audss,
+ .reg_src = { .reg = S5P_CLKSRC_AUDSS, .shift = 0, .size = 1 },
+};
+
+static struct clk *clkset_sclk_audss_list[] = {
+ &clk_mout_audss.clk,
+ &clk_i2scdclk0,
+ &clk_sclk_audio0.clk,
+};
+
+static struct clksrc_sources clkset_sclk_audss = {
+ .sources = clkset_sclk_audss_list,
+ .nr_sources = ARRAY_SIZE(clkset_sclk_audss_list),
+};
+
+static struct clksrc_clk clk_sclk_audss = {
+ .clk = {
+ .name = "audio-bus",
+ .id = -1,
+ .enable = s5pv210_clk_audss_ctrl,
+ .ctrlbit = (1 << 6),
+ },
+ .sources = &clkset_sclk_audss,
+ .reg_src = { .reg = S5P_CLKSRC_AUDSS, .shift = 2, .size = 2 },
+ .reg_div = { .reg = S5P_CLKDIV_AUDSS, .shift = 4, .size = 4 },
+};
+
static struct clk *clkset_sclk_spdif_list[] = {
[0] = &clk_sclk_audio0.clk,
[1] = &clk_sclk_audio1.clk,
@@ -1058,6 +1135,8 @@ static struct clksrc_clk *sysclks[] = {
&clk_sclk_hdmi,
&clk_mout_dmc0,
&clk_sclk_dmc0,
+ &clk_mout_audss,
+ &clk_sclk_audss,
&clk_sclk_audio0,
&clk_sclk_audio1,
&clk_sclk_audio2,
@@ -1212,6 +1291,9 @@ void __init_or_cpufreq s5pv210_setup_clocks(void)
for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
s3c_set_clksrc(&clksrcs[ptr], true);
+
+ clk_set_parent(&clk_sclk_audio0.clk, &clk_pcmcdclk0);
+ clk_set_parent(&clk_sclk_audss.clk, &clk_sclk_audio0.clk);
}
static struct clk *clks[] __initdata = {
@@ -1219,6 +1301,8 @@ static struct clk *clks[] __initdata = {
&clk_sclk_hdmiphy,
&clk_sclk_usbphy0,
&clk_sclk_usbphy1,
+ &clk_i2scdclk0,
+ &clk_i2scdclk1,
&clk_pcmcdclk0,
&clk_pcmcdclk1,
&clk_pcmcdclk2,
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 61e6c24..4aa98ad 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -95,7 +95,12 @@ static struct map_desc s5pv210_iodesc[] __initdata = {
.pfn =__phys_to_pfn(S5PV210_PA_HSPHY),
.length = SZ_4K,
.type = MT_DEVICE,
- }
+ }, {
+ .virtual = (unsigned long)S5P_VA_AUDSS,
+ .pfn = __phys_to_pfn(S5PV210_PA_AUDSS),
+ .length = SZ_1K,
+ .type = MT_DEVICE,
+ },
};
static void s5pv210_idle(void)
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 1dd5883..195874e 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -64,6 +64,8 @@
#define S5PV210_PA_HSOTG 0xEC000000
#define S5PV210_PA_HSPHY 0xEC100000
+#define S5PV210_PA_AUDSS 0xEEE10000
+
#define S5PV210_PA_IIS0 0xEEE30000
#define S5PV210_PA_IIS1 0xE2100000
#define S5PV210_PA_IIS2 0xE2A00000
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-audss.h b/arch/arm/mach-s5pv210/include/mach/regs-audss.h
new file mode 100644
index 0000000..2fa3c23
--- /dev/null
+++ b/arch/arm/mach-s5pv210/include/mach/regs-audss.h
@@ -0,0 +1,45 @@
+/* arch/arm/mach-s5pv210/include/mach/regs-clock.h
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com/
+ *
+ * S5PV210 - Audio SubSystem clock register definitions
+ *
+ * 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.
+*/
+
+#ifndef __ASM_ARCH_REGS_AUDSS_H
+#define __ASM_ARCH_REGS_AUDSS_H __FILE__
+
+#define S5P_AUDSSREG(x) (S5P_VA_AUDSS + (x))
+
+#define S5P_CLKSRC_AUDSS S5P_AUDSSREG(0x0)
+#define S5P_CLKDIV_AUDSS S5P_AUDSSREG(0x4)
+#define S5P_CLKGATE_AUDSS S5P_AUDSSREG(0x8)
+
+/* CLKSRC0 */
+#define S5P_AUDSS_CLKSRC_MAIN_MASK (0x1<<0)
+#define S5P_AUDSS_CLKSRC_MAIN_SHIFT (0)
+#define S5P_AUDSS_CLKSRC_BUSCLK_MASK (0x1<<1)
+#define S5P_AUDSS_CLKSRC_BUSCLK_SHIFT (1)
+#define S5P_AUDSS_CLKSRC_I2SCLK_MASK (0x3<<2)
+#define S5P_AUDSS_CLKSRC_I2SCLK_SHIFT (2)
+
+/* CLKDIV0 */
+#define S5P_AUDSS_CLKDIV_BUSCLK_MASK (0xf<<0)
+#define S5P_AUDSS_CLKDIV_BUSCLK_SHIFT (0)
+#define S5P_AUDSS_CLKDIV_I2SCLK_MASK (0xf<<4)
+#define S5P_AUDSS_CLKDIV_I2SCLK_SHIFT (4)
+
+/* IP Clock Gate 0 Registers */
+#define S5P_AUDSS_CLKGATE_HCLKRP (1<<0)
+#define S5P_AUDSS_CLKGATE_HCLKBUF (1<<1)
+#define S5P_AUDSS_CLKGATE_HCLKDMA (1<<2)
+#define S5P_AUDSS_CLKGATE_HCLKHWA (1<<3)
+#define S5P_AUDSS_CLKGATE_HCLKUART (1<<4)
+#define S5P_AUDSS_CLKGATE_HCLKI2S (1<<5)
+#define S5P_AUDSS_CLKGATE_CLKI2S (1<<6)
+
+#endif /* __ASM_ARCH_REGS_AUDSS_H */
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
index 6c412c8..05562ca 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -81,17 +81,24 @@ static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = {
.setup_gpio = s5pv210_ide_setup_gpio,
};
+static struct platform_device smdkc110_pcm_device = {
+ .name = "samsung-smdk-pcm",
+ .id = -1,
+};
+
static struct platform_device *smdkc110_devices[] __initdata = {
&samsung_asoc_dma,
&s5pv210_device_iis0,
&s5pv210_device_ac97,
&s5pv210_device_spdif,
+ &s5pv210_device_pcm0,
&s3c_device_cfcon,
&s3c_device_i2c0,
&s3c_device_i2c1,
&s3c_device_i2c2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &smdkc110_pcm_device,
};
static struct i2c_board_info smdkc110_i2c_devs0[] __initdata = {
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index c6a9e86..8824b6d 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -249,6 +249,11 @@ static struct platform_device smdkv210_backlight_device = {
},
};
+static struct platform_device smdkv210_pcm_device = {
+ .name = "samsung-smdk-pcm",
+ .id = -1,
+};
+
static struct platform_device *smdkv210_devices[] __initdata = {
&s3c_device_adc,
&s3c_device_cfcon,
@@ -266,12 +271,14 @@ static struct platform_device *smdkv210_devices[] __initdata = {
&s5pv210_device_ac97,
&s5pv210_device_iis0,
&s5pv210_device_spdif,
+ &s5pv210_device_pcm0,
&samsung_asoc_dma,
&samsung_device_keypad,
&smdkv210_dm9000,
&smdkv210_lcd_lte480wv,
&s3c_device_timer[3],
&smdkv210_backlight_device,
+ &smdkv210_pcm_device,
};
static void __init smdkv210_dm9000_init(void)
diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h
index d973d39..daa4a44 100644
--- a/arch/arm/plat-s5p/include/plat/map-s5p.h
+++ b/arch/arm/plat-s5p/include/plat/map-s5p.h
@@ -40,6 +40,7 @@
#define S5P_VA_GIC_DIST S5P_VA_COREPERI(0x1000)
#define S3C_VA_USB_HSPHY S3C_ADDR(0x02900000)
+#define S5P_VA_AUDSS S3C_ADDR(0x02A00000)
#define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000))
#define VA_VIC0 VA_VIC(0)
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* RE: [PATCH 1/3] ARM: S5PV210: Add PCM audio support for WM8580
2011-04-09 1:58 ` [PATCH 1/3] ARM: S5PV210: Add PCM audio support for WM8580 Sangbeom Kim
@ 2011-04-11 9:05 ` Kukjin Kim
2011-04-12 8:38 ` Seungwhan Youn
1 sibling, 0 replies; 9+ messages in thread
From: Kukjin Kim @ 2011-04-11 9:05 UTC (permalink / raw)
To: 'Sangbeom Kim', alsa-devel, linux-samsung-soc
Cc: jassisinghbrar, lrg, broonie, ben-linux
Sangbeom Kim wrote:
>
> This patch add pcm audio configuration for SMDKV210 and SMDKC110.
> Platform device and pcm clock initialization code is added.
>
> Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
> ---
(snip)
> @@ -0,0 +1,45 @@
> +/* arch/arm/mach-s5pv210/include/mach/regs-clock.h
arch/arm/mach-s5pv210/include/mach/regs-audss.h ?
(snip)
> +/* CLKSRC0 */
> +#define S5P_AUDSS_CLKSRC_MAIN_MASK (0x1<<0)
> +#define S5P_AUDSS_CLKSRC_MAIN_SHIFT (0)
Firstly, the blank should be added around "<<" like following.
+#define S5P_AUDSS_CLKSRC_MAIN_MASK (0x1 << 0)
Secondly, if you want to use XXX_SHIFT, please use like following.
+#define S5P_AUDSS_CLKSRC_MAIN_SHIFT (0)
+#define S5P_AUDSS_CLKSRC_MAIN_MASK (0x1 << S5P_AUDSS_CLKSRC_MAIN_SHIFT)
Finally, if the definition is not used anywhere, please don't add it.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] ARM: S5PV210: Add PCM audio support for WM8580
2011-04-09 1:58 ` [PATCH 1/3] ARM: S5PV210: Add PCM audio support for WM8580 Sangbeom Kim
2011-04-11 9:05 ` Kukjin Kim
@ 2011-04-12 8:38 ` Seungwhan Youn
1 sibling, 0 replies; 9+ messages in thread
From: Seungwhan Youn @ 2011-04-12 8:38 UTC (permalink / raw)
To: Sangbeom Kim
Cc: alsa-devel, kgene.kim, jassisinghbrar, linux-samsung-soc,
ben-linux, broonie, lrg
Hi,
On Sat, Apr 9, 2011 at 10:58 AM, Sangbeom Kim <sbkim73@samsung.com> wrote:
> This patch add pcm audio configuration for SMDKV210 and SMDKC110.
> Platform device and pcm clock initialization code is added.
>
> Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
> ---
> arch/arm/mach-s5pv210/clock.c | 90 ++++++++++++++++++++++-
> arch/arm/mach-s5pv210/cpu.c | 7 ++-
> arch/arm/mach-s5pv210/include/mach/map.h | 2 +
> arch/arm/mach-s5pv210/include/mach/regs-audss.h | 45 +++++++++++
> arch/arm/mach-s5pv210/mach-smdkc110.c | 7 ++
> arch/arm/mach-s5pv210/mach-smdkv210.c | 7 ++
> arch/arm/plat-s5p/include/plat/map-s5p.h | 1 +
> 7 files changed, 155 insertions(+), 4 deletions(-)
> create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-audss.h
>
> diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
> index 2d59949..a964e1c 100644
> --- a/arch/arm/mach-s5pv210/clock.c
> +++ b/arch/arm/mach-s5pv210/clock.c
> @@ -21,6 +21,7 @@
> #include <linux/io.h>
>
> #include <mach/map.h>
> +#include <mach/regs-audss.h>
>
> #include <plat/cpu-freq.h>
> #include <mach/regs-clock.h>
> @@ -185,6 +186,11 @@ static int s5pv210_clk_mask1_ctrl(struct clk *clk, int enable)
> return s5p_gatectrl(S5P_CLK_SRC_MASK1, clk, enable);
> }
>
> +static int s5pv210_clk_audss_ctrl(struct clk *clk, int enable)
> +{
> + return s5p_gatectrl(S5P_CLKGATE_AUDSS, clk, enable);
> +}
> +
> static struct clk clk_sclk_hdmi27m = {
> .name = "sclk_hdmi27m",
> .id = -1,
> @@ -208,17 +214,28 @@ static struct clk clk_sclk_usbphy1 = {
>
> static struct clk clk_pcmcdclk0 = {
> .name = "pcmcdclk",
> - .id = -1,
> + .id = 0,
> + .rate = 2048000,
I think that this fixed rate setting is not good, because this clock.c
is not only for SMDK board, but for all S5PV210 based machines.
> };
>
> static struct clk clk_pcmcdclk1 = {
> .name = "pcmcdclk",
> - .id = -1,
> + .id = 1,
> };
>
> static struct clk clk_pcmcdclk2 = {
> .name = "pcmcdclk",
> - .id = -1,
> + .id = 2,
> +};
> +
> +static struct clk clk_i2scdclk0 = {
> + .name = "i2scdclk",
> + .id = 0,
> +};
> +
> +static struct clk clk_i2scdclk1 = {
> + .name = "i2scdclk",
> + .id = 1,
> };
>
> static struct clk *clkset_vpllsrc_list[] = {
> @@ -490,6 +507,24 @@ static struct clk init_clocks_off[] = {
> .parent = &clk_p,
> .enable = s5pv210_clk_ip3_ctrl,
> .ctrlbit = (1 << 0),
> + }, {
> + .name = "pcm",
> + .id = 0,
> + .parent = &clk_pclk_psys.clk,
> + .enable = s5pv210_clk_ip3_ctrl,
> + .ctrlbit = (1 << 28),
> + }, {
> + .name = "pcm",
> + .id = 1,
> + .parent = &clk_pclk_psys.clk,
> + .enable = s5pv210_clk_ip3_ctrl,
> + .ctrlbit = (1 << 29),
> + }, {
> + .name = "pcm",
> + .id = 2,
> + .parent = &clk_pclk_psys.clk,
> + .enable = s5pv210_clk_ip3_ctrl,
> + .ctrlbit = (1 << 30),
> },
> };
>
> @@ -714,6 +749,48 @@ static struct clksrc_clk clk_sclk_audio2 = {
> .reg_div = { .reg = S5P_CLK_DIV6, .shift = 8, .size = 4 },
> };
>
> +static struct clk *clkset_mout_audss_list[] = {
> + NULL,
> + &clk_fout_epll,
> +};
> +
> +static struct clksrc_sources clkset_mout_audss = {
> + .sources = clkset_mout_audss_list,
> + .nr_sources = ARRAY_SIZE(clkset_mout_audss_list),
> +};
> +
> +static struct clksrc_clk clk_mout_audss = {
> + .clk = {
> + .name = "mout_audss",
> + .id = -1,
> + },
> + .sources = &clkset_mout_audss,
> + .reg_src = { .reg = S5P_CLKSRC_AUDSS, .shift = 0, .size = 1 },
> +};
> +
> +static struct clk *clkset_sclk_audss_list[] = {
> + &clk_mout_audss.clk,
> + &clk_i2scdclk0,
> + &clk_sclk_audio0.clk,
> +};
> +
> +static struct clksrc_sources clkset_sclk_audss = {
> + .sources = clkset_sclk_audss_list,
> + .nr_sources = ARRAY_SIZE(clkset_sclk_audss_list),
> +};
> +
> +static struct clksrc_clk clk_sclk_audss = {
> + .clk = {
> + .name = "audio-bus",
> + .id = -1,
> + .enable = s5pv210_clk_audss_ctrl,
> + .ctrlbit = (1 << 6),
> + },
> + .sources = &clkset_sclk_audss,
> + .reg_src = { .reg = S5P_CLKSRC_AUDSS, .shift = 2, .size = 2 },
> + .reg_div = { .reg = S5P_CLKDIV_AUDSS, .shift = 4, .size = 4 },
> +};
> +
These clock sources are not just for pcm clock, these are for audio subsystem.
So I think that should be separated to another patch for add audio
subsystem on s5pv210.
> static struct clk *clkset_sclk_spdif_list[] = {
> [0] = &clk_sclk_audio0.clk,
> [1] = &clk_sclk_audio1.clk,
> @@ -1058,6 +1135,8 @@ static struct clksrc_clk *sysclks[] = {
> &clk_sclk_hdmi,
> &clk_mout_dmc0,
> &clk_sclk_dmc0,
> + &clk_mout_audss,
> + &clk_sclk_audss,
ditto
> &clk_sclk_audio0,
> &clk_sclk_audio1,
> &clk_sclk_audio2,
> @@ -1212,6 +1291,9 @@ void __init_or_cpufreq s5pv210_setup_clocks(void)
>
> for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
> s3c_set_clksrc(&clksrcs[ptr], true);
> +
> + clk_set_parent(&clk_sclk_audio0.clk, &clk_pcmcdclk0);
> + clk_set_parent(&clk_sclk_audss.clk, &clk_sclk_audio0.clk);
ditto
> }
>
> static struct clk *clks[] __initdata = {
> @@ -1219,6 +1301,8 @@ static struct clk *clks[] __initdata = {
> &clk_sclk_hdmiphy,
> &clk_sclk_usbphy0,
> &clk_sclk_usbphy1,
> + &clk_i2scdclk0,
> + &clk_i2scdclk1,
ditto
> &clk_pcmcdclk0,
> &clk_pcmcdclk1,
> &clk_pcmcdclk2,
> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
> index 61e6c24..4aa98ad 100644
> --- a/arch/arm/mach-s5pv210/cpu.c
> +++ b/arch/arm/mach-s5pv210/cpu.c
> @@ -95,7 +95,12 @@ static struct map_desc s5pv210_iodesc[] __initdata = {
> .pfn =__phys_to_pfn(S5PV210_PA_HSPHY),
> .length = SZ_4K,
> .type = MT_DEVICE,
> - }
> + }, {
> + .virtual = (unsigned long)S5P_VA_AUDSS,
> + .pfn = __phys_to_pfn(S5PV210_PA_AUDSS),
> + .length = SZ_1K,
> + .type = MT_DEVICE,
> + },
ditto
> };
>
> static void s5pv210_idle(void)
> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
> index 1dd5883..195874e 100644
> --- a/arch/arm/mach-s5pv210/include/mach/map.h
> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
> @@ -64,6 +64,8 @@
> #define S5PV210_PA_HSOTG 0xEC000000
> #define S5PV210_PA_HSPHY 0xEC100000
>
> +#define S5PV210_PA_AUDSS 0xEEE10000
> +
ditto
> #define S5PV210_PA_IIS0 0xEEE30000
> #define S5PV210_PA_IIS1 0xE2100000
> #define S5PV210_PA_IIS2 0xE2A00000
> diff --git a/arch/arm/mach-s5pv210/include/mach/regs-audss.h b/arch/arm/mach-s5pv210/include/mach/regs-audss.h
> new file mode 100644
> index 0000000..2fa3c23
> --- /dev/null
> +++ b/arch/arm/mach-s5pv210/include/mach/regs-audss.h
ditto
> @@ -0,0 +1,45 @@
> +/* arch/arm/mach-s5pv210/include/mach/regs-clock.h
> + *
> + * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> + * http://www.samsung.com/
> + *
> + * S5PV210 - Audio SubSystem clock register definitions
> + *
> + * 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.
> +*/
> +
> +#ifndef __ASM_ARCH_REGS_AUDSS_H
> +#define __ASM_ARCH_REGS_AUDSS_H __FILE__
> +
> +#define S5P_AUDSSREG(x) (S5P_VA_AUDSS + (x))
> +
> +#define S5P_CLKSRC_AUDSS S5P_AUDSSREG(0x0)
> +#define S5P_CLKDIV_AUDSS S5P_AUDSSREG(0x4)
> +#define S5P_CLKGATE_AUDSS S5P_AUDSSREG(0x8)
> +
> +/* CLKSRC0 */
> +#define S5P_AUDSS_CLKSRC_MAIN_MASK (0x1<<0)
> +#define S5P_AUDSS_CLKSRC_MAIN_SHIFT (0)
> +#define S5P_AUDSS_CLKSRC_BUSCLK_MASK (0x1<<1)
> +#define S5P_AUDSS_CLKSRC_BUSCLK_SHIFT (1)
> +#define S5P_AUDSS_CLKSRC_I2SCLK_MASK (0x3<<2)
> +#define S5P_AUDSS_CLKSRC_I2SCLK_SHIFT (2)
> +
> +/* CLKDIV0 */
> +#define S5P_AUDSS_CLKDIV_BUSCLK_MASK (0xf<<0)
> +#define S5P_AUDSS_CLKDIV_BUSCLK_SHIFT (0)
> +#define S5P_AUDSS_CLKDIV_I2SCLK_MASK (0xf<<4)
> +#define S5P_AUDSS_CLKDIV_I2SCLK_SHIFT (4)
> +
> +/* IP Clock Gate 0 Registers */
> +#define S5P_AUDSS_CLKGATE_HCLKRP (1<<0)
> +#define S5P_AUDSS_CLKGATE_HCLKBUF (1<<1)
> +#define S5P_AUDSS_CLKGATE_HCLKDMA (1<<2)
> +#define S5P_AUDSS_CLKGATE_HCLKHWA (1<<3)
> +#define S5P_AUDSS_CLKGATE_HCLKUART (1<<4)
> +#define S5P_AUDSS_CLKGATE_HCLKI2S (1<<5)
> +#define S5P_AUDSS_CLKGATE_CLKI2S (1<<6)
> +
> +#endif /* __ASM_ARCH_REGS_AUDSS_H */
...(snip)...
> diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h
> index d973d39..daa4a44 100644
> --- a/arch/arm/plat-s5p/include/plat/map-s5p.h
> +++ b/arch/arm/plat-s5p/include/plat/map-s5p.h
> @@ -40,6 +40,7 @@
> #define S5P_VA_GIC_DIST S5P_VA_COREPERI(0x1000)
>
> #define S3C_VA_USB_HSPHY S3C_ADDR(0x02900000)
> +#define S5P_VA_AUDSS S3C_ADDR(0x02A00000)
ditto
claude
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] ARM: S5P64X0: Add PCM audio support for WM8580
2011-04-09 1:57 [PATCH V2 0/3] Add WM8580 PCM Machine driver for Samsung SoCs Sangbeom Kim
2011-04-09 1:57 ` [PATCH 3/3] ASoC: SAMSUNG: Add WM8580 PCM Machine driver Sangbeom Kim
2011-04-09 1:58 ` [PATCH 1/3] ARM: S5PV210: Add PCM audio support for WM8580 Sangbeom Kim
@ 2011-04-09 1:58 ` Sangbeom Kim
2 siblings, 0 replies; 9+ messages in thread
From: Sangbeom Kim @ 2011-04-09 1:58 UTC (permalink / raw)
To: alsa-devel, linux-samsung-soc
Cc: jassisinghbrar, lrg, broonie, kgene.kim, ben-linux, Sangbeom Kim
This patch add pcm audio configuration for SMDK6450 and SMDK6440.
Platform device and pcm clock initialization code is added.
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
---
arch/arm/mach-s5p64x0/clock-s5p6440.c | 63 +++++++++++---------
arch/arm/mach-s5p64x0/clock-s5p6450.c | 27 +++++++--
arch/arm/mach-s5p64x0/clock.c | 11 ++++
arch/arm/mach-s5p64x0/dev-audio.c | 56 ++++++++++++++++-
arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 3 +
arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h | 4 +
arch/arm/mach-s5p64x0/mach-smdk6440.c | 7 ++
arch/arm/mach-s5p64x0/mach-smdk6450.c | 7 ++
8 files changed, 141 insertions(+), 37 deletions(-)
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c
index 9f12c2e..99405f4 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c
@@ -372,14 +372,12 @@ static struct clk init_clocks[] = {
},
};
-static struct clk clk_iis_cd_v40 = {
- .name = "iis_cdclk_v40",
- .id = -1,
-};
-
-static struct clk clk_pcm_cd = {
- .name = "pcm_cdclk",
- .id = -1,
+static struct clksrc_clk clk_dout_epll = {
+ .clk = {
+ .name = "dout_epll",
+ .id = -1,
+ .parent = &clk_mout_epll.clk,
+ },
};
static struct clk *clkset_group1_list[] = {
@@ -403,17 +401,30 @@ static struct clksrc_sources clkset_uart = {
.nr_sources = ARRAY_SIZE(clkset_uart_list),
};
-static struct clk *clkset_audio_list[] = {
- &clk_mout_epll.clk,
- &clk_dout_mpll.clk,
- &clk_fin_epll,
- &clk_iis_cd_v40,
- &clk_pcm_cd,
+static struct clk *clkset_sclk_audio_list[] = {
+ [0] = &clk_dout_epll.clk,
+ [1] = &clk_dout_mpll.clk,
+ [2] = &clk_ext,
+ [3] = &clk_i2s_v40_cdclk,
+ [4] = &clk_pcmcdclk0,
+};
+
+static struct clksrc_sources clkset_sclk_audio = {
+ .sources = clkset_sclk_audio_list,
+ .nr_sources = ARRAY_SIZE(clkset_sclk_audio_list),
};
-static struct clksrc_sources clkset_audio = {
- .sources = clkset_audio_list,
- .nr_sources = ARRAY_SIZE(clkset_audio_list),
+struct clksrc_clk clk_sclk_audio = {
+ .clk = {
+ .name = "audio-bus",
+ .id = -1,
+ .enable = s5p64x0_sclk_ctrl,
+ .ctrlbit = (1 << 11),
+ .parent = &clk_ext_xtal_mux,
+ },
+ .sources = &clkset_sclk_audio,
+ .reg_src = { .reg = S5P64X0_CLK_SRC1, .shift = 0, .size = 3 },
+ .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 24, .size = 4 },
};
static struct clksrc_clk clksrcs[] = {
@@ -507,16 +518,6 @@ static struct clksrc_clk clksrcs[] = {
.sources = &clkset_group1,
.reg_src = { .reg = S5P64X0_CLK_SRC1, .shift = 8, .size = 2 },
.reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 4, .size = 4 },
- }, {
- .clk = {
- .name = "sclk_audio2",
- .id = -1,
- .ctrlbit = (1 << 11),
- .enable = s5p64x0_sclk_ctrl,
- },
- .sources = &clkset_audio,
- .reg_src = { .reg = S5P64X0_CLK_SRC1, .shift = 0, .size = 3 },
- .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 24, .size = 4 },
},
};
@@ -526,11 +527,13 @@ static struct clksrc_clk *sysclks[] = {
&clk_mout_epll,
&clk_mout_mpll,
&clk_dout_mpll,
+ &clk_dout_epll,
&clk_armclk,
&clk_hclk,
&clk_pclk,
&clk_hclk_low,
&clk_pclk_low,
+ &clk_sclk_audio,
};
void __init_or_cpufreq s5p6440_setup_clocks(void)
@@ -590,14 +593,16 @@ void __init_or_cpufreq s5p6440_setup_clocks(void)
clk_h.rate = hclk;
clk_p.rate = pclk;
+ clk_set_parent(&clk_sclk_audio.clk, &clk_pcmcdclk0);
+
for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
s3c_set_clksrc(&clksrcs[ptr], true);
}
static struct clk *clks[] __initdata = {
&clk_ext,
- &clk_iis_cd_v40,
- &clk_pcm_cd,
+ &clk_i2s_v40_cdclk,
+ &clk_pcmcdclk0,
};
void __init s5p6440_register_clocks(void)
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c
index 4eec457..e4db264 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6450.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c
@@ -290,7 +290,14 @@ static struct clk init_clocks_off[] = {
.parent = &clk_pclk.clk,
.enable = s5p64x0_pclk_ctrl,
.ctrlbit = (1 << 30),
- }
+ }, {
+ .name = "pcm",
+ .id = 0,
+ .parent = &clk_pclk_low.clk,
+ .enable = s5p64x0_pclk_ctrl,
+ .ctrlbit = S5P_CLKCON_PCLK_PCM0,
+ },
+
};
/*
@@ -408,9 +415,9 @@ static struct clksrc_sources clkset_hsmmc44 = {
static struct clk *clkset_sclk_audio0_list[] = {
[0] = &clk_dout_epll.clk,
[1] = &clk_dout_mpll.clk,
- [2] = &clk_ext_xtal_mux,
- [3] = NULL,
- [4] = NULL,
+ [2] = &clk_ext,
+ [3] = &clk_i2s_v40_cdclk,
+ [4] = &clk_pcmcdclk0,
};
static struct clksrc_sources clkset_sclk_audio0 = {
@@ -418,7 +425,7 @@ static struct clksrc_sources clkset_sclk_audio0 = {
.nr_sources = ARRAY_SIZE(clkset_sclk_audio0_list),
};
-static struct clksrc_clk clk_sclk_audio0 = {
+struct clksrc_clk clk_sclk_audio0 = {
.clk = {
.name = "audio-bus",
.id = -1,
@@ -647,12 +654,22 @@ void __init_or_cpufreq s5p6450_setup_clocks(void)
for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
s3c_set_clksrc(&clksrcs[ptr], true);
+
+ clk_set_parent(&clk_sclk_audio0.clk, &clk_pcmcdclk0);
}
+static struct clk *clks[] __initdata = {
+ &clk_ext,
+ &clk_i2s_v40_cdclk,
+ &clk_pcmcdclk0,
+};
+
void __init s5p6450_register_clocks(void)
{
int ptr;
+ s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
+
for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++)
s3c_register_clksrc(sysclks[ptr], 1);
diff --git a/arch/arm/mach-s5p64x0/clock.c b/arch/arm/mach-s5p64x0/clock.c
index b52c6e2..432bb06 100644
--- a/arch/arm/mach-s5p64x0/clock.c
+++ b/arch/arm/mach-s5p64x0/clock.c
@@ -233,3 +233,14 @@ int s5p64x0_clk48m_ctrl(struct clk *clk, int enable)
return 0;
}
+
+struct clk clk_pcmcdclk0 = {
+ .name = "pcmcdclk",
+ .id = 0,
+ .rate = 4096000,
+};
+
+struct clk clk_i2s_v40_cdclk = {
+ .name = "i2s_v40_cdclk",
+ .id = 0,
+};
diff --git a/arch/arm/mach-s5p64x0/dev-audio.c b/arch/arm/mach-s5p64x0/dev-audio.c
index 35f1f22..c0ef455 100644
--- a/arch/arm/mach-s5p64x0/dev-audio.c
+++ b/arch/arm/mach-s5p64x0/dev-audio.c
@@ -207,7 +207,7 @@ static struct s3c_audio_pdata s5p6440_pcm_pdata = {
.cfg_gpio = s5p6440_pcm_cfg_gpio,
};
-static struct resource s5p6440_pcm0_resource[] = {
+static struct resource s5p6440_pcm_resource[] = {
[0] = {
.start = S5P64X0_PA_PCM,
.end = S5P64X0_PA_PCM + 0x100 - 1,
@@ -228,9 +228,59 @@ static struct resource s5p6440_pcm0_resource[] = {
struct platform_device s5p6440_device_pcm = {
.name = "samsung-pcm",
.id = 0,
- .num_resources = ARRAY_SIZE(s5p6440_pcm0_resource),
- .resource = s5p6440_pcm0_resource,
+ .num_resources = ARRAY_SIZE(s5p6440_pcm_resource),
+ .resource = s5p6440_pcm_resource,
.dev = {
.platform_data = &s5p6440_pcm_pdata,
},
};
+
+static int s5p6450_pcm_cfg_gpio(struct platform_device *pdev)
+{
+ switch (pdev->id) {
+ case 0:
+ s3c_gpio_cfgpin(S5P6450_GPR(4), S3C_GPIO_SFN(2));
+ s3c_gpio_cfgpin(S5P6450_GPR(7), S3C_GPIO_SFN(2));
+ s3c_gpio_cfgpin(S5P6450_GPR(8), S3C_GPIO_SFN(2));
+ s3c_gpio_cfgpin(S5P6450_GPR(13), S3C_GPIO_SFN(2));
+ s3c_gpio_cfgpin(S5P6450_GPR(14), S3C_GPIO_SFN(2));
+ break;
+ default:
+ printk(KERN_DEBUG "Invalid PCM Controller number!");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static struct s3c_audio_pdata s3c_pcm_pdata = {
+ .cfg_gpio = s5p6450_pcm_cfg_gpio,
+};
+
+static struct resource s5p6450_pcm0_resource[] = {
+ [0] = {
+ .start = S5P64X0_PA_PCM,
+ .end = S5P64X0_PA_PCM + 0x100 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = DMACH_PCM0_TX,
+ .end = DMACH_PCM0_TX,
+ .flags = IORESOURCE_DMA,
+ },
+ [2] = {
+ .start = DMACH_PCM0_RX,
+ .end = DMACH_PCM0_RX,
+ .flags = IORESOURCE_DMA,
+ },
+};
+
+struct platform_device s5p6450_device_pcm0 = {
+ .name = "samsung-pcm",
+ .id = 0,
+ .num_resources = ARRAY_SIZE(s5p6450_pcm0_resource),
+ .resource = s5p6450_pcm0_resource,
+ .dev = {
+ .platform_data = &s3c_pcm_pdata,
+ },
+};
diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-clock.h b/arch/arm/mach-s5p64x0/include/mach/regs-clock.h
index a133f22..323c97c 100644
--- a/arch/arm/mach-s5p64x0/include/mach/regs-clock.h
+++ b/arch/arm/mach-s5p64x0/include/mach/regs-clock.h
@@ -62,4 +62,7 @@
#define S5P_EPLL_CON S5P64X0_EPLL_CON
+#define S5P_CLKCON_SCLK0_AUDIO0 (1<<8)
+#define S5P_CLKCON_PCLK_PCM0 (1<<8)
+
#endif /* __ASM_ARCH_REGS_CLOCK_H */
diff --git a/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h b/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
index ff85b4b..88a8065 100644
--- a/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
+++ b/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
@@ -34,6 +34,10 @@ extern struct clksrc_clk clk_dout_mpll;
extern struct clk *clkset_hclk_low_list[];
extern struct clksrc_sources clkset_hclk_low;
+extern struct clksrc_clk clk_sclk_audio0;
+extern struct clk clk_pcmcdclk0;
+extern struct clk clk_i2s_v40_cdclk;
+
extern int s5p64x0_pclk_ctrl(struct clk *clk, int enable);
extern int s5p64x0_hclk0_ctrl(struct clk *clk, int enable);
extern int s5p64x0_hclk1_ctrl(struct clk *clk, int enable);
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 2d559f1..0fa500e 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -130,6 +130,11 @@ static struct platform_device smdk6440_backlight_device = {
},
};
+static struct platform_device smdk6440_pcm_device = {
+ .name = "samsung-smdk-pcm",
+ .id = -1,
+};
+
static struct platform_device *smdk6440_devices[] __initdata = {
&s3c_device_adc,
&s3c_device_rtc,
@@ -139,8 +144,10 @@ static struct platform_device *smdk6440_devices[] __initdata = {
&s3c_device_wdt,
&samsung_asoc_dma,
&s5p6440_device_iis,
+ &s5p6440_device_pcm,
&s3c_device_timer[1],
&smdk6440_backlight_device,
+ &smdk6440_pcm_device,
};
static struct s3c2410_platform_i2c s5p6440_i2c0_data __initdata = {
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index d19c469..69de257 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -148,6 +148,11 @@ static struct platform_device smdk6450_backlight_device = {
},
};
+static struct platform_device smdk6450_pcm_device = {
+ .name = "samsung-smdk-pcm",
+ .id = -1,
+};
+
static struct platform_device *smdk6450_devices[] __initdata = {
&s3c_device_adc,
&s3c_device_rtc,
@@ -157,8 +162,10 @@ static struct platform_device *smdk6450_devices[] __initdata = {
&s3c_device_wdt,
&samsung_asoc_dma,
&s5p6450_device_iis0,
+ &s5p6450_device_pcm0,
&s3c_device_timer[1],
&smdk6450_backlight_device,
+ &smdk6450_pcm_device,
/* s5p6450_device_spi0 will be added */
};
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread