* [PATCH 1/2] ASoC: pcm1792a: Remove empty capture DAI stub
@ 2013-08-13 17:30 Mark Brown
2013-08-13 17:30 ` [PATCH 2/2] ASoC: pcm1792a: Add DAPM support Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2013-08-13 17:30 UTC (permalink / raw)
To: Michael Trimarchi, Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
These intialisations are just what will be done for static data anyway so
remove them.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/pcm1792a.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c
index 72cf835..c57d3a5 100644
--- a/sound/soc/codecs/pcm1792a.c
+++ b/sound/soc/codecs/pcm1792a.c
@@ -162,10 +162,6 @@ static struct snd_soc_dai_driver pcm1792a_dai = {
.channels_max = 2,
.rates = PCM1792A_RATES,
.formats = PCM1792A_FORMATS, },
- .capture = {
- .channels_min = 0,
- .channels_max = 0,
- },
.ops = &pcm1792a_dai_ops,
};
--
1.8.4.rc2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ASoC: pcm1792a: Add DAPM support
2013-08-13 17:30 [PATCH 1/2] ASoC: pcm1792a: Remove empty capture DAI stub Mark Brown
@ 2013-08-13 17:30 ` Mark Brown
2013-08-23 15:16 ` Michael Trimarchi
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2013-08-13 17:30 UTC (permalink / raw)
To: Michael Trimarchi, Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Provide DAPM for the device, ensuring operation with DAPM required by the
core and making it easier to hook up external hardware to it.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/pcm1792a.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c
index c57d3a5..2a8eccf 100644
--- a/sound/soc/codecs/pcm1792a.c
+++ b/sound/soc/codecs/pcm1792a.c
@@ -154,6 +154,20 @@ static const struct snd_kcontrol_new pcm1792a_controls[] = {
pcm1792a_dac_tlv),
};
+static const struct snd_soc_dapm_widget pcm1792a_dapm_widgets[] = {
+SND_SOC_DAPM_OUTPUT("IOUTL+"),
+SND_SOC_DAPM_OUTPUT("IOUTL-"),
+SND_SOC_DAPM_OUTPUT("IOUTR+"),
+SND_SOC_DAPM_OUTPUT("IOUTR-"),
+};
+
+static const struct snd_soc_dapm_route pcm1792a_dapm_routes[] = {
+ { "IOUTL+", NULL, "Playback" },
+ { "IOUTL-", NULL, "Playback" },
+ { "IOUTR+", NULL, "Playback" },
+ { "IOUTR-", NULL, "Playback" },
+};
+
static struct snd_soc_dai_driver pcm1792a_dai = {
.name = "pcm1792a-hifi",
.playback = {
@@ -184,6 +198,10 @@ static const struct regmap_config pcm1792a_regmap = {
static struct snd_soc_codec_driver soc_codec_dev_pcm1792a = {
.controls = pcm1792a_controls,
.num_controls = ARRAY_SIZE(pcm1792a_controls),
+ .dapm_widgets = pcm1792a_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(pcm1792a_dapm_widgets),
+ .dapm_routes = pcm1792a_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(pcm1792a_dapm_routes),
};
static int pcm1792a_spi_probe(struct spi_device *spi)
--
1.8.4.rc2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] ASoC: pcm1792a: Add DAPM support
2013-08-13 17:30 ` [PATCH 2/2] ASoC: pcm1792a: Add DAPM support Mark Brown
@ 2013-08-23 15:16 ` Michael Trimarchi
2013-08-23 15:36 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Michael Trimarchi @ 2013-08-23 15:16 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, linaro-kernel, Liam Girdwood, Mark Brown
Hi Mark
On Tue, Aug 13, 2013 at 06:30:48PM +0100, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> Provide DAPM for the device, ensuring operation with DAPM required by the
> core and making it easier to hook up external hardware to it.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
> sound/soc/codecs/pcm1792a.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c
> index c57d3a5..2a8eccf 100644
> --- a/sound/soc/codecs/pcm1792a.c
> +++ b/sound/soc/codecs/pcm1792a.c
> @@ -154,6 +154,20 @@ static const struct snd_kcontrol_new pcm1792a_controls[] = {
> pcm1792a_dac_tlv),
> };
>
> +static const struct snd_soc_dapm_widget pcm1792a_dapm_widgets[] = {
> +SND_SOC_DAPM_OUTPUT("IOUTL+"),
> +SND_SOC_DAPM_OUTPUT("IOUTL-"),
> +SND_SOC_DAPM_OUTPUT("IOUTR+"),
> +SND_SOC_DAPM_OUTPUT("IOUTR-"),
> +};
> +
I'm working on support pcm1795 and pcm1796 too. They are registers compatible
but different sample rate support. So the idea is three patches?
- rename pcm1792a to pcm179x (is it possible?)
- add three different dai for pcm1792a, pcm1795 and pcm1796
- use of_device_id data pointer to select the correct dai
Michael
> +static const struct snd_soc_dapm_route pcm1792a_dapm_routes[] = {
> + { "IOUTL+", NULL, "Playback" },
> + { "IOUTL-", NULL, "Playback" },
> + { "IOUTR+", NULL, "Playback" },
> + { "IOUTR-", NULL, "Playback" },
> +};
> +
> static struct snd_soc_dai_driver pcm1792a_dai = {
> .name = "pcm1792a-hifi",
> .playback = {
> @@ -184,6 +198,10 @@ static const struct regmap_config pcm1792a_regmap = {
> static struct snd_soc_codec_driver soc_codec_dev_pcm1792a = {
> .controls = pcm1792a_controls,
> .num_controls = ARRAY_SIZE(pcm1792a_controls),
> + .dapm_widgets = pcm1792a_dapm_widgets,
> + .num_dapm_widgets = ARRAY_SIZE(pcm1792a_dapm_widgets),
> + .dapm_routes = pcm1792a_dapm_routes,
> + .num_dapm_routes = ARRAY_SIZE(pcm1792a_dapm_routes),
> };
>
> static int pcm1792a_spi_probe(struct spi_device *spi)
> --
> 1.8.4.rc2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] ASoC: pcm1792a: Add DAPM support
2013-08-23 15:16 ` Michael Trimarchi
@ 2013-08-23 15:36 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2013-08-23 15:36 UTC (permalink / raw)
To: Michael Trimarchi; +Cc: alsa-devel, linaro-kernel, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 502 bytes --]
On Fri, Aug 23, 2013 at 05:16:48PM +0200, Michael Trimarchi wrote:
> I'm working on support pcm1795 and pcm1796 too. They are registers compatible
> but different sample rate support. So the idea is three patches?
> - rename pcm1792a to pcm179x (is it possible?)
> - add three different dai for pcm1792a, pcm1795 and pcm1796
> - use of_device_id data pointer to select the correct dai
Yes, that seems like a good approach - no problem with the rename, just
make sure the existing users are updated.
[-- 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] 4+ messages in thread
end of thread, other threads:[~2013-08-23 15:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-13 17:30 [PATCH 1/2] ASoC: pcm1792a: Remove empty capture DAI stub Mark Brown
2013-08-13 17:30 ` [PATCH 2/2] ASoC: pcm1792a: Add DAPM support Mark Brown
2013-08-23 15:16 ` Michael Trimarchi
2013-08-23 15:36 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.