* [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
2012-06-22 9:21 ` Mark Brown
2012-06-21 10:24 ` [PATCH V2 2/9] sound:asoc: Add support for STA529 " Rajeev Kumar
` (7 subsequent siblings)
8 siblings, 1 reply; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: Vipin Kumar, alsa-devel, Rajeev Kumar, lrg
From: Vipin Kumar <vipin.kumar@st.com>
This patch adds the support for spdif in audio codec.
Signed-off-by: vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
sound/soc/codecs/Makefile | 2 +-
sound/soc/codecs/spdif_receiver.c | 76 +++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+), 1 deletions(-)
create mode 100644 sound/soc/codecs/spdif_receiver.c
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index fc27fec..20b2d57 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -41,7 +41,7 @@ snd-soc-alc5623-objs := alc5623.o
snd-soc-alc5632-objs := alc5632.o
snd-soc-sigmadsp-objs := sigmadsp.o
snd-soc-sn95031-objs := sn95031.o
-snd-soc-spdif-objs := spdif_transciever.o
+snd-soc-spdif-objs := spdif_transciever.o spdif_receiver.o
snd-soc-ssm2602-objs := ssm2602.o
snd-soc-sta32x-objs := sta32x.o
snd-soc-stac9766-objs := stac9766.o
diff --git a/sound/soc/codecs/spdif_receiver.c b/sound/soc/codecs/spdif_receiver.c
new file mode 100644
index 0000000..229f49e
--- /dev/null
+++ b/sound/soc/codecs/spdif_receiver.c
@@ -0,0 +1,76 @@
+/*
+ * ALSA SoC SPDIF DIR (Digital Interface Reciever) driver
+ *
+ * Based on ALSA SoC SPDIF DIT driver
+ *
+ * This driver is used by controllers which can operate in DIR (SPDI/F) where
+ * no codec is needed. This file provides stub codec that can be used
+ * in these configurations. SPEAr SPDIF IN Audio controller uses this driver.
+ *
+ * Author: Vipin Kumar, <vipin.kumar@st.com>
+ * Copyright: (C) 2012 ST Microelectronics
+ *
+ * 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/moduleparam.h>
+#include <linux/slab.h>
+#include <sound/soc.h>
+#include <sound/pcm.h>
+#include <sound/initval.h>
+
+MODULE_LICENSE("GPL");
+
+#define STUB_RATES SNDRV_PCM_RATE_8000_192000
+#define STUB_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
+ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
+
+static struct snd_soc_codec_driver soc_codec_spdif_dir;
+
+static struct snd_soc_dai_driver dir_stub_dai = {
+ .name = "dir-hifi",
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 1,
+ .channels_max = 384,
+ .rates = STUB_RATES,
+ .formats = STUB_FORMATS,
+ },
+};
+
+static int spdif_dir_probe(struct platform_device *pdev)
+{
+ return snd_soc_register_codec(&pdev->dev, &soc_codec_spdif_dir,
+ &dir_stub_dai, 1);
+}
+
+static int spdif_dir_remove(struct platform_device *pdev)
+{
+ snd_soc_unregister_codec(&pdev->dev);
+ return 0;
+}
+
+static struct platform_driver spdif_dir_driver = {
+ .probe = spdif_dir_probe,
+ .remove = spdif_dir_remove,
+ .driver = {
+ .name = "spdif-dir",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init dir_modinit(void)
+{
+ return platform_driver_register(&spdif_dir_driver);
+}
+
+static void __exit dir_exit(void)
+{
+ platform_driver_unregister(&spdif_dir_driver);
+}
+
+module_init(dir_modinit);
+module_exit(dir_exit);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec
2012-06-21 10:24 ` [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec Rajeev Kumar
@ 2012-06-22 9:21 ` Mark Brown
2012-06-22 9:44 ` Rajeev kumar
0 siblings, 1 reply; 27+ messages in thread
From: Mark Brown @ 2012-06-22 9:21 UTC (permalink / raw)
To: Rajeev Kumar; +Cc: tiwai, Vipin Kumar, alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 586 bytes --]
On Thu, Jun 21, 2012 at 03:54:49PM +0530, Rajeev Kumar wrote:
> From: Vipin Kumar <vipin.kumar@st.com>
>
> This patch adds the support for spdif in audio codec.
As ever do try to provide subject lines which are appropriate for the
subsystem you're submitting against.
> +static int __init dir_modinit(void)
> +{
> + return platform_driver_register(&spdif_dir_driver);
> +}
> +
> +static void __exit dir_exit(void)
> +{
> + platform_driver_unregister(&spdif_dir_driver);
> +}
> +
> +module_init(dir_modinit);
> +module_exit(dir_exit);
module_platform_driver().
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec
2012-06-22 9:21 ` Mark Brown
@ 2012-06-22 9:44 ` Rajeev kumar
2012-06-22 9:49 ` Mark Brown
0 siblings, 1 reply; 27+ messages in thread
From: Rajeev kumar @ 2012-06-22 9:44 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel@alsa-project.org, tiwai@suse.de, spear-devel,
Vipin KUMAR, lrg@slimlogic.co.uk
Hello Mark,
On 6/22/2012 2:51 PM, Mark Brown wrote:
> On Thu, Jun 21, 2012 at 03:54:49PM +0530, Rajeev Kumar wrote:
>> From: Vipin Kumar<vipin.kumar@st.com>
>>
>> This patch adds the support for spdif in audio codec.
>
> As ever do try to provide subject lines which are appropriate for the
> subsystem you're submitting against.
>
Ok , I will take care of these stuff.
It should be
ASoc: SPEAr: SPDIF
>> +static int __init dir_modinit(void)
>> +{
>> + return platform_driver_register(&spdif_dir_driver);
>> +}
>> +
>> +static void __exit dir_exit(void)
>> +{
>> + platform_driver_unregister(&spdif_dir_driver);
>> +}
>> +
>> +module_init(dir_modinit);
>> +module_exit(dir_exit);
>
> module_platform_driver().
Ok
Best Regards
Rajeev
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec
2012-06-22 9:44 ` Rajeev kumar
@ 2012-06-22 9:49 ` Mark Brown
2012-06-22 9:54 ` Rajeev kumar
0 siblings, 1 reply; 27+ messages in thread
From: Mark Brown @ 2012-06-22 9:49 UTC (permalink / raw)
To: Rajeev kumar
Cc: alsa-devel@alsa-project.org, tiwai@suse.de, spear-devel,
Vipin KUMAR, lrg@slimlogic.co.uk
[-- Attachment #1.1: Type: text/plain, Size: 150 bytes --]
On Fri, Jun 22, 2012 at 03:14:27PM +0530, Rajeev kumar wrote:
> It should be
> ASoc: SPEAr: SPDIF
It should be "ASoC". Where have you seen "ASoc"?
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec
2012-06-22 9:49 ` Mark Brown
@ 2012-06-22 9:54 ` Rajeev kumar
0 siblings, 0 replies; 27+ messages in thread
From: Rajeev kumar @ 2012-06-22 9:54 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel@alsa-project.org, tiwai@suse.de, spear-devel,
Vipin KUMAR, lrg@slimlogic.co.uk
Hello Mark,
On 6/22/2012 3:19 PM, Mark Brown wrote:
> On Fri, Jun 22, 2012 at 03:14:27PM +0530, Rajeev kumar wrote:
>
>> It should be
>> ASoc: SPEAr: SPDIF
>
> It should be "ASoC". Where have you seen "ASoc"?
Oops, Yes it should be "ASoC".
Best Regards,
Rajeev
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 2/9] sound:asoc: Add support for STA529 Audio Codec
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
2012-06-21 10:24 ` [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
2012-06-21 12:25 ` Mark Brown
2012-06-21 10:24 ` [PATCH V2 3/9] sound:asoc: Add support for synopsys i2s controller as per ASoC framework Rajeev Kumar
` (6 subsequent siblings)
8 siblings, 1 reply; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: alsa-devel, Rajeev Kumar, lrg
This patch adds the support for STA529 audio codec.
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
sound/soc/codecs/Kconfig | 4 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/sta529.c | 477 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 483 insertions(+), 0 deletions(-)
create mode 100644 sound/soc/codecs/sta529.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 1e1613a..f06600b 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -54,6 +54,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_SPDIF
select SND_SOC_SSM2602 if SND_SOC_I2C_AND_SPI
select SND_SOC_STA32X if I2C
+ select SND_SOC_STA529 if I2C
select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
select SND_SOC_TLV320AIC23 if I2C
select SND_SOC_TLV320AIC26 if SPI_MASTER
@@ -266,6 +267,9 @@ config SND_SOC_SSM2602
config SND_SOC_STA32X
tristate
+config SND_SOC_STA529
+ tristate
+
config SND_SOC_STAC9766
tristate
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 20b2d57..09c2dd9 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -44,6 +44,7 @@ snd-soc-sn95031-objs := sn95031.o
snd-soc-spdif-objs := spdif_transciever.o spdif_receiver.o
snd-soc-ssm2602-objs := ssm2602.o
snd-soc-sta32x-objs := sta32x.o
+snd-soc-sta529-objs := sta529.o
snd-soc-stac9766-objs := stac9766.o
snd-soc-tlv320aic23-objs := tlv320aic23.o
snd-soc-tlv320aic26-objs := tlv320aic26.o
@@ -153,6 +154,7 @@ obj-$(CONFIG_SND_SOC_SN95031) +=snd-soc-sn95031.o
obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o
obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o
obj-$(CONFIG_SND_SOC_STA32X) += snd-soc-sta32x.o
+obj-$(CONFIG_SND_SOC_STA529) += snd-soc-sta529.o
obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o
obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o
obj-$(CONFIG_SND_SOC_TLV320AIC26) += snd-soc-tlv320aic26.o
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
new file mode 100644
index 0000000..5429aa9
--- /dev/null
+++ b/sound/soc/codecs/sta529.c
@@ -0,0 +1,477 @@
+/*
+ * ASoC codec driver for spear platform
+ *
+ * sound/soc/codecs/sta529.c -- spear ALSA Soc codec driver
+ *
+ * Copyright (C) 2012 ST Microelectronics
+ * Rajeev Kumar <rajeev-dlh.kumar@st.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/clk.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/pm.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#include <sound/core.h>
+#include <sound/initval.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/tlv.h>
+
+/* STA529 Register offsets */
+#define STA529_FFXCFG0 0x00
+#define STA529_FFXCFG1 0x01
+#define STA529_MVOL 0x02
+#define STA529_LVOL 0x03
+#define STA529_RVOL 0x04
+#define STA529_TTF0 0x05
+#define STA529_TTF1 0x06
+#define STA529_TTP0 0x07
+#define STA529_TTP1 0x08
+#define STA529_S2PCFG0 0x0A
+#define STA529_S2PCFG1 0x0B
+#define STA529_P2SCFG0 0x0C
+#define STA529_P2SCFG1 0x0D
+#define STA529_PLLCFG0 0x14
+#define STA529_PLLCFG1 0x15
+#define STA529_PLLCFG2 0x16
+#define STA529_PLLCFG3 0x17
+#define STA529_PLLPFE 0x18
+#define STA529_PLLST 0x19
+#define STA529_ADCCFG 0x1E /*mic_select*/
+#define STA529_CKOCFG 0x1F
+#define STA529_MISC 0x20
+#define STA529_PADST0 0x21
+#define STA529_PADST1 0x22
+#define STA529_FFXST 0x23
+#define STA529_PWMIN1 0x2D
+#define STA529_PWMIN2 0x2E
+#define STA529_POWST 0x32
+
+#define STA529_MAX_REGISTER 0x32
+
+#define STA529_RATES (SNDRV_PCM_RATE_8000 | \
+ SNDRV_PCM_RATE_11025 | \
+ SNDRV_PCM_RATE_16000 | \
+ SNDRV_PCM_RATE_22050 | \
+ SNDRV_PCM_RATE_32000 | \
+ SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000)
+
+#define STA529_FORMAT (SNDRV_PCM_FMTBIT_S16_LE | \
+ SNDRV_PCM_FMTBIT_S24_LE | \
+ SNDRV_PCM_FMTBIT_S32_LE)
+#define S2PC_VALUE 0x98
+#define CLOCK_OUT 0x60
+#define LEFT_J_DATA_FORMAT 0x10
+#define I2S_DATA_FORMAT 0x12
+#define RIGHT_J_DATA_FORMAT 0x14
+#define CODEC_MUTE_VAL 0x80
+
+#define POWER_CNTLMSAK 0x40
+#define POWER_STDBY 0x40
+#define FFX_MASK 0x80
+#define FFX_OFF 0x80
+#define POWER_UP 0x00
+#define FFX_CLK_ENB 0x01
+#define FFX_CLK_DIS 0x00
+#define FFX_CLK_MSK 0x01
+#define FREQ_RANGE_MSK 0x7C
+#define PDATA_LEN_MSK 0xC0
+#define BCLK_TO_FS_MSK 0x30
+#define AUDIO_MUTE_MSK 0x80
+
+static const struct reg_default sta529_reg_defaults[] = {
+ { 0, 0x35 }, /* R0 - FFX Configuration reg 0 */
+ { 1, 0xc8 }, /* R1 - FFX Configuration reg 1 */
+ { 2, 0x50 }, /* R2 - Master Volume */
+ { 3, 0x00 }, /* R3 - Left Volume */
+ { 4, 0x00 }, /* R4 - Right Volume */
+ { 10, 0xb2 }, /* R10 - S2P Config Reg 0 */
+ { 11, 0x41 }, /* R11 - S2P Config Reg 1 */
+ { 12, 0x92 }, /* R12 - P2S Config Reg 0 */
+ { 13, 0x41 }, /* R13 - P2S Config Reg 1 */
+ { 30, 0xd2 }, /* R30 - ADC Config Reg */
+ { 31, 0x40 }, /* R31 - clock Out Reg */
+ { 32, 0x21 }, /* R32 - Misc Register */
+};
+
+struct sta529 {
+ struct regmap *regmap;
+};
+
+static bool sta529_readable(struct device *dev, unsigned int reg)
+{
+ switch (reg) {
+
+ case STA529_FFXCFG0:
+ case STA529_FFXCFG1:
+ case STA529_MVOL:
+ case STA529_LVOL:
+ case STA529_RVOL:
+ case STA529_S2PCFG0:
+ case STA529_S2PCFG1:
+ case STA529_P2SCFG0:
+ case STA529_P2SCFG1:
+ case STA529_ADCCFG:
+ case STA529_CKOCFG:
+ case STA529_MISC:
+ return true;
+ default:
+ return false;
+ }
+}
+
+
+static const char *pwm_mode_text[] = { "Binary", "Headphone", "Ternary",
+ "Phase-shift"};
+
+static const struct soc_enum pwm_src_enum =
+SOC_ENUM_SINGLE(STA529_FFXCFG1, 4, 4, pwm_mode_text);
+
+static const struct snd_kcontrol_new sta529_new_snd_controls[] = {
+ SOC_ENUM("PWM Select", pwm_src_enum),
+};
+
+static const DECLARE_TLV_DB_SCALE(out_gain_tlv, -9150, 50, 0);
+static const DECLARE_TLV_DB_SCALE(master_vol_tlv, -12750, 50, 0);
+
+static const struct snd_kcontrol_new sta529_snd_controls[] = {
+ SOC_DOUBLE_R_TLV("Digital Playback Volume", STA529_LVOL, STA529_RVOL, 0,
+ 127, 0, out_gain_tlv),
+ SOC_SINGLE_TLV("Master Playback Volume", STA529_MVOL, 0, 127, 1,
+ master_vol_tlv),
+};
+
+static int sta529_set_bias_level(struct snd_soc_codec *codec, enum
+ snd_soc_bias_level level)
+{
+ struct sta529 *sta529 = snd_soc_codec_get_drvdata(codec);
+
+ switch (level) {
+ case SND_SOC_BIAS_ON:
+ case SND_SOC_BIAS_PREPARE:
+ snd_soc_update_bits(codec, STA529_FFXCFG0, POWER_CNTLMSAK,
+ POWER_UP);
+ snd_soc_update_bits(codec, STA529_MISC, FFX_CLK_MSK,
+ FFX_CLK_ENB);
+ break;
+ case SND_SOC_BIAS_STANDBY:
+ if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
+ regcache_sync(sta529->regmap);
+ snd_soc_update_bits(codec, STA529_FFXCFG0,
+ POWER_CNTLMSAK, POWER_STDBY);
+ /* Making FFX output to zero */
+ snd_soc_update_bits(codec, STA529_FFXCFG0, FFX_MASK,
+ FFX_OFF);
+ snd_soc_update_bits(codec, STA529_MISC, FFX_CLK_MSK,
+ FFX_CLK_DIS);
+ break;
+ case SND_SOC_BIAS_OFF:
+ break;
+ }
+
+ /*
+ * store the label for powers down audio subsystem for suspend.This is
+ * used by soc core layer
+ */
+ codec->dapm.bias_level = level;
+
+ return 0;
+
+}
+
+static int sta529_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_codec *codec = rtd->codec;
+ int pdata, play_freq_val, record_freq_val, val;
+ int bclk_to_fs_ratio;
+
+ switch (params_format(params)) {
+ case SNDRV_PCM_FORMAT_S16_LE:
+ pdata = 1;
+ bclk_to_fs_ratio = 0;
+ break;
+ case SNDRV_PCM_FORMAT_S24_LE:
+ pdata = 2;
+ bclk_to_fs_ratio = 1;
+ break;
+ case SNDRV_PCM_FORMAT_S32_LE:
+ pdata = 3;
+ bclk_to_fs_ratio = 2;
+ break;
+ default:
+ dev_err(codec->dev, "Unsupported format\n");
+ return -EINVAL;
+ }
+
+ switch (params_rate(params)) {
+ case 8000:
+ case 11025:
+ play_freq_val = 0;
+ record_freq_val = 2;
+ break;
+ case 16000:
+ case 22050:
+ play_freq_val = 1;
+ record_freq_val = 0;
+ break;
+
+ case 32000:
+ case 44100:
+ case 48000:
+ play_freq_val = 2;
+ record_freq_val = 0;
+ break;
+ default:
+ dev_err(codec->dev, "Unsupported rate\n");
+ return -EINVAL;
+ }
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ snd_soc_update_bits(codec, STA529_S2PCFG1, PDATA_LEN_MSK,
+ pdata << 6);
+ snd_soc_update_bits(codec, STA529_S2PCFG1, BCLK_TO_FS_MSK,
+ bclk_to_fs_ratio << 4);
+ } else {
+ snd_soc_update_bits(codec, STA529_P2SCFG1, PDATA_LEN_MSK,
+ pdata << 6);
+ snd_soc_update_bits(codec, STA529_P2SCFG1, BCLK_TO_FS_MSK,
+ bclk_to_fs_ratio << 4);
+ }
+
+ /* set FFX audio frequency range */
+ val = (((val & 0x83) | (play_freq_val << 4)) | (record_freq_val << 2));
+ snd_soc_update_bits(codec, STA529_MISC, FREQ_RANGE_MSK, val);
+
+ return 0;
+}
+
+static int sta529_mute(struct snd_soc_dai *dai, int mute)
+{
+ u8 val;
+
+ if (mute)
+ val |= CODEC_MUTE_VAL;
+
+ snd_soc_update_bits(dai->codec, STA529_FFXCFG0, AUDIO_MUTE_MSK, val);
+
+ return 0;
+}
+
+static int sta529_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
+{
+ struct snd_soc_codec *codec = codec_dai->codec;
+ u8 mode = 0;
+
+ /* interface format */
+ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+ case SND_SOC_DAIFMT_LEFT_J:
+ mode = LEFT_J_DATA_FORMAT;
+ break;
+ case SND_SOC_DAIFMT_I2S:
+ mode = I2S_DATA_FORMAT;
+ break;
+ case SND_SOC_DAIFMT_RIGHT_J:
+ mode = RIGHT_J_DATA_FORMAT;
+ break;
+ default:
+ return -EINVAL;
+ }
+ mode |= 0x20;
+ snd_soc_update_bits(codec, STA529_S2PCFG0, 0xE0, mode);
+
+ return 0;
+}
+
+static const struct snd_soc_dai_ops sta529_dai_ops = {
+ .hw_params = sta529_hw_params,
+ .set_fmt = sta529_set_dai_fmt,
+ .digital_mute = sta529_mute,
+};
+
+static struct snd_soc_dai_driver sta529_dai = {
+ .name = "sta529-audio",
+ .playback = {
+ .stream_name = "Playback",
+ .channels_min = 2,
+ .channels_max = 2,
+ .rates = STA529_RATES,
+ .formats = STA529_FORMAT,
+ },
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 2,
+ .channels_max = 2,
+ .rates = STA529_RATES,
+ .formats = STA529_FORMAT,
+ },
+ .ops = &sta529_dai_ops,
+};
+
+static int sta529_probe(struct snd_soc_codec *codec)
+{
+ struct sta529 *sta529 = snd_soc_codec_get_drvdata(codec);
+ int ret;
+
+ codec->control_data = sta529->regmap;
+ ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
+ if (ret < 0) {
+ dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
+ return ret;
+ }
+ sta529_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
+ snd_soc_add_codec_controls(codec, sta529_snd_controls,
+ ARRAY_SIZE(sta529_snd_controls));
+
+ snd_soc_add_codec_controls(codec, sta529_new_snd_controls,
+ ARRAY_SIZE(sta529_new_snd_controls));
+ return 0;
+}
+
+/* power down chip */
+static int sta529_remove(struct snd_soc_codec *codec)
+{
+ sta529_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
+ return 0;
+}
+
+static int sta529_suspend(struct snd_soc_codec *codec)
+{
+ sta529_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
+ return 0;
+}
+
+static int sta529_resume(struct snd_soc_codec *codec)
+{
+ snd_soc_cache_sync(codec);
+ sta529_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+ sta529_set_bias_level(codec, codec->dapm.suspend_bias_level);
+
+ return 0;
+}
+
+struct snd_soc_codec_driver sta529_codec_driver = {
+ .probe = sta529_probe,
+ .remove = sta529_remove,
+ .set_bias_level = sta529_set_bias_level,
+ .suspend = sta529_suspend,
+ .resume = sta529_resume,
+};
+
+static const struct regmap_config sta529_regmap = {
+ .reg_bits = 8,
+ .val_bits = 8,
+
+ .max_register = STA529_MAX_REGISTER,
+ .readable_reg = sta529_readable,
+
+ .cache_type = REGCACHE_RBTREE,
+ .reg_defaults = sta529_reg_defaults,
+ .num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults),
+};
+
+static __devinit int sta529_i2c_probe(struct i2c_client *i2c,
+ const struct i2c_device_id *id)
+{
+ struct sta529 *sta529;
+ int ret;
+
+ if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+ return -EINVAL;
+
+ sta529 = devm_kzalloc(&i2c->dev, sizeof(struct sta529), GFP_KERNEL);
+ if (sta529 == NULL) {
+ dev_err(&i2c->dev, "Can not allocate memory\n");
+ return -ENOMEM;
+ }
+
+ sta529->regmap = regmap_init_i2c(i2c, &sta529_regmap);
+ if (IS_ERR(sta529->regmap)) {
+ ret = PTR_ERR(sta529->regmap);
+ dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
+ return ret;
+ }
+
+ i2c_set_clientdata(i2c, sta529);
+
+ ret = snd_soc_register_codec(&i2c->dev,
+ &sta529_codec_driver, &sta529_dai, 1);
+ if (ret != 0) {
+ dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
+ goto err;
+ }
+
+ return 0;
+err:
+
+ regmap_exit(sta529->regmap);
+ return ret;
+}
+
+static int __devexit sta529_i2c_remove(struct i2c_client *client)
+{
+ struct sta529 *sta529 = i2c_get_clientdata(client);
+
+ snd_soc_unregister_codec(&client->dev);
+ kfree(i2c_get_clientdata(client));
+ regmap_exit(sta529->regmap);
+
+ return 0;
+}
+
+static const struct i2c_device_id sta529_i2c_id[] = {
+ { "sta529", 0 },
+ { }
+};
+MODULE_DEVICE_TABLE(i2c, sta529_i2c_id);
+
+static struct i2c_driver sta529_i2c_driver = {
+ .driver = {
+ .name = "sta529",
+ .owner = THIS_MODULE,
+ },
+ .probe = sta529_i2c_probe,
+ .remove = __devexit_p(sta529_i2c_remove),
+ .id_table = sta529_i2c_id,
+};
+
+static int __init sta529_modinit(void)
+{
+ int ret = 0;
+
+ ret = i2c_add_driver(&sta529_i2c_driver);
+ if (ret != 0)
+ printk(KERN_ERR "Failed to reg sta529 I2C driver: %d\n", ret);
+
+ return ret;
+
+}
+module_init(sta529_modinit);
+
+static void __exit sta529_exit(void)
+{
+ i2c_del_driver(&sta529_i2c_driver);
+}
+module_exit(sta529_exit);
+
+MODULE_DESCRIPTION("ASoC STA529 codec driver");
+MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar@st.com>");
+MODULE_LICENSE("GPL");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH V2 2/9] sound:asoc: Add support for STA529 Audio Codec
2012-06-21 10:24 ` [PATCH V2 2/9] sound:asoc: Add support for STA529 " Rajeev Kumar
@ 2012-06-21 12:25 ` Mark Brown
2012-06-22 6:26 ` Rajeev kumar
0 siblings, 1 reply; 27+ messages in thread
From: Mark Brown @ 2012-06-21 12:25 UTC (permalink / raw)
To: Rajeev Kumar; +Cc: tiwai, alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 1627 bytes --]
On Thu, Jun 21, 2012 at 03:54:50PM +0530, Rajeev Kumar wrote:
> This patch adds the support for STA529 audio codec.
As I said last time always use subject lines corresponding to the style
of the subsystem, don't make up your own style.
This is mostly OK, a few things below but nothing terribly major.
> +static int sta529_mute(struct snd_soc_dai *dai, int mute)
> +{
> + u8 val;
> +
> + if (mute)
> + val |= CODEC_MUTE_VAL;
You need to initialise val otherwise it's going to have an undefined
value when you're not muting.
> + codec->control_data = sta529->regmap;
> + ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
You've got a regmap, you should be using SND_SOC_REGMAP as the control
mode.
> + snd_soc_add_codec_controls(codec, sta529_snd_controls,
> + ARRAY_SIZE(sta529_snd_controls));
> +
> + snd_soc_add_codec_controls(codec, sta529_new_snd_controls,
> + ARRAY_SIZE(sta529_new_snd_controls));
Set these in the CODEC driver structure and merge the two arrays, no
point in having code for this.
> +static int sta529_resume(struct snd_soc_codec *codec)
> +{
> + snd_soc_cache_sync(codec);
You're not using the ASoC cache code.
> + sta529_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
> + sta529_set_bias_level(codec, codec->dapm.suspend_bias_level);
The second of these isn't needed, the core will ensure the device is in
standby before suspend.
> + sta529->regmap = regmap_init_i2c(i2c, &sta529_regmap);
> + if (IS_ERR(sta529->regmap)) {
devm_regmap_init_i2c() then you don't need any cleanup code for it.
> +static int __init sta529_modinit(void)
> +{
> + int ret = 0;
module_i2c_driver.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH V2 2/9] sound:asoc: Add support for STA529 Audio Codec
2012-06-21 12:25 ` Mark Brown
@ 2012-06-22 6:26 ` Rajeev kumar
2012-06-22 8:49 ` Mark Brown
0 siblings, 1 reply; 27+ messages in thread
From: Rajeev kumar @ 2012-06-22 6:26 UTC (permalink / raw)
To: Mark Brown
Cc: tiwai@suse.de, alsa-devel@alsa-project.org, lrg@slimlogic.co.uk
Hello Mark
On 6/21/2012 5:55 PM, Mark Brown wrote:
>> +static int sta529_resume(struct snd_soc_codec *codec)
>> > +{
>> > + snd_soc_cache_sync(codec);
> You're not using the ASoC cache code.
>
Point is not clear to me, you mean to say I need to use
regcache_sync(sta529->regmap), please confirm.
Best Regards
Rajeev
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH V2 2/9] sound:asoc: Add support for STA529 Audio Codec
2012-06-22 6:26 ` Rajeev kumar
@ 2012-06-22 8:49 ` Mark Brown
0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2012-06-22 8:49 UTC (permalink / raw)
To: Rajeev kumar
Cc: tiwai@suse.de, alsa-devel@alsa-project.org, lrg@slimlogic.co.uk
[-- Attachment #1.1: Type: text/plain, Size: 612 bytes --]
On Fri, Jun 22, 2012 at 11:56:41AM +0530, Rajeev kumar wrote:
> On 6/21/2012 5:55 PM, Mark Brown wrote:
> >>+static int sta529_resume(struct snd_soc_codec *codec)
> >>> +{
> >>> + snd_soc_cache_sync(codec);
> >You're not using the ASoC cache code.
> Point is not clear to me, you mean to say I need to use
> regcache_sync(sta529->regmap), please confirm.
You shouldn't be calling ASoC cache functions at all since you're not
using an ASoC cache. There's no point in doing anything here as you're
doing your cache management in set_bias_level() but if you were then yes
you should be using regcache_sync().
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 3/9] sound:asoc: Add support for synopsys i2s controller as per ASoC framework.
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
2012-06-21 10:24 ` [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec Rajeev Kumar
2012-06-21 10:24 ` [PATCH V2 2/9] sound:asoc: Add support for STA529 " Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
2012-06-22 9:25 ` Mark Brown
2012-06-21 10:24 ` [PATCH V2 4/9] sound:asoc: Add support for SPEAr ASoC pcm layer Rajeev Kumar
` (5 subsequent siblings)
8 siblings, 1 reply; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: alsa-devel, Rajeev Kumar, lrg
This patch add support for synopsys I2S controller as per the ASoC
framework.
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
include/sound/designware_i2s.h | 69 ++++++
sound/soc/Kconfig | 1 +
sound/soc/Makefile | 1 +
sound/soc/dwc/Kconfig | 8 +
sound/soc/dwc/Makefile | 3 +
sound/soc/dwc/designware_i2s.c | 454 ++++++++++++++++++++++++++++++++++++++++
6 files changed, 536 insertions(+), 0 deletions(-)
create mode 100644 include/sound/designware_i2s.h
create mode 100644 sound/soc/dwc/Kconfig
create mode 100644 sound/soc/dwc/Makefile
create mode 100644 sound/soc/dwc/designware_i2s.c
diff --git a/include/sound/designware_i2s.h b/include/sound/designware_i2s.h
new file mode 100644
index 0000000..26f406e
--- /dev/null
+++ b/include/sound/designware_i2s.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)
+ *
+ * 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.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef __SOUND_DESIGNWARE_I2S_H
+#define __SOUND_DESIGNWARE_I2S_H
+
+#include <linux/dmaengine.h>
+#include <linux/types.h>
+
+/*
+ * struct i2s_clk_config_data - represent i2s clk configuration data
+ * @chan_nr: number of channel
+ * @data_width: number of bits per sample (8/16/24/32 bit)
+ * @sample_rate: sampling frequency (8Khz, 16Khz, 32Khz, 44Khz, 48Khz)
+ */
+struct i2s_clk_config_data {
+ int chan_nr;
+ u32 data_width;
+ u32 sample_rate;
+};
+
+struct i2s_platform_data {
+ #define DWC_I2S_PLAY (1 << 0)
+ #define DWC_I2S_RECORD (1 << 1)
+ unsigned int cap;
+ int channel;
+ u32 snd_fmts;
+ u32 snd_rates;
+
+ void *play_dma_data;
+ void *capture_dma_data;
+ bool (*filter)(struct dma_chan *chan, void *slave);
+ int (*i2s_clk_cfg)(struct i2s_clk_config_data *config);
+};
+
+struct i2s_dma_data {
+ void *data;
+ dma_addr_t addr;
+ u32 max_burst;
+ enum dma_slave_buswidth addr_width;
+ bool (*filter)(struct dma_chan *chan, void *slave);
+};
+
+/* I2S DMA registers */
+#define I2S_RXDMA 0x01C0
+#define I2S_TXDMA 0x01C8
+
+#define TWO_CHANNEL_SUPPORT 2 /* up to 2.0 */
+#define FOUR_CHANNEL_SUPPORT 4 /* up to 3.1 */
+#define SIX_CHANNEL_SUPPORT 6 /* up to 5.1 */
+#define EIGHT_CHANNEL_SUPPORT 8 /* up to 7.1 */
+
+#endif /* __SOUND_DESIGNWARE_I2S_H */
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 40b2ad1..c5de0a8 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -33,6 +33,7 @@ source "sound/soc/atmel/Kconfig"
source "sound/soc/au1x/Kconfig"
source "sound/soc/blackfin/Kconfig"
source "sound/soc/davinci/Kconfig"
+source "sound/soc/dwc/Kconfig"
source "sound/soc/ep93xx/Kconfig"
source "sound/soc/fsl/Kconfig"
source "sound/soc/jz4740/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 70990f4..00a555a 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_SND_SOC) += atmel/
obj-$(CONFIG_SND_SOC) += au1x/
obj-$(CONFIG_SND_SOC) += blackfin/
obj-$(CONFIG_SND_SOC) += davinci/
+obj-$(CONFIG_SND_SOC) += dwc/
obj-$(CONFIG_SND_SOC) += ep93xx/
obj-$(CONFIG_SND_SOC) += fsl/
obj-$(CONFIG_SND_SOC) += jz4740/
diff --git a/sound/soc/dwc/Kconfig b/sound/soc/dwc/Kconfig
new file mode 100644
index 0000000..93e9fc3
--- /dev/null
+++ b/sound/soc/dwc/Kconfig
@@ -0,0 +1,8 @@
+config SND_DESIGNWARE_I2S
+ tristate "Synopsys I2S Device Driver"
+ help
+ Say Y or M if you want to add support for I2S driver for
+ Synopsys desigwnware I2S device. The device supports upto
+ maximum of 8 channels each for play and record.
+
+
diff --git a/sound/soc/dwc/Makefile b/sound/soc/dwc/Makefile
new file mode 100644
index 0000000..319371f
--- /dev/null
+++ b/sound/soc/dwc/Makefile
@@ -0,0 +1,3 @@
+# SYNOPSYS Platform Support
+obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_i2s.o
+
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
new file mode 100644
index 0000000..e667e2b
--- /dev/null
+++ b/sound/soc/dwc/designware_i2s.c
@@ -0,0 +1,454 @@
+/*
+ * ALSA SoC Synopsys I2S Audio Layer
+ *
+ * sound/soc/spear/designware_i2s.c
+ *
+ * Copyright (C) 2010 ST Microelectronics
+ * Rajeev Kumar <rajeev-dlh.kumar@st.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <sound/designware_i2s.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+/* common register for all channel */
+#define IER 0x000
+#define IRER 0x004
+#define ITER 0x008
+#define CER 0x00C
+#define CCR 0x010
+#define RXFFR 0x014
+#define TXFFR 0x018
+
+/* I2STxRxRegisters for all channels */
+#define LRBR_LTHR(x) (0x40 * x + 0x020)
+#define RRBR_RTHR(x) (0x40 * x + 0x024)
+#define RER(x) (0x40 * x + 0x028)
+#define TER(x) (0x40 * x + 0x02C)
+#define RCR(x) (0x40 * x + 0x030)
+#define TCR(x) (0x40 * x + 0x034)
+#define ISR(x) (0x40 * x + 0x038)
+#define IMR(x) (0x40 * x + 0x03C)
+#define ROR(x) (0x40 * x + 0x040)
+#define TOR(x) (0x40 * x + 0x044)
+#define RFCR(x) (0x40 * x + 0x048)
+#define TFCR(x) (0x40 * x + 0x04C)
+#define RFF(x) (0x40 * x + 0x050)
+#define TFF(x) (0x40 * x + 0x054)
+
+/* I2SCOMPRegisters */
+#define I2S_COMP_PARAM_2 0x01F0
+#define I2S_COMP_PARAM_1 0x01F4
+#define I2S_COMP_VERSION 0x01F8
+#define I2S_COMP_TYPE 0x01FC
+
+#define MAX_CHANNEL_NUM 8
+#define MIN_CHANNEL_NUM 2
+
+struct dw_i2s_dev {
+ void __iomem *i2s_base;
+ struct clk *clk;
+ int active;
+ unsigned int capability;
+ struct device *dev;
+
+ /* data related to DMA transfers b/w i2s and DMAC */
+ struct i2s_dma_data play_dma_data;
+ struct i2s_dma_data capture_dma_data;
+ struct i2s_clk_config_data config;
+ int (*i2s_clk_cfg)(struct i2s_clk_config_data *config);
+};
+
+static inline void i2s_write_reg(void *io_base, int reg, u32 val)
+{
+ writel(val, io_base + reg);
+}
+
+static inline u32 i2s_read_reg(void *io_base, int reg)
+{
+ return readl(io_base + reg);
+}
+
+static inline void i2s_disable_channels(struct dw_i2s_dev *dev, u32 stream)
+{
+ u32 i = 0;
+
+ if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ for (i = 0; i < 4; i++)
+ i2s_write_reg(dev->i2s_base, TER(i), 0);
+ } else {
+ for (i = 0; i < 4; i++)
+ i2s_write_reg(dev->i2s_base, RER(i), 0);
+ }
+}
+
+static inline void i2s_clear_irqs(struct dw_i2s_dev *dev, u32 stream)
+{
+ u32 i = 0;
+
+ if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ for (i = 0; i < 4; i++)
+ i2s_write_reg(dev->i2s_base, TOR(i), 0);
+ } else {
+ for (i = 0; i < 4; i++)
+ i2s_write_reg(dev->i2s_base, ROR(i), 0);
+ }
+}
+
+void i2s_start(struct dw_i2s_dev *dev, struct snd_pcm_substream *substream)
+{
+
+ i2s_write_reg(dev->i2s_base, IER, 1);
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ i2s_write_reg(dev->i2s_base, ITER, 1);
+ else
+ i2s_write_reg(dev->i2s_base, IRER, 1);
+
+ i2s_write_reg(dev->i2s_base, CER, 1);
+}
+
+static void i2s_stop(struct dw_i2s_dev *dev,
+ struct snd_pcm_substream *substream)
+{
+ u32 i = 0, irq;
+
+ i2s_clear_irqs(dev, substream->stream);
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ i2s_write_reg(dev->i2s_base, ITER, 0);
+
+ for (i = 0; i < 4; i++) {
+ irq = i2s_read_reg(dev->i2s_base, IMR(i));
+ i2s_write_reg(dev->i2s_base, IMR(i), irq | 0x30);
+ }
+ } else {
+ i2s_write_reg(dev->i2s_base, IRER, 0);
+
+ for (i = 0; i < 4; i++) {
+ irq = i2s_read_reg(dev->i2s_base, IMR(i));
+ i2s_write_reg(dev->i2s_base, IMR(i), irq | 0x03);
+ }
+ }
+
+ if (!dev->active) {
+ i2s_write_reg(dev->i2s_base, CER, 0);
+ i2s_write_reg(dev->i2s_base, IER, 0);
+ }
+}
+
+static int dw_i2s_startup(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *cpu_dai)
+{
+ struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
+ struct i2s_dma_data *dma_data = NULL;
+
+ if (!(dev->capability & DWC_I2S_RECORD) &&
+ (substream->stream == SNDRV_PCM_STREAM_CAPTURE))
+ return -EINVAL;
+
+ if (!(dev->capability & DWC_I2S_PLAY) &&
+ (substream->stream == SNDRV_PCM_STREAM_PLAYBACK))
+ return -EINVAL;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ dma_data = &dev->play_dma_data;
+ else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+ dma_data = &dev->capture_dma_data;
+
+ snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)dma_data);
+
+ return 0;
+}
+
+static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
+{
+ struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+ struct i2s_clk_config_data *config = &dev->config;
+ u32 ccr, xfer_resolution, ch_reg, irq;
+ int ret;
+
+ switch (params_format(params)) {
+ case SNDRV_PCM_FORMAT_S16_LE:
+ config->data_width = 16;
+ ccr = 0x00;
+ xfer_resolution = 0x02;
+ break;
+
+ case SNDRV_PCM_FORMAT_S24_LE:
+ config->data_width = 24;
+ ccr = 0x08;
+ xfer_resolution = 0x04;
+ break;
+
+ case SNDRV_PCM_FORMAT_S32_LE:
+ config->data_width = 32;
+ ccr = 0x10;
+ xfer_resolution = 0x05;
+ break;
+
+ default:
+ dev_err(dev->dev, "designware-i2s: unsuppted PCM fmt");
+ return -EINVAL;
+ }
+
+ config->chan_nr = params_channels(params);
+
+ switch (config->chan_nr) {
+ case EIGHT_CHANNEL_SUPPORT:
+ ch_reg = 3;
+ case SIX_CHANNEL_SUPPORT:
+ ch_reg = 2;
+ case FOUR_CHANNEL_SUPPORT:
+ ch_reg = 1;
+ case TWO_CHANNEL_SUPPORT:
+ ch_reg = 0;
+ break;
+ default:
+ dev_err(dev->dev, "channel not supported\n");
+ }
+
+ i2s_disable_channels(dev, substream->stream);
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ i2s_write_reg(dev->i2s_base, TCR(ch_reg), xfer_resolution);
+ i2s_write_reg(dev->i2s_base, TFCR(ch_reg), 0x02);
+ irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
+ i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x30);
+ i2s_write_reg(dev->i2s_base, TER(ch_reg), 1);
+ } else {
+ i2s_write_reg(dev->i2s_base, RCR(ch_reg), xfer_resolution);
+ i2s_write_reg(dev->i2s_base, RFCR(ch_reg), 0x07);
+ irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
+ i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x03);
+ i2s_write_reg(dev->i2s_base, RER(ch_reg), 1);
+ }
+
+ i2s_write_reg(dev->i2s_base, CCR, ccr);
+
+ config->sample_rate = params_rate(params);
+
+ if (!dev->i2s_clk_cfg)
+ return -EINVAL;
+
+ ret = dev->i2s_clk_cfg(config);
+ if (ret < 0) {
+ dev_err(dev->dev, "runtime audio clk config fail\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+static void dw_i2s_shutdown(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai)
+{
+ snd_soc_dai_set_dma_data(dai, substream, NULL);
+}
+
+static int dw_i2s_trigger(struct snd_pcm_substream *substream,
+ int cmd, struct snd_soc_dai *dai)
+{
+ struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+ int ret = 0;
+
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ case SNDRV_PCM_TRIGGER_RESUME:
+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ dev->active++;
+ i2s_start(dev, substream);
+ break;
+
+ case SNDRV_PCM_TRIGGER_STOP:
+ case SNDRV_PCM_TRIGGER_SUSPEND:
+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+ dev->active--;
+ i2s_stop(dev, substream);
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ return ret;
+}
+
+static struct snd_soc_dai_ops dw_i2s_dai_ops = {
+ .startup = dw_i2s_startup,
+ .shutdown = dw_i2s_shutdown,
+ .hw_params = dw_i2s_hw_params,
+ .trigger = dw_i2s_trigger,
+};
+
+#ifdef CONFIG_PM
+
+static int dw_i2s_suspend(struct snd_soc_dai *dai)
+{
+ struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+
+ clk_disable(dev->clk);
+ return 0;
+}
+
+static int dw_i2s_resume(struct snd_soc_dai *dai)
+{
+ struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+
+ clk_enable(dev->clk);
+ return 0;
+}
+
+#else
+#define dw_i2s_suspend NULL
+#define dw_i2s_resume NULL
+#endif
+
+static int dw_i2s_probe(struct platform_device *pdev)
+{
+ const struct i2s_platform_data *pdata = pdev->dev.platform_data;
+ struct dw_i2s_dev *dev;
+ struct resource *res;
+ int ret;
+ unsigned int cap;
+ struct snd_soc_dai_driver *dw_i2s_dai;
+
+ if (!pdata) {
+ dev_err(&pdev->dev, "Invalid platform data\n");
+ return -EINVAL;
+ }
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_err(&pdev->dev, "no i2s resource defined\n");
+ return -ENODEV;
+ }
+
+ if (!devm_request_mem_region(&pdev->dev, res->start,
+ resource_size(res), pdev->name)) {
+ dev_err(&pdev->dev, "i2s region already claimed\n");
+ return -EBUSY;
+ }
+
+ dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
+ if (!dev) {
+ dev_warn(&pdev->dev, "kzalloc fail\n");
+ return -ENOMEM;
+ }
+
+ dev->i2s_base = devm_ioremap(&pdev->dev, res->start,
+ resource_size(res));
+ if (!dev->i2s_base) {
+ dev_err(&pdev->dev, "ioremap fail for i2s_region\n");
+ return -ENOMEM;
+ }
+
+ cap = pdata->cap;
+ dev->capability = cap;
+ dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
+
+ /* Set DMA slaves info */
+
+ dev->play_dma_data.data = pdata->play_dma_data;
+ dev->capture_dma_data.data = pdata->capture_dma_data;
+ dev->play_dma_data.addr = res->start + I2S_TXDMA;
+ dev->capture_dma_data.addr = res->start + I2S_RXDMA;
+ dev->play_dma_data.max_burst = 16;
+ dev->capture_dma_data.max_burst = 16;
+ dev->play_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+ dev->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+ dev->play_dma_data.filter = pdata->filter;
+ dev->capture_dma_data.filter = pdata->filter;
+
+ dev->clk = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(dev->clk))
+ return PTR_ERR(dev->clk);
+
+ ret = clk_enable(dev->clk);
+ if (ret < 0)
+ goto err_clk_put;
+
+ dw_i2s_dai = devm_kzalloc(&pdev->dev, sizeof(*dw_i2s_dai), GFP_KERNEL);
+ if (!dw_i2s_dai) {
+ dev_err(&pdev->dev, "mem allocation failed for dai driver\n");
+ ret = -ENOMEM;
+ goto err_clk_disable;
+ }
+
+ if (cap & DWC_I2S_PLAY) {
+ dev_dbg(&pdev->dev, " SPEAr: play supported\n");
+ dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM;
+ dw_i2s_dai->playback.channels_max = pdata->channel;
+ dw_i2s_dai->playback.formats = pdata->snd_fmts;
+ dw_i2s_dai->playback.rates = pdata->snd_rates;
+ }
+
+ if (cap & DWC_I2S_RECORD) {
+ dev_dbg(&pdev->dev, "SPEAr: record supported\n");
+ dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM;
+ dw_i2s_dai->capture.channels_max = pdata->channel;
+ dw_i2s_dai->capture.formats = pdata->snd_fmts;
+ dw_i2s_dai->capture.rates = pdata->snd_rates;
+ }
+
+ dw_i2s_dai->ops = &dw_i2s_dai_ops;
+ dw_i2s_dai->suspend = dw_i2s_suspend;
+ dw_i2s_dai->resume = dw_i2s_resume;
+
+ dev->dev = &pdev->dev;
+ dev_set_drvdata(&pdev->dev, dev);
+ ret = snd_soc_register_dai(&pdev->dev, dw_i2s_dai);
+ if (ret != 0) {
+ dev_err(&pdev->dev, "not able to register dai\n");
+ goto err_set_drvdata;
+ }
+
+ return 0;
+
+err_set_drvdata:
+ dev_set_drvdata(&pdev->dev, NULL);
+err_clk_disable:
+ clk_disable(dev->clk);
+err_clk_put:
+ clk_put(dev->clk);
+ return ret;
+}
+
+static int dw_i2s_remove(struct platform_device *pdev)
+{
+ struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev);
+
+ snd_soc_unregister_dai(&pdev->dev);
+ dev_set_drvdata(&pdev->dev, NULL);
+
+ clk_put(dev->clk);
+
+ return 0;
+}
+
+static struct platform_driver dw_i2s_driver = {
+ .probe = dw_i2s_probe,
+ .remove = dw_i2s_remove,
+ .driver = {
+ .name = "designware-i2s",
+ .owner = THIS_MODULE,
+ },
+};
+
+module_platform_driver(dw_i2s_driver);
+
+MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar@st.com>");
+MODULE_DESCRIPTION("DESIGNWARE I2S SoC Interface");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:designware_i2s");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH V2 3/9] sound:asoc: Add support for synopsys i2s controller as per ASoC framework.
2012-06-21 10:24 ` [PATCH V2 3/9] sound:asoc: Add support for synopsys i2s controller as per ASoC framework Rajeev Kumar
@ 2012-06-22 9:25 ` Mark Brown
2012-06-22 9:43 ` Rajeev kumar
0 siblings, 1 reply; 27+ messages in thread
From: Mark Brown @ 2012-06-22 9:25 UTC (permalink / raw)
To: Rajeev Kumar; +Cc: tiwai, alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 630 bytes --]
On Thu, Jun 21, 2012 at 03:54:51PM +0530, Rajeev Kumar wrote:
> This patch add support for synopsys I2S controller as per the ASoC
> framework.
I've applied this but I had to rewrite the subject line.
> +static int dw_i2s_suspend(struct snd_soc_dai *dai)
> +{
> + struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
> +
> + clk_disable(dev->clk);
> + return 0;
> +}
It seems a bit sad that we can't disable the clock when the device is
idle. If you need the clock for register I/O then something like the
Tegra approach of using regmap to provide a cached copy of the register
map when the device is idle should work well.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH V2 3/9] sound:asoc: Add support for synopsys i2s controller as per ASoC framework.
2012-06-22 9:25 ` Mark Brown
@ 2012-06-22 9:43 ` Rajeev kumar
0 siblings, 0 replies; 27+ messages in thread
From: Rajeev kumar @ 2012-06-22 9:43 UTC (permalink / raw)
To: Mark Brown
Cc: tiwai@suse.de, alsa-devel@alsa-project.org, lrg@slimlogic.co.uk,
spear-devel
Hello Mark,
On 6/22/2012 2:55 PM, Mark Brown wrote:
> On Thu, Jun 21, 2012 at 03:54:51PM +0530, Rajeev Kumar wrote:
>> This patch add support for synopsys I2S controller as per the ASoC
>> framework.
>
> I've applied this but I had to rewrite the subject line.
>
Thanks,
>> +static int dw_i2s_suspend(struct snd_soc_dai *dai)
>> +{
>> + struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
>> +
>> + clk_disable(dev->clk);
>> + return 0;
>> +}
>
> It seems a bit sad that we can't disable the clock when the device is
> idle. If you need the clock for register I/O then something like the
> Tegra approach of using regmap to provide a cached copy of the register
> map when the device is idle should work well.
I will keep this in my TODO list and will circulate a separate patch for
this later.
Best Regards
Rajeev
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 4/9] sound:asoc: Add support for SPEAr ASoC pcm layer.
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
` (2 preceding siblings ...)
2012-06-21 10:24 ` [PATCH V2 3/9] sound:asoc: Add support for synopsys i2s controller as per ASoC framework Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
2012-06-22 9:28 ` Mark Brown
2012-06-21 10:24 ` [PATCH V2 5/9] sound:asoc:spdif_in: Add spdif IN support Rajeev Kumar
` (4 subsequent siblings)
8 siblings, 1 reply; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: alsa-devel, Rajeev Kumar, lrg
This patch add support for the SPEAr ASoC pcm layer in ASoC
framework. The pcm layer uses common snd_dmaengine framework.
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
include/sound/spear_dma.h | 35 +++++++
sound/soc/spear/spear_pcm.c | 214 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 249 insertions(+), 0 deletions(-)
create mode 100644 include/sound/spear_dma.h
create mode 100644 sound/soc/spear/spear_pcm.c
diff --git a/include/sound/spear_dma.h b/include/sound/spear_dma.h
new file mode 100644
index 0000000..1b365bf
--- /dev/null
+++ b/include/sound/spear_dma.h
@@ -0,0 +1,35 @@
+/*
+* linux/spear_dma.h
+*
+* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)
+*
+* 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.
+*
+* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*
+*/
+
+#ifndef SPEAR_DMA_H
+#define SPEAR_DMA_H
+
+#include <linux/dmaengine.h>
+
+struct spear_dma_data {
+ void *data;
+ dma_addr_t addr;
+ u32 max_burst;
+ enum dma_slave_buswidth addr_width;
+ bool (*filter)(struct dma_chan *chan, void *slave);
+};
+
+#endif /* SPEAR_DMA_H */
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c
new file mode 100644
index 0000000..97c2cac
--- /dev/null
+++ b/sound/soc/spear/spear_pcm.c
@@ -0,0 +1,214 @@
+/*
+ * ALSA PCM interface for ST SPEAr Processors
+ *
+ * sound/soc/spear/spear_pcm.c
+ *
+ * Copyright (C) 2012 ST Microelectronics
+ * Rajeev Kumar<rajeev-dlh.kumar@st.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/module.h>
+#include <linux/dmaengine.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/scatterlist.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/dmaengine_pcm.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/spear_dma.h>
+
+struct snd_pcm_hardware spear_pcm_hardware = {
+ .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
+ SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
+ SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
+ .buffer_bytes_max = 16 * 1024, /* max buffer size */
+ .period_bytes_min = 2 * 1024, /* 1 msec data minimum period size */
+ .period_bytes_max = 2 * 1024, /* maximum period size */
+ .periods_min = 1, /* min # periods */
+ .periods_max = 8, /* max # of periods */
+ .fifo_size = 0, /* fifo size in bytes */
+};
+
+static int spear_pcm_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
+
+ return 0;
+}
+
+static int spear_pcm_hw_free(struct snd_pcm_substream *substream)
+{
+ snd_pcm_set_runtime_buffer(substream, NULL);
+
+ return 0;
+}
+
+static int spear_pcm_open(struct snd_pcm_substream *substream)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+
+ struct spear_dma_data *dma_data = (struct spear_dma_data *)
+ snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+ int ret;
+
+ ret = snd_soc_set_runtime_hwparams(substream, &spear_pcm_hardware);
+ if (ret)
+ return ret;
+
+ ret = snd_dmaengine_pcm_open(substream, dma_data->filter, dma_data);
+ if (ret)
+ return ret;
+
+ snd_dmaengine_pcm_set_data(substream, dma_data);
+
+ return 0;
+}
+
+static int spear_pcm_close(struct snd_pcm_substream *substream)
+{
+
+ snd_dmaengine_pcm_close(substream);
+
+ return 0;
+}
+
+static int spear_pcm_mmap(struct snd_pcm_substream *substream,
+ struct vm_area_struct *vma)
+{
+ struct snd_pcm_runtime *runtime = substream->runtime;
+
+ return dma_mmap_writecombine(substream->pcm->card->dev, vma,
+ runtime->dma_area, runtime->dma_addr,
+ runtime->dma_bytes);
+}
+
+static struct snd_pcm_ops spear_pcm_ops = {
+ .open = spear_pcm_open,
+ .close = spear_pcm_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = spear_pcm_hw_params,
+ .hw_free = spear_pcm_hw_free,
+ .trigger = snd_dmaengine_pcm_trigger,
+ .pointer = snd_dmaengine_pcm_pointer,
+ .mmap = spear_pcm_mmap,
+};
+
+static int
+spear_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream,
+ size_t size)
+{
+ struct snd_pcm_substream *substream = pcm->streams[stream].substream;
+ struct snd_dma_buffer *buf = &substream->dma_buffer;
+
+ buf->dev.type = SNDRV_DMA_TYPE_DEV;
+ buf->dev.dev = pcm->card->dev;
+ buf->private_data = NULL;
+
+ buf->area = dma_alloc_writecombine(pcm->card->dev, size,
+ &buf->addr, GFP_KERNEL);
+ if (!buf->area)
+ return -ENOMEM;
+
+ dev_info(buf->dev.dev,
+ " preallocate_dma_buffer: area=%p, addr=%p, size=%d\n",
+ (void *)buf->area, (void *)buf->addr, size);
+
+ buf->bytes = size;
+ return 0;
+}
+
+static void spear_pcm_free(struct snd_pcm *pcm)
+{
+ struct snd_pcm_substream *substream;
+ struct snd_dma_buffer *buf;
+ int stream;
+
+ for (stream = 0; stream < 2; stream++) {
+ substream = pcm->streams[stream].substream;
+ if (!substream)
+ continue;
+
+ buf = &substream->dma_buffer;
+ if (!buf && !buf->area)
+ continue;
+
+ dma_free_writecombine(pcm->card->dev, buf->bytes,
+ buf->area, buf->addr);
+ buf->area = NULL;
+ }
+}
+
+static u64 spear_pcm_dmamask = DMA_BIT_MASK(32);
+
+static int spear_pcm_new(struct snd_card *card,
+ struct snd_soc_dai *dai, struct snd_pcm *pcm)
+{
+ int ret;
+
+ if (!card->dev->dma_mask)
+ card->dev->dma_mask = &spear_pcm_dmamask;
+ if (!card->dev->coherent_dma_mask)
+ card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
+
+ if (dai->driver->playback.channels_min) {
+ ret = spear_pcm_preallocate_dma_buffer(pcm,
+ SNDRV_PCM_STREAM_PLAYBACK,
+ spear_pcm_hardware.buffer_bytes_max);
+ if (ret)
+ return ret;
+ }
+
+ if (dai->driver->capture.channels_min) {
+ ret = spear_pcm_preallocate_dma_buffer(pcm,
+ SNDRV_PCM_STREAM_CAPTURE,
+ spear_pcm_hardware.buffer_bytes_max);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+struct snd_soc_platform_driver spear_soc_platform = {
+ .ops = &spear_pcm_ops,
+ .pcm_new = spear_pcm_new,
+ .pcm_free = spear_pcm_free,
+};
+
+static int __devinit spear_soc_platform_probe(struct platform_device *pdev)
+{
+ return snd_soc_register_platform(&pdev->dev, &spear_soc_platform);
+}
+
+static int __devexit spear_soc_platform_remove(struct platform_device *pdev)
+{
+ snd_soc_unregister_platform(&pdev->dev);
+
+ return 0;
+}
+
+static struct platform_driver spear_pcm_driver = {
+ .driver = {
+ .name = "spear-pcm-audio",
+ .owner = THIS_MODULE,
+ },
+
+ .probe = spear_soc_platform_probe,
+ .remove = __devexit_p(spear_soc_platform_remove),
+};
+
+module_platform_driver(spear_pcm_driver);
+
+MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar@st.com>");
+MODULE_DESCRIPTION("SPEAr PCM DMA module");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:spear-pcm-audio");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH V2 4/9] sound:asoc: Add support for SPEAr ASoC pcm layer.
2012-06-21 10:24 ` [PATCH V2 4/9] sound:asoc: Add support for SPEAr ASoC pcm layer Rajeev Kumar
@ 2012-06-22 9:28 ` Mark Brown
2012-06-22 9:37 ` Rajeev kumar
0 siblings, 1 reply; 27+ messages in thread
From: Mark Brown @ 2012-06-22 9:28 UTC (permalink / raw)
To: Rajeev Kumar; +Cc: tiwai, alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 237 bytes --]
On Thu, Jun 21, 2012 at 03:54:52PM +0530, Rajeev Kumar wrote:
> This patch add support for the SPEAr ASoC pcm layer in ASoC
> framework. The pcm layer uses common snd_dmaengine framework.
Applied, thanks (again with rewritten subject).
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH V2 4/9] sound:asoc: Add support for SPEAr ASoC pcm layer.
2012-06-22 9:28 ` Mark Brown
@ 2012-06-22 9:37 ` Rajeev kumar
0 siblings, 0 replies; 27+ messages in thread
From: Rajeev kumar @ 2012-06-22 9:37 UTC (permalink / raw)
To: Mark Brown
Cc: tiwai@suse.de, alsa-devel@alsa-project.org, lrg@slimlogic.co.uk,
spear-devel
On 6/22/2012 2:58 PM, Mark Brown wrote:
> On Thu, Jun 21, 2012 at 03:54:52PM +0530, Rajeev Kumar wrote:
>> This patch add support for the SPEAr ASoC pcm layer in ASoC
>> framework. The pcm layer uses common snd_dmaengine framework.
>
> Applied, thanks (again with rewritten subject).
Thanks,
Best Regards
Rajeev
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 5/9] sound:asoc:spdif_in: Add spdif IN support
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
` (3 preceding siblings ...)
2012-06-21 10:24 ` [PATCH V2 4/9] sound:asoc: Add support for SPEAr ASoC pcm layer Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
2012-06-23 10:55 ` Mark Brown
2012-06-21 10:24 ` [PATCH V2 6/9] sound:asoc:spdif_out: Add spdif out support Rajeev Kumar
` (3 subsequent siblings)
8 siblings, 1 reply; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: Vipin Kumar, alsa-devel, Rajeev Kumar, lrg
From: Vipin Kumar <vipin.kumar@st.com>
This patch implements the spdif IN driver for ST peripheral
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
include/sound/spear_spdif.h | 29 ++++
sound/soc/spear/spdif_in.c | 297 +++++++++++++++++++++++++++++++++++++++
sound/soc/spear/spdif_in_regs.h | 60 ++++++++
3 files changed, 386 insertions(+), 0 deletions(-)
create mode 100644 include/sound/spear_spdif.h
create mode 100644 sound/soc/spear/spdif_in.c
create mode 100644 sound/soc/spear/spdif_in_regs.h
diff --git a/include/sound/spear_spdif.h b/include/sound/spear_spdif.h
new file mode 100644
index 0000000..a12f396
--- /dev/null
+++ b/include/sound/spear_spdif.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (ST) 2012 Vipin Kumar (vipin.kumar@st.com)
+ *
+ * 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.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __SOUND_SPDIF_H
+#define __SOUND_SPDIF_H
+
+struct spear_spdif_platform_data {
+ /* DMA params */
+ void *dma_params;
+ bool (*filter)(struct dma_chan *chan, void *slave);
+ void (*reset_perip)(void);
+};
+
+#endif /* SOUND_SPDIF_H */
diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c
new file mode 100644
index 0000000..c7c4b20
--- /dev/null
+++ b/sound/soc/spear/spdif_in.c
@@ -0,0 +1,297 @@
+/*
+ * ALSA SoC SPDIF In Audio Layer for spear processors
+ *
+ * Copyright (C) 2012 ST Microelectronics
+ * Vipin Kumar <vipin.kumar@st.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/spear_dma.h>
+#include <sound/spear_spdif.h>
+#include "spdif_in_regs.h"
+
+struct spdif_in_params {
+ u32 format;
+};
+
+struct spdif_in_dev {
+ struct clk *clk;
+ struct spear_dma_data dma_params;
+ struct spdif_in_params saved_params;
+ void *io_base;
+ struct device *dev;
+ void (*reset_perip)(void);
+ int irq;
+};
+
+static void spdif_in_configure(struct spdif_in_dev *host)
+{
+ u32 ctrl = SPDIF_IN_PRTYEN | SPDIF_IN_STATEN | SPDIF_IN_USREN |
+ SPDIF_IN_VALEN | SPDIF_IN_BLKEN;
+ ctrl |= SPDIF_MODE_16BIT | SPDIF_FIFO_THRES_16;
+
+ writel(ctrl, host->io_base + SPDIF_IN_CTRL);
+ writel(0xF, host->io_base + SPDIF_IN_IRQ_MASK);
+}
+
+static int spdif_in_startup(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *cpu_dai)
+{
+ struct spdif_in_dev *host = snd_soc_dai_get_drvdata(cpu_dai);
+
+ if (substream->stream != SNDRV_PCM_STREAM_CAPTURE)
+ return -EINVAL;
+
+ snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)&host->dma_params);
+ return 0;
+}
+
+static void spdif_in_shutdown(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai)
+{
+ struct spdif_in_dev *host = snd_soc_dai_get_drvdata(dai);
+
+ if (substream->stream != SNDRV_PCM_STREAM_CAPTURE)
+ return;
+
+ writel(0x0, host->io_base + SPDIF_IN_IRQ_MASK);
+ snd_soc_dai_set_dma_data(dai, substream, NULL);
+}
+
+static void spdif_in_format(struct spdif_in_dev *host, u32 format)
+{
+ u32 ctrl = readl(host->io_base + SPDIF_IN_CTRL);
+
+ switch (format) {
+ case SNDRV_PCM_FORMAT_S16_LE:
+ ctrl |= SPDIF_XTRACT_16BIT;
+ break;
+
+ case SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE:
+ ctrl &= ~SPDIF_XTRACT_16BIT;
+ break;
+ }
+
+ writel(ctrl, host->io_base + SPDIF_IN_CTRL);
+}
+
+static int spdif_in_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai)
+{
+ struct spdif_in_dev *host = snd_soc_dai_get_drvdata(dai);
+ u32 format;
+
+ if (substream->stream != SNDRV_PCM_STREAM_CAPTURE)
+ return -EINVAL;
+
+ format = params_format(params);
+ host->saved_params.format = format;
+
+ return 0;
+}
+
+static int spdif_in_trigger(struct snd_pcm_substream *substream, int cmd,
+ struct snd_soc_dai *dai)
+{
+ struct spdif_in_dev *host = snd_soc_dai_get_drvdata(dai);
+ u32 ctrl;
+ int ret = 0;
+
+ if (substream->stream != SNDRV_PCM_STREAM_CAPTURE)
+ return -EINVAL;
+
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ case SNDRV_PCM_TRIGGER_RESUME:
+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ clk_enable(host->clk);
+ spdif_in_configure(host);
+ spdif_in_format(host, host->saved_params.format);
+
+ ctrl = readl(host->io_base + SPDIF_IN_CTRL);
+ ctrl |= SPDIF_IN_SAMPLE | SPDIF_IN_ENB;
+ writel(ctrl, host->io_base + SPDIF_IN_CTRL);
+ writel(0xF, host->io_base + SPDIF_IN_IRQ_MASK);
+ break;
+
+ case SNDRV_PCM_TRIGGER_STOP:
+ case SNDRV_PCM_TRIGGER_SUSPEND:
+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+ ctrl = readl(host->io_base + SPDIF_IN_CTRL);
+ ctrl &= ~(SPDIF_IN_SAMPLE | SPDIF_IN_ENB);
+ writel(ctrl, host->io_base + SPDIF_IN_CTRL);
+ writel(0x0, host->io_base + SPDIF_IN_IRQ_MASK);
+
+ if (host->reset_perip)
+ host->reset_perip();
+ clk_disable(host->clk);
+ break;
+
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ return ret;
+}
+
+static struct snd_soc_dai_ops spdif_in_dai_ops = {
+ .startup = spdif_in_startup,
+ .shutdown = spdif_in_shutdown,
+ .trigger = spdif_in_trigger,
+ .hw_params = spdif_in_hw_params,
+};
+
+struct snd_soc_dai_driver spdif_in_dai = {
+ .capture = {
+ .channels_min = 2,
+ .channels_max = 2,
+ .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | \
+ SNDRV_PCM_RATE_192000),
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | \
+ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE,
+ },
+ .ops = &spdif_in_dai_ops,
+};
+
+static irqreturn_t spdif_in_irq(int irq, void *arg)
+{
+ struct spdif_in_dev *host = (struct spdif_in_dev *)arg;
+
+ u32 irq_status = readl(host->io_base + SPDIF_IN_IRQ);
+
+ if (!irq_status)
+ return IRQ_NONE;
+
+ if (irq_status & SPDIF_IRQ_FIFOWRITE)
+ dev_err(host->dev, "spdif in: fifo write error");
+ if (irq_status & SPDIF_IRQ_EMPTYFIFOREAD)
+ dev_err(host->dev, "spdif in: empty fifo read error");
+ if (irq_status & SPDIF_IRQ_FIFOFULL)
+ dev_err(host->dev, "spdif in: fifo full error");
+ if (irq_status & SPDIF_IRQ_OUTOFRANGE)
+ dev_err(host->dev, "spdif in: out of range error");
+
+ writel(0, host->io_base + SPDIF_IN_IRQ);
+
+ return IRQ_HANDLED;
+}
+
+static int spdif_in_probe(struct platform_device *pdev)
+{
+ struct spdif_in_dev *host;
+ struct spear_spdif_platform_data *pdata;
+ struct resource *res, *res_fifo;
+ int ret;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -EINVAL;
+
+ res_fifo = platform_get_resource(pdev, IORESOURCE_IO, 0);
+ if (!res_fifo)
+ return -EINVAL;
+
+ if (!devm_request_mem_region(&pdev->dev, res->start,
+ resource_size(res), pdev->name)) {
+ dev_warn(&pdev->dev, "Failed to get memory resourse\n");
+ return -ENOENT;
+ }
+
+ host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
+ if (!host) {
+ dev_warn(&pdev->dev, "kzalloc fail\n");
+ return -ENOMEM;
+ }
+
+ host->io_base = devm_ioremap(&pdev->dev, res->start,
+ resource_size(res));
+ if (!host->io_base) {
+ dev_warn(&pdev->dev, "ioremap failed\n");
+ return -ENOMEM;
+ }
+
+ host->irq = platform_get_irq(pdev, 0);
+ if (host->irq < 0)
+ return -EINVAL;
+
+ host->clk = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(host->clk))
+ return PTR_ERR(host->clk);
+
+ pdata = dev_get_platdata(&pdev->dev);
+
+ if (!pdata)
+ return -EINVAL;
+
+ host->dma_params.data = pdata->dma_params;
+ host->dma_params.addr = res_fifo->start;
+ host->dma_params.max_burst = 16;
+ host->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+ host->dma_params.filter = pdata->filter;
+ host->reset_perip = pdata->reset_perip;
+
+ host->dev = &pdev->dev;
+ dev_set_drvdata(&pdev->dev, host);
+
+ ret = devm_request_irq(&pdev->dev, host->irq, spdif_in_irq, 0,
+ "spdif-in", host);
+ if (ret) {
+ clk_put(host->clk);
+ dev_warn(&pdev->dev, "request_irq failed\n");
+ return ret;
+ }
+
+ ret = snd_soc_register_dai(&pdev->dev, &spdif_in_dai);
+ if (ret != 0) {
+ clk_put(host->clk);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int spdif_in_remove(struct platform_device *pdev)
+{
+ struct spdif_in_dev *host = dev_get_drvdata(&pdev->dev);
+
+ snd_soc_unregister_dai(&pdev->dev);
+ dev_set_drvdata(&pdev->dev, NULL);
+
+ clk_put(host->clk);
+
+ return 0;
+}
+
+
+static struct platform_driver spdif_in_driver = {
+ .probe = spdif_in_probe,
+ .remove = spdif_in_remove,
+ .driver = {
+ .name = "spdif-in",
+ .owner = THIS_MODULE,
+ },
+};
+
+module_platform_driver(spdif_in_driver);
+
+MODULE_AUTHOR("Vipin Kumar <vipin.kumar@st.com>");
+MODULE_DESCRIPTION("SPEAr SPDIF IN SoC Interface");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:spdif_in");
diff --git a/sound/soc/spear/spdif_in_regs.h b/sound/soc/spear/spdif_in_regs.h
new file mode 100644
index 0000000..37af7bc
--- /dev/null
+++ b/sound/soc/spear/spdif_in_regs.h
@@ -0,0 +1,60 @@
+/*
+ * SPEAr SPDIF IN controller header file
+ *
+ * Copyright (ST) 2011 Vipin Kumar (vipin.kumar@st.com)
+ *
+ * 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.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef SPDIF_IN_REGS_H
+#define SPDIF_IN_REGS_H
+
+#define SPDIF_IN_CTRL 0x00
+ #define SPDIF_IN_PRTYEN (1 << 20)
+ #define SPDIF_IN_STATEN (1 << 19)
+ #define SPDIF_IN_USREN (1 << 18)
+ #define SPDIF_IN_VALEN (1 << 17)
+ #define SPDIF_IN_BLKEN (1 << 16)
+
+ #define SPDIF_MODE_24BIT (8 << 12)
+ #define SPDIF_MODE_23BIT (7 << 12)
+ #define SPDIF_MODE_22BIT (6 << 12)
+ #define SPDIF_MODE_21BIT (5 << 12)
+ #define SPDIF_MODE_20BIT (4 << 12)
+ #define SPDIF_MODE_19BIT (3 << 12)
+ #define SPDIF_MODE_18BIT (2 << 12)
+ #define SPDIF_MODE_17BIT (1 << 12)
+ #define SPDIF_MODE_16BIT (0 << 12)
+ #define SPDIF_MODE_MASK (0x0F << 12)
+
+ #define SPDIF_IN_VALID (1 << 11)
+ #define SPDIF_IN_SAMPLE (1 << 10)
+ #define SPDIF_DATA_SWAP (1 << 9)
+ #define SPDIF_IN_ENB (1 << 8)
+ #define SPDIF_DATA_REVERT (1 << 7)
+ #define SPDIF_XTRACT_16BIT (1 << 6)
+ #define SPDIF_FIFO_THRES_16 (16 << 0)
+
+#define SPDIF_IN_IRQ_MASK 0x04
+#define SPDIF_IN_IRQ 0x08
+ #define SPDIF_IRQ_FIFOWRITE (1 << 0)
+ #define SPDIF_IRQ_EMPTYFIFOREAD (1 << 1)
+ #define SPDIF_IRQ_FIFOFULL (1 << 2)
+ #define SPDIF_IRQ_OUTOFRANGE (1 << 3)
+
+#define SPDIF_IN_STA 0x0C
+ #define SPDIF_IN_LOCK (0x1 << 0)
+
+#endif /* SPDIF_IN_REGS_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH V2 5/9] sound:asoc:spdif_in: Add spdif IN support
2012-06-21 10:24 ` [PATCH V2 5/9] sound:asoc:spdif_in: Add spdif IN support Rajeev Kumar
@ 2012-06-23 10:55 ` Mark Brown
0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2012-06-23 10:55 UTC (permalink / raw)
To: Rajeev Kumar; +Cc: tiwai, Vipin Kumar, alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 236 bytes --]
On Thu, Jun 21, 2012 at 03:54:53PM +0530, Rajeev Kumar wrote:
> From: Vipin Kumar <vipin.kumar@st.com>
>
> This patch implements the spdif IN driver for ST peripheral
Applied, thanks, with the usual comment about subject lines.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 6/9] sound:asoc:spdif_out: Add spdif out support
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
` (4 preceding siblings ...)
2012-06-21 10:24 ` [PATCH V2 5/9] sound:asoc:spdif_in: Add spdif IN support Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
2012-06-23 10:56 ` Mark Brown
2012-06-21 10:24 ` [PATCH V2 7/9] sound:asoc: Add support for SPEAr ASoC machine driver Rajeev Kumar
` (2 subsequent siblings)
8 siblings, 1 reply; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: Vipin Kumar, alsa-devel, Rajeev Kumar, lrg
From: Vipin Kumar <vipin.kumar@st.com>
This patch implements the spdif out driver for ST peripheral. This
peripheral implements IEC60958 standard
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
sound/soc/spear/spdif_out.c | 397 ++++++++++++++++++++++++++++++++++++++
sound/soc/spear/spdif_out_regs.h | 79 ++++++++
2 files changed, 476 insertions(+), 0 deletions(-)
create mode 100644 sound/soc/spear/spdif_out.c
create mode 100644 sound/soc/spear/spdif_out_regs.h
diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
new file mode 100644
index 0000000..cb1969a
--- /dev/null
+++ b/sound/soc/spear/spdif_out.c
@@ -0,0 +1,397 @@
+/*
+ * ALSA SoC SPDIF Out Audio Layer for spear processors
+ *
+ * Copyright (C) 2012 ST Microelectronics
+ * Vipin Kumar <vipin.kumar@st.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <sound/soc.h>
+#include <sound/spear_dma.h>
+#include <sound/spear_spdif.h>
+#include "spdif_out_regs.h"
+
+static int spdif_out_mute;
+
+struct spdif_out_params {
+ u32 rate;
+ u32 core_freq;
+};
+
+struct spdif_out_dev {
+ struct clk *clk;
+ struct spear_dma_data dma_params;
+ struct spdif_out_params saved_params;
+ u32 running;
+ void *io_base;
+};
+
+static void spdif_out_configure(struct spdif_out_dev *host)
+{
+ writel(SPDIF_OUT_RESET, host->io_base + SPDIF_OUT_SOFT_RST);
+ mdelay(1);
+ writel(readl(host->io_base + SPDIF_OUT_SOFT_RST) & ~SPDIF_OUT_RESET,
+ host->io_base + SPDIF_OUT_SOFT_RST);
+
+ writel(SPDIF_OUT_FDMA_TRIG_16 | SPDIF_OUT_MEMFMT_16_16 |
+ SPDIF_OUT_VALID_HW | SPDIF_OUT_USER_HW |
+ SPDIF_OUT_CHNLSTA_HW | SPDIF_OUT_PARITY_HW,
+ host->io_base + SPDIF_OUT_CFG);
+
+ writel(0x7F, host->io_base + SPDIF_OUT_INT_STA_CLR);
+ writel(0x7F, host->io_base + SPDIF_OUT_INT_EN_CLR);
+}
+
+static int spdif_out_startup(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *cpu_dai)
+{
+ struct spdif_out_dev *host = snd_soc_dai_get_drvdata(cpu_dai);
+ int ret;
+
+ if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
+ return -EINVAL;
+
+ snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)&host->dma_params);
+
+ ret = clk_enable(host->clk);
+ if (ret)
+ return ret;
+
+ host->running = true;
+ spdif_out_configure(host);
+
+ return 0;
+}
+
+static void spdif_out_shutdown(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai)
+{
+ struct spdif_out_dev *host = snd_soc_dai_get_drvdata(dai);
+
+ if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
+ return;
+
+ clk_disable(host->clk);
+ host->running = false;
+ snd_soc_dai_set_dma_data(dai, substream, NULL);
+}
+
+static void spdif_out_clock(struct spdif_out_dev *host, u32 core_freq,
+ u32 rate)
+{
+ u32 divider, ctrl;
+
+ clk_set_rate(host->clk, core_freq);
+ divider = DIV_ROUND_CLOSEST(clk_get_rate(host->clk), (rate * 128));
+
+ ctrl = readl(host->io_base + SPDIF_OUT_CTRL);
+ ctrl &= ~SPDIF_DIVIDER_MASK;
+ ctrl |= (divider << SPDIF_DIVIDER_SHIFT) & SPDIF_DIVIDER_MASK;
+ writel(ctrl, host->io_base + SPDIF_OUT_CTRL);
+}
+
+static int spdif_out_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai)
+{
+ struct spdif_out_dev *host = snd_soc_dai_get_drvdata(dai);
+ u32 rate, core_freq;
+
+ if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
+ return -EINVAL;
+
+ rate = params_rate(params);
+
+ switch (rate) {
+ case 8000:
+ case 16000:
+ case 32000:
+ case 64000:
+ /*
+ * The clock is multiplied by 10 to bring it to feasible range
+ * of frequencies for sscg
+ */
+ core_freq = 64000 * 128 * 10; /* 81.92 MHz */
+ break;
+ case 5512:
+ case 11025:
+ case 22050:
+ case 44100:
+ case 88200:
+ case 176400:
+ core_freq = 176400 * 128; /* 22.5792 MHz */
+ break;
+ case 48000:
+ case 96000:
+ case 192000:
+ default:
+ core_freq = 192000 * 128; /* 24.576 MHz */
+ break;
+ }
+
+ spdif_out_clock(host, core_freq, rate);
+ host->saved_params.core_freq = core_freq;
+ host->saved_params.rate = rate;
+
+ return 0;
+}
+
+static int spdif_out_trigger(struct snd_pcm_substream *substream, int cmd,
+ struct snd_soc_dai *dai)
+{
+ struct spdif_out_dev *host = snd_soc_dai_get_drvdata(dai);
+ u32 ctrl;
+ int ret = 0;
+
+ if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
+ return -EINVAL;
+
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ case SNDRV_PCM_TRIGGER_RESUME:
+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ ctrl = readl(host->io_base + SPDIF_OUT_CTRL);
+ ctrl &= ~SPDIF_OPMODE_MASK;
+ if (!spdif_out_mute)
+ ctrl |= SPDIF_OPMODE_AUD_DATA |
+ SPDIF_STATE_NORMAL;
+ else
+ ctrl |= SPDIF_OPMODE_MUTE_PCM;
+ writel(ctrl, host->io_base + SPDIF_OUT_CTRL);
+ break;
+
+ case SNDRV_PCM_TRIGGER_STOP:
+ case SNDRV_PCM_TRIGGER_SUSPEND:
+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+ ctrl = readl(host->io_base + SPDIF_OUT_CTRL);
+ ctrl &= ~SPDIF_OPMODE_MASK;
+ ctrl |= SPDIF_OPMODE_OFF;
+ writel(ctrl, host->io_base + SPDIF_OUT_CTRL);
+ break;
+
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ return ret;
+}
+
+static int spdif_digital_mute(struct snd_soc_dai *dai, int mute)
+{
+ struct spdif_out_dev *host = snd_soc_dai_get_drvdata(dai);
+ u32 val;
+
+ spdif_out_mute = mute;
+ val = readl(host->io_base + SPDIF_OUT_CTRL);
+ val &= ~SPDIF_OPMODE_MASK;
+
+ if (mute)
+ val |= SPDIF_OPMODE_MUTE_PCM;
+ else {
+ if (host->running)
+ val |= SPDIF_OPMODE_AUD_DATA | SPDIF_STATE_NORMAL;
+ else
+ val |= SPDIF_OPMODE_OFF;
+ }
+
+ writel(val, host->io_base + SPDIF_OUT_CTRL);
+ return 0;
+}
+
+static int spdif_mute_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ ucontrol->value.integer.value[0] = spdif_out_mute;
+ return 0;
+}
+
+static int spdif_mute_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+ struct snd_soc_card *card = codec->card;
+ struct snd_soc_pcm_runtime *rtd = card->rtd;
+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+
+ if (spdif_out_mute == ucontrol->value.integer.value[0])
+ return 0;
+
+ spdif_digital_mute(cpu_dai, ucontrol->value.integer.value[0]);
+
+ return 1;
+}
+static const struct snd_kcontrol_new spdif_out_controls[] = {
+ SOC_SINGLE_BOOL_EXT("SPDIF Play Mute", (unsigned long)&spdif_out_mute,
+ spdif_mute_get, spdif_mute_put),
+};
+
+int spdif_soc_dai_probe(struct snd_soc_dai *dai)
+{
+ struct snd_soc_card *card = dai->card;
+ struct snd_soc_pcm_runtime *rtd = card->rtd;
+ struct snd_soc_codec *codec = rtd->codec;
+
+ return snd_soc_add_codec_controls(codec, spdif_out_controls,
+ ARRAY_SIZE(spdif_out_controls));
+}
+
+static struct snd_soc_dai_ops spdif_out_dai_ops = {
+ .digital_mute = spdif_digital_mute,
+ .startup = spdif_out_startup,
+ .shutdown = spdif_out_shutdown,
+ .trigger = spdif_out_trigger,
+ .hw_params = spdif_out_hw_params,
+};
+
+struct snd_soc_dai_driver spdif_out_dai = {
+ .playback = {
+ .channels_min = 2,
+ .channels_max = 2,
+ .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | \
+ SNDRV_PCM_RATE_192000),
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ },
+ .probe = spdif_soc_dai_probe,
+ .ops = (struct snd_soc_dai_ops *)&spdif_out_dai_ops,
+};
+
+static int spdif_out_probe(struct platform_device *pdev)
+{
+ struct spdif_out_dev *host;
+ struct spear_spdif_platform_data *pdata;
+ struct resource *res;
+ int ret;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -EINVAL;
+
+ if (!devm_request_mem_region(&pdev->dev, res->start,
+ resource_size(res), pdev->name)) {
+ dev_warn(&pdev->dev, "Failed to get memory resourse\n");
+ return -ENOENT;
+ }
+
+ host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
+ if (!host) {
+ dev_warn(&pdev->dev, "kzalloc fail\n");
+ return -ENOMEM;
+ }
+
+ host->io_base = devm_ioremap(&pdev->dev, res->start,
+ resource_size(res));
+ if (!host->io_base) {
+ dev_warn(&pdev->dev, "ioremap failed\n");
+ return -ENOMEM;
+ }
+
+ host->clk = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(host->clk))
+ return PTR_ERR(host->clk);
+
+ pdata = dev_get_platdata(&pdev->dev);
+
+ host->dma_params.data = pdata->dma_params;
+ host->dma_params.addr = res->start + SPDIF_OUT_FIFO_DATA;
+ host->dma_params.max_burst = 16;
+ host->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+ host->dma_params.filter = pdata->filter;
+
+ dev_set_drvdata(&pdev->dev, host);
+
+ ret = snd_soc_register_dai(&pdev->dev, &spdif_out_dai);
+ if (ret != 0) {
+ clk_put(host->clk);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int spdif_out_remove(struct platform_device *pdev)
+{
+ struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev);
+
+ snd_soc_unregister_dai(&pdev->dev);
+ dev_set_drvdata(&pdev->dev, NULL);
+
+ clk_put(host->clk);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int spdif_out_suspend(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev);
+
+ if (host->running)
+ clk_disable(host->clk);
+
+ return 0;
+}
+
+static int spdif_out_resume(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev);
+
+ if (host->running) {
+ clk_enable(host->clk);
+ spdif_out_configure(host);
+ spdif_out_clock(host, host->saved_params.core_freq,
+ host->saved_params.rate);
+ }
+ return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(spdif_out_dev_pm_ops, spdif_out_suspend, \
+ spdif_out_resume);
+
+#define SPDIF_OUT_DEV_PM_OPS (&spdif_out_dev_pm_ops)
+
+#else
+#define SPDIF_OUT_DEV_PM_OPS NULL
+
+#endif
+
+static struct platform_driver spdif_out_driver = {
+ .probe = spdif_out_probe,
+ .remove = spdif_out_remove,
+ .driver = {
+ .name = "spdif-out",
+ .owner = THIS_MODULE,
+ .pm = SPDIF_OUT_DEV_PM_OPS,
+ },
+};
+
+static int __init spdif_out_init(void)
+{
+ return platform_driver_register(&spdif_out_driver);
+}
+module_init(spdif_out_init);
+
+static void __exit spdif_out_exit(void)
+{
+ platform_driver_unregister(&spdif_out_driver);
+}
+module_exit(spdif_out_exit);
+
+MODULE_AUTHOR("Vipin Kumar <vipin.kumar@st.com>");
+MODULE_DESCRIPTION("SPEAr SPDIF OUT SoC Interface");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:spdif_out");
diff --git a/sound/soc/spear/spdif_out_regs.h b/sound/soc/spear/spdif_out_regs.h
new file mode 100644
index 0000000..a5e5332
--- /dev/null
+++ b/sound/soc/spear/spdif_out_regs.h
@@ -0,0 +1,79 @@
+/*
+ * SPEAr SPDIF OUT controller header file
+ *
+ * Copyright (ST) 2011 Vipin Kumar (vipin.kumar@st.com)
+ *
+ * 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.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef SPDIF_OUT_REGS_H
+#define SPDIF_OUT_REGS_H
+
+#define SPDIF_OUT_SOFT_RST 0x00
+ #define SPDIF_OUT_RESET (1 << 0)
+#define SPDIF_OUT_FIFO_DATA 0x04
+#define SPDIF_OUT_INT_STA 0x08
+#define SPDIF_OUT_INT_STA_CLR 0x0C
+ #define SPDIF_INT_UNDERFLOW (1 << 0)
+ #define SPDIF_INT_EODATA (1 << 1)
+ #define SPDIF_INT_EOBLOCK (1 << 2)
+ #define SPDIF_INT_EOLATENCY (1 << 3)
+ #define SPDIF_INT_EOPD_DATA (1 << 4)
+ #define SPDIF_INT_MEMFULLREAD (1 << 5)
+ #define SPDIF_INT_EOPD_PAUSE (1 << 6)
+
+#define SPDIF_OUT_INT_EN 0x10
+#define SPDIF_OUT_INT_EN_SET 0x14
+#define SPDIF_OUT_INT_EN_CLR 0x18
+#define SPDIF_OUT_CTRL 0x1C
+ #define SPDIF_OPMODE_MASK (7 << 0)
+ #define SPDIF_OPMODE_OFF (0 << 0)
+ #define SPDIF_OPMODE_MUTE_PCM (1 << 0)
+ #define SPDIF_OPMODE_MUTE_PAUSE (2 << 0)
+ #define SPDIF_OPMODE_AUD_DATA (3 << 0)
+ #define SPDIF_OPMODE_ENCODE (4 << 0)
+ #define SPDIF_STATE_NORMAL (1 << 3)
+ #define SPDIF_DIVIDER_MASK (0xff << 5)
+ #define SPDIF_DIVIDER_SHIFT (5)
+ #define SPDIF_SAMPLEREAD_MASK (0x1ffff << 15)
+ #define SPDIF_SAMPLEREAD_SHIFT (15)
+#define SPDIF_OUT_STA 0x20
+#define SPDIF_OUT_PA_PB 0x24
+#define SPDIF_OUT_PC_PD 0x28
+#define SPDIF_OUT_CL1 0x2C
+#define SPDIF_OUT_CR1 0x30
+#define SPDIF_OUT_CL2_CR2_UV 0x34
+#define SPDIF_OUT_PAUSE_LAT 0x38
+#define SPDIF_OUT_FRMLEN_BRST 0x3C
+#define SPDIF_OUT_CFG 0x40
+ #define SPDIF_OUT_MEMFMT_16_0 (0 << 5)
+ #define SPDIF_OUT_MEMFMT_16_16 (1 << 5)
+ #define SPDIF_OUT_VALID_DMA (0 << 3)
+ #define SPDIF_OUT_VALID_HW (1 << 3)
+ #define SPDIF_OUT_USER_DMA (0 << 2)
+ #define SPDIF_OUT_USER_HW (1 << 2)
+ #define SPDIF_OUT_CHNLSTA_DMA (0 << 1)
+ #define SPDIF_OUT_CHNLSTA_HW (1 << 1)
+ #define SPDIF_OUT_PARITY_HW (0 << 0)
+ #define SPDIF_OUT_PARITY_DMA (1 << 0)
+ #define SPDIF_OUT_FDMA_TRIG_2 (2 << 8)
+ #define SPDIF_OUT_FDMA_TRIG_6 (6 << 8)
+ #define SPDIF_OUT_FDMA_TRIG_8 (8 << 8)
+ #define SPDIF_OUT_FDMA_TRIG_10 (10 << 8)
+ #define SPDIF_OUT_FDMA_TRIG_12 (12 << 8)
+ #define SPDIF_OUT_FDMA_TRIG_16 (16 << 8)
+ #define SPDIF_OUT_FDMA_TRIG_18 (18 << 8)
+
+#endif /* SPDIF_OUT_REGS_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH V2 6/9] sound:asoc:spdif_out: Add spdif out support
2012-06-21 10:24 ` [PATCH V2 6/9] sound:asoc:spdif_out: Add spdif out support Rajeev Kumar
@ 2012-06-23 10:56 ` Mark Brown
0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2012-06-23 10:56 UTC (permalink / raw)
To: Rajeev Kumar; +Cc: tiwai, Vipin Kumar, alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 321 bytes --]
On Thu, Jun 21, 2012 at 03:54:54PM +0530, Rajeev Kumar wrote:
> From: Vipin Kumar <vipin.kumar@st.com>
>
> This patch implements the spdif out driver for ST peripheral. This
> peripheral implements IEC60958 standard
This is fine but it should use module_platform_driver(), please resend
with the other patches.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 7/9] sound:asoc: Add support for SPEAr ASoC machine driver.
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
` (5 preceding siblings ...)
2012-06-21 10:24 ` [PATCH V2 6/9] sound:asoc:spdif_out: Add spdif out support Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
2012-06-23 11:01 ` Mark Brown
2012-06-21 10:24 ` [PATCH V2 8/9] sound:asoc: Add Kconfig and Makefile to support SPEAr audio driver Rajeev Kumar
2012-06-21 10:24 ` [PATCH V2 9/9] sound:asoc: Update Kconfig and Makefile(sound/soc/) to support SPEAr audio Rajeev Kumar
8 siblings, 1 reply; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: alsa-devel, Rajeev Kumar, lrg
The patch add support for SPEAr ASoC machine driver.
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
sound/soc/spear/spear_evb.c | 206 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 206 insertions(+), 0 deletions(-)
create mode 100644 sound/soc/spear/spear_evb.c
diff --git a/sound/soc/spear/spear_evb.c b/sound/soc/spear/spear_evb.c
new file mode 100644
index 0000000..fcde033
--- /dev/null
+++ b/sound/soc/spear/spear_evb.c
@@ -0,0 +1,206 @@
+/*
+ * ASoC machine driver for SPEAr evaluation boards
+ *
+ * sound/soc/spear/spear_evb.c
+ *
+ * Copyright (C) 2010 ST Microelectronics
+ * Rajeev Kumar<rajeev-dlh.kumar@st.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <mach/hardware.h>
+
+static int sta529_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;
+ int ret = 0;
+
+ /* set codec DAI configuration */
+ ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
+ SND_SOC_DAIFMT_CBS_CFM);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+/* Audio machine driver for SPEAr evb */
+static struct snd_soc_ops sta529_ops = {
+ .hw_params = sta529_hw_params,
+};
+
+/* SPEAr audio interface glue - connects codec <--> CPU <--> platform */
+static struct snd_soc_dai_link spear_evb_dai[] = {
+ {
+ .name = "sta529-pcm",
+ .stream_name = "pcm",
+ .cpu_dai_name = "designware-i2s.0",
+ .platform_name = "spear-pcm-audio",
+ .codec_dai_name = "sta529-audio",
+ .codec_name = "sta529-codec.0-001a",
+ .ops = &sta529_ops,
+ },
+};
+
+/* SPEAr audio machine driver */
+static struct snd_soc_card spear_snd_card = {
+ .name = "spear-evb",
+ .dai_link = spear_evb_dai,
+ .num_links = ARRAY_SIZE(spear_evb_dai),
+};
+
+/* SPEAr320s audio interface glue - connects codec <--> CPU <--> platform */
+static struct snd_soc_dai_link spear320s_evb_dai[] = {
+ {
+ .name = "sta529-pcm",
+ .stream_name = "pcm",
+ .cpu_dai_name = "designware-i2s",
+ .platform_name = "spear-pcm-audio",
+ .codec_dai_name = "sta529-audio",
+ .codec_name = "sta529-codec.0-001a",
+ .ops = &sta529_ops,
+ },
+};
+
+/* SPEAr320s audio machine driver */
+static struct snd_soc_card spear320s_snd_card = {
+ .name = "spear320s-evb",
+ .dai_link = spear320s_evb_dai,
+ .num_links = ARRAY_SIZE(spear320s_evb_dai),
+};
+
+/* LCAD audio interface glue - connects codec <--> CPU <--> platform */
+static struct snd_soc_dai_link lcad_evb_dai[] = {
+ {
+ .name = "sta529-pcm0",
+ .stream_name = "I2S Playback",
+ .cpu_dai_name = "designware-i2s.0",
+ .platform_name = "spear-pcm-audio",
+ .codec_dai_name = "sta529-audio",
+ .codec_name = "sta529-codec.0-001a",
+ .ops = &sta529_ops,
+ }, {
+ .name = "sta529-pcm1",
+ .stream_name = "I2S Capture",
+ .cpu_dai_name = "designware-i2s.1",
+ .platform_name = "spear-pcm-audio",
+ .codec_dai_name = "sta529-audio",
+ .codec_name = "sta529-codec.0-001a",
+ .ops = &sta529_ops,
+ },
+};
+
+static struct snd_soc_card lcad_snd_card = {
+ .name = "lcad-evb",
+ .dai_link = lcad_evb_dai,
+ .num_links = ARRAY_SIZE(lcad_evb_dai),
+};
+
+/* Audio machine driver for SPEAr1340 evb */
+
+/* SPEAr1340 audio interface glue - connects codec <--> CPU <--> platform */
+static struct snd_soc_dai_link spear1340_evb_dai[] = {
+ {
+ .name = "spdif-pcm0",
+ .stream_name = "SPDIF Playback",
+ .cpu_dai_name = "spdif-out",
+ .platform_name = "spear-pcm-audio",
+ .codec_dai_name = "dit-hifi",
+ .codec_name = "spdif-dit",
+ .ops = NULL,
+ }, {
+ .name = "spdif-pcm1",
+ .stream_name = "SPDIF Capture",
+ .cpu_dai_name = "spdif-in",
+ .platform_name = "spear-pcm-audio",
+ .codec_dai_name = "dir-hifi",
+ .codec_name = "spdif-dir",
+ .ops = NULL,
+ }, {
+ .name = "sta529-pcm0",
+ .stream_name = "I2S Playback",
+ .cpu_dai_name = "designware-i2s.0",
+ .platform_name = "spear-pcm-audio",
+ .codec_dai_name = "sta529-audio",
+ .codec_name = "sta529-codec.0-001a",
+ .ops = &sta529_ops,
+ }, {
+ .name = "sta529-pcm1",
+ .stream_name = "I2S Capture",
+ .cpu_dai_name = "designware-i2s.1",
+ .platform_name = "spear-pcm-audio",
+ .codec_dai_name = "sta529-audio",
+ .codec_name = "sta529-codec.0-001a",
+ .ops = &sta529_ops,
+ },
+};
+
+static struct snd_soc_card spear1340_snd_card = {
+ .name = "spear1340-evb",
+ .dai_link = spear1340_evb_dai,
+ .num_links = ARRAY_SIZE(spear1340_evb_dai),
+};
+
+static __devinit int spear_evb_probe(struct platform_device *pdev)
+{
+ struct snd_soc_card *spear_soc_card;
+ int ret;
+
+ if (of_machine_is_compatible("st,spear_lcad"))
+ spear_soc_card = &lcad_snd_card;
+ else if (of_machine_is_compatible("st,spear1340"))
+ spear_soc_card = &spear1340_snd_card;
+ else if (of_machine_is_compatible("st,spear320"))
+ spear_soc_card = &spear320s_snd_card;
+ else
+ spear_soc_card = &spear_snd_card;
+
+ spear_soc_card->dev = &pdev->dev;
+
+ ret = snd_soc_register_card(spear_soc_card);
+ if (ret) {
+ dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int __devexit spear_evb_remove(struct platform_device *pdev)
+{
+ struct snd_soc_card *spear_soc_card = platform_get_drvdata(pdev);
+
+ snd_soc_unregister_card(spear_soc_card);
+
+ return 0;
+}
+
+static struct platform_driver spear_evb_driver = {
+ .driver = {
+ .name = "spear-evb",
+ .owner = THIS_MODULE,
+ .pm = &snd_soc_pm_ops,
+ },
+ .probe = spear_evb_probe,
+ .remove = __devexit_p(spear_evb_remove),
+};
+
+module_platform_driver(spear_evb_driver);
+
+MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar@st.com>");
+MODULE_DESCRIPTION("ST SPEAr EVB ASoC driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:spear evb");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH V2 7/9] sound:asoc: Add support for SPEAr ASoC machine driver.
2012-06-21 10:24 ` [PATCH V2 7/9] sound:asoc: Add support for SPEAr ASoC machine driver Rajeev Kumar
@ 2012-06-23 11:01 ` Mark Brown
2012-06-25 10:28 ` Rajeev kumar
0 siblings, 1 reply; 27+ messages in thread
From: Mark Brown @ 2012-06-23 11:01 UTC (permalink / raw)
To: Rajeev Kumar; +Cc: tiwai, alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 955 bytes --]
On Thu, Jun 21, 2012 at 03:54:55PM +0530, Rajeev Kumar wrote:
> + /* set codec DAI configuration */
> + ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
> + SND_SOC_DAIFMT_CBS_CFM);
You can se this in the dai_link structure rather than having to set it
in hw_params() every time.
> +static struct platform_driver spear_evb_driver = {
> + .driver = {
> + .name = "spear-evb",
> + .owner = THIS_MODULE,
> + .pm = &snd_soc_pm_ops,
> + },
> + .probe = spear_evb_probe,
> + .remove = __devexit_p(spear_evb_remove),
> +};
I'd expect to see an of_match_table in the device too given that you're
parsing OF compatible data. Given how simple this is I wonder if you
can instead add DT support to the simple-card driver which Morimoto-san
recently contributed rather than adding a new driver?
> +MODULE_ALIAS("platform:spear evb");
This won't match against anything in the driver.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH V2 7/9] sound:asoc: Add support for SPEAr ASoC machine driver.
2012-06-23 11:01 ` Mark Brown
@ 2012-06-25 10:28 ` Rajeev kumar
2012-06-27 4:37 ` Rajeev kumar
0 siblings, 1 reply; 27+ messages in thread
From: Rajeev kumar @ 2012-06-25 10:28 UTC (permalink / raw)
To: Mark Brown
Cc: tiwai@suse.de, alsa-devel@alsa-project.org, lrg@slimlogic.co.uk
Hello Mark,
On 6/23/2012 4:31 PM, Mark Brown wrote:
> On Thu, Jun 21, 2012 at 03:54:55PM +0530, Rajeev Kumar wrote:
>
>> + /* set codec DAI configuration */
>> + ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
>> + SND_SOC_DAIFMT_CBS_CFM);
>
> You can se this in the dai_link structure rather than having to set it
> in hw_params() every time.
>
Ok, I will do that.
>> +static struct platform_driver spear_evb_driver = {
>> + .driver = {
>> + .name = "spear-evb",
>> + .owner = THIS_MODULE,
>> + .pm =&snd_soc_pm_ops,
>> + },
>> + .probe = spear_evb_probe,
>> + .remove = __devexit_p(spear_evb_remove),
>> +};
>
> I'd expect to see an of_match_table in the device too given that you're
> parsing OF compatible data. Given how simple this is I wonder if you
> can instead add DT support to the simple-card driver which Morimoto-san
> recently contributed rather than adding a new driver?
>
I am not well-versed with device-tree framework. It will take me some
time to study and incorporate the changes. I will get back on this point
as soon as I finish the same.
In the meanwhile can I send the V3 of rest patches which is not applied,
namely
1. [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec.
2. [PATCH V2 2/9] sound:asoc: Add support for STA529 Audio Codec.
3. [PATCH V2 6/9] sound:asoc:spdif_out: Add spdif out support
>> +MODULE_ALIAS("platform:spear evb");
>
> This won't match against anything in the driver.
OK.
Best Regards
Rajeev
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH V2 7/9] sound:asoc: Add support for SPEAr ASoC machine driver.
2012-06-25 10:28 ` Rajeev kumar
@ 2012-06-27 4:37 ` Rajeev kumar
2012-06-27 11:12 ` Mark Brown
0 siblings, 1 reply; 27+ messages in thread
From: Rajeev kumar @ 2012-06-27 4:37 UTC (permalink / raw)
To: Rajeev kumar
Cc: tiwai@suse.de, alsa-devel@alsa-project.org, Mark Brown,
lrg@slimlogic.co.uk
Hello Mark,
On 6/25/2012 3:58 PM, Rajeev kumar wrote:
>> I'd expect to see an of_match_table in the device too given that you're
>> parsing OF compatible data. Given how simple this is I wonder if you
>> can instead add DT support to the simple-card driver which Morimoto-san
>> recently contributed rather than adding a new driver?
>>
This will completely eliminate m/c driver. Am I correct ?
>
> I am not well-versed with device-tree framework. It will take me some
> time to study and incorporate the changes. I will get back on this point
> as soon as I finish the same.
>
> In the meanwhile can I send the V3 of rest patches which is not applied,
> namely
>
> 1. [PATCH V2 1/9] sound:asoc: Add support for spdif in Audio Codec.
> 2. [PATCH V2 2/9] sound:asoc: Add support for STA529 Audio Codec.
> 3. [PATCH V2 6/9] sound:asoc:spdif_out: Add spdif out support
Can I send above patches.
Best Regards
Rajeev
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH V2 7/9] sound:asoc: Add support for SPEAr ASoC machine driver.
2012-06-27 4:37 ` Rajeev kumar
@ 2012-06-27 11:12 ` Mark Brown
0 siblings, 0 replies; 27+ messages in thread
From: Mark Brown @ 2012-06-27 11:12 UTC (permalink / raw)
To: Rajeev kumar
Cc: tiwai@suse.de, alsa-devel@alsa-project.org, lrg@slimlogic.co.uk
[-- Attachment #1.1: Type: text/plain, Size: 541 bytes --]
On Wed, Jun 27, 2012 at 10:07:04AM +0530, Rajeev kumar wrote:
> Hello Mark,
>
> On 6/25/2012 3:58 PM, Rajeev kumar wrote:
> >>I'd expect to see an of_match_table in the device too given that you're
> >>parsing OF compatible data. Given how simple this is I wonder if you
> >>can instead add DT support to the simple-card driver which Morimoto-san
> >>recently contributed rather than adding a new driver?
> This will completely eliminate m/c driver. Am I correct ?
Well, it'll mean that you don't need to write a custom one.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 8/9] sound:asoc: Add Kconfig and Makefile to support SPEAr audio driver
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
` (6 preceding siblings ...)
2012-06-21 10:24 ` [PATCH V2 7/9] sound:asoc: Add support for SPEAr ASoC machine driver Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
2012-06-21 10:24 ` [PATCH V2 9/9] sound:asoc: Update Kconfig and Makefile(sound/soc/) to support SPEAr audio Rajeev Kumar
8 siblings, 0 replies; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: alsa-devel, Rajeev Kumar, lrg
This patch add Kconfig and Makefile to support SPEAr Audio driver
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
sound/soc/spear/Kconfig | 40 ++++++++++++++++++++++++++++++++++++++++
sound/soc/spear/Makefile | 7 +++++++
2 files changed, 47 insertions(+), 0 deletions(-)
create mode 100644 sound/soc/spear/Kconfig
create mode 100644 sound/soc/spear/Makefile
diff --git a/sound/soc/spear/Kconfig b/sound/soc/spear/Kconfig
new file mode 100644
index 0000000..23529a2
--- /dev/null
+++ b/sound/soc/spear/Kconfig
@@ -0,0 +1,40 @@
+config SND_SPEAR_EVM
+ tristate "SoC Audio support for SPEAr EVM"
+ select SND_DESIGNWARE_I2S
+ select SND_SOC_STA529
+ select SND_SPEAR_SOC
+ help
+ Say Y if you want to add support for SoC audio on SPEAr
+ platform
+
+config SND_SPEAR1340_EVM
+ tristate "SoC Audio support for SPEAr1340 EVM"
+ select SND_DESIGNWARE_I2S
+ select SND_SOC_STA529
+ select SND_SPEAR_SPDIF_OUT
+ select SND_SPEAR_SPDIF_IN
+ select SND_SOC_SPDIF
+ select SND_SPEAR_SOC
+ help
+ Say Y if you want to add support for SoC audio on SPEAr1340
+ platform
+
+config SND_SPEAR_SOC
+ tristate "SoC Audio for the ST chip"
+ depends on SND_DESIGNWARE_I2S || SND_SPEAR_SPDIF_OUT || \
+ SND_SPEAR_SPDIF_IN
+ select SND_SOC_DMAENGINE_PCM
+ help
+ Say Y or M if you want to add support for any of the audio
+ controllers (I2S/SPDIF). You will also need to select
+ the audio interface codecs to support below.
+
+config SND_SPEAR_SPDIF_OUT
+ tristate "SPEAr SPDIF Out Device Driver"
+ help
+ Say Y or M if you want to add support for SPDIF OUT driver.
+
+config SND_SPEAR_SPDIF_IN
+ tristate "SPEAr SPDIF IN Device Driver"
+ help
+ Say Y or M if you want to add support for SPDIF IN driver.
diff --git a/sound/soc/spear/Makefile b/sound/soc/spear/Makefile
new file mode 100644
index 0000000..b365126
--- /dev/null
+++ b/sound/soc/spear/Makefile
@@ -0,0 +1,7 @@
+# SPEAR Platform Support
+obj-$(CONFIG_SND_SPEAR_SOC) += spear_pcm.o
+obj-$(CONFIG_SND_SPEAR_SPDIF_IN) += spdif_in.o
+obj-$(CONFIG_SND_SPEAR_SPDIF_OUT) += spdif_out.o
+
+# SPEAR Machine Support
+obj-$(CONFIG_SND_SPEAR_EVM) += spear_evb.o
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH V2 9/9] sound:asoc: Update Kconfig and Makefile(sound/soc/) to support SPEAr audio
2012-06-21 10:24 [PATCH V2 0/9] Add ASoC drivers for SPEAr platform & I2S driver for Designware module Rajeev Kumar
` (7 preceding siblings ...)
2012-06-21 10:24 ` [PATCH V2 8/9] sound:asoc: Add Kconfig and Makefile to support SPEAr audio driver Rajeev Kumar
@ 2012-06-21 10:24 ` Rajeev Kumar
8 siblings, 0 replies; 27+ messages in thread
From: Rajeev Kumar @ 2012-06-21 10:24 UTC (permalink / raw)
To: tiwai, broonie, perex; +Cc: alsa-devel, Rajeev Kumar, lrg
This patch update Kconfig and Makefile present in soc directory to
support SPEAr
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
---
sound/soc/Kconfig | 1 +
sound/soc/Makefile | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index c5de0a8..8309589 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -46,6 +46,7 @@ source "sound/soc/pxa/Kconfig"
source "sound/soc/samsung/Kconfig"
source "sound/soc/s6000/Kconfig"
source "sound/soc/sh/Kconfig"
+source "sound/soc/spear/Kconfig"
source "sound/soc/tegra/Kconfig"
source "sound/soc/txx9/Kconfig"
source "sound/soc/ux500/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 00a555a..4a8c886 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_SND_SOC) += pxa/
obj-$(CONFIG_SND_SOC) += samsung/
obj-$(CONFIG_SND_SOC) += s6000/
obj-$(CONFIG_SND_SOC) += sh/
+obj-$(CONFIG_SND_SOC) += spear/
obj-$(CONFIG_SND_SOC) += tegra/
obj-$(CONFIG_SND_SOC) += txx9/
obj-$(CONFIG_SND_SOC) += ux500/
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread