* [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver()
@ 2012-05-09 17:14 Brian Austin
2012-05-09 17:14 ` [PATCH 2/3] ASoC: cs42l73: Remove Chip ID's from reg_default Brian Austin
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Brian Austin @ 2012-05-09 17:14 UTC (permalink / raw)
To: alsa-devel; +Cc: Brian Austin, broonie, lrg
Signed-off-by: Brian Austin <brian.austin@cirrus.com>
---
sound/soc/codecs/cs42l73.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index a94e1e9..60b7f53 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1428,25 +1428,7 @@ static struct i2c_driver cs42l73_i2c_driver = {
};
-static int __init cs42l73_modinit(void)
-{
- int ret;
- ret = i2c_add_driver(&cs42l73_i2c_driver);
- if (ret != 0) {
- pr_err("Failed to register CS42L73 I2C driver: %d\n", ret);
- return ret;
- }
- return 0;
-}
-
-module_init(cs42l73_modinit);
-
-static void __exit cs42l73_exit(void)
-{
- i2c_del_driver(&cs42l73_i2c_driver);
-}
-
-module_exit(cs42l73_exit);
+module_i2c_driver(cs42l73_i2c_driver);
MODULE_DESCRIPTION("ASoC CS42L73 driver");
MODULE_AUTHOR("Georgi Vlaev, Nucleus Systems Ltd, <joe@nucleusys.com>");
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] ASoC: cs42l73: Remove Chip ID's from reg_default
2012-05-09 17:14 [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver() Brian Austin
@ 2012-05-09 17:14 ` Brian Austin
2012-05-09 17:20 ` Mark Brown
2012-05-09 17:14 ` [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's Brian Austin
2012-05-09 17:20 ` [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver() Mark Brown
2 siblings, 1 reply; 9+ messages in thread
From: Brian Austin @ 2012-05-09 17:14 UTC (permalink / raw)
To: alsa-devel; +Cc: Brian Austin, broonie, lrg
We need to read the real register values
Signed-off-by: Brian Austin <brian.austin@cirrus.com>
---
sound/soc/codecs/cs42l73.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 60b7f53..1cf2206 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -43,9 +43,6 @@ struct cs42l73_private {
};
static const struct reg_default cs42l73_reg_defaults[] = {
- { 1, 0x42 }, /* r01 - Device ID A&B */
- { 2, 0xA7 }, /* r02 - Device ID C&D */
- { 3, 0x30 }, /* r03 - Device ID E */
{ 6, 0xF1 }, /* r06 - Power Ctl 1 */
{ 7, 0xDF }, /* r07 - Power Ctl 2 */
{ 8, 0x3F }, /* r08 - Power Ctl 3 */
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's
2012-05-09 17:14 [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver() Brian Austin
2012-05-09 17:14 ` [PATCH 2/3] ASoC: cs42l73: Remove Chip ID's from reg_default Brian Austin
@ 2012-05-09 17:14 ` Brian Austin
2012-05-09 17:18 ` Brian Austin
2012-05-09 17:18 ` Mark Brown
2012-05-09 17:20 ` [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver() Mark Brown
2 siblings, 2 replies; 9+ messages in thread
From: Brian Austin @ 2012-05-09 17:14 UTC (permalink / raw)
To: alsa-devel; +Cc: Brian Austin, broonie, lrg
Signed-off-by: Brian Austin <brian.austin@cirrus.com>
---
sound/soc/codecs/cs42l73.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 1cf2206..d8b325c 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -773,6 +773,14 @@ static const struct snd_soc_dapm_route cs42l73_audio_map[] = {
{"HL Left Mixer", NULL, "VSPIN"},
{"HL Right Mixer", NULL, "VSPIN"},
+ {"ASPINL", NULL, "ASP Playback"},
+ {"ASPINM", NULL, "ASP Playback"},
+ {"ASPINR", NULL, "ASP Playback"},
+ {"XSPINL", NULL, "XSP Playback"},
+ {"XSPINM", NULL, "XSP Playback"},
+ {"XSPINR", NULL, "XSP Playback"},
+ {"VSPIN", NULL, "VSP Playback"},
+
/* Capture Paths */
{"MIC1", NULL, "MIC1 Bias"},
{"PGA Left Mux", "Mic 1", "MIC1"},
@@ -819,6 +827,13 @@ static const struct snd_soc_dapm_route cs42l73_audio_map[] = {
{"VSPOUTL", NULL, "VSPL Output Mixer"},
{"VSPOUTR", NULL, "VSPR Output Mixer"},
+
+ {"ASP Capture", NULL, "ASPOUTL"},
+ {"ASP Capture", NULL, "ASPOUTR"},
+ {"XSP Capture", NULL, "XSPOUTL"},
+ {"XSP Capture", NULL, "XSPOUTR"},
+ {"VSP Capture", NULL, "VSPOUTL"},
+ {"VSP Capture", NULL, "VSPOUTR"},
};
struct cs42l73_mclk_div {
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's
2012-05-09 17:14 ` [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's Brian Austin
@ 2012-05-09 17:18 ` Brian Austin
2012-05-09 17:18 ` Mark Brown
1 sibling, 0 replies; 9+ messages in thread
From: Brian Austin @ 2012-05-09 17:18 UTC (permalink / raw)
To: Brian Austin; +Cc: alsa-devel, broonie, lrg
On Wed, 9 May 2012, Brian Austin wrote:
> Signed-off-by: Brian Austin <brian.austin@cirrus.com>
> ---
> sound/soc/codecs/cs42l73.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
> index 1cf2206..d8b325c 100644
> --- a/sound/soc/codecs/cs42l73.c
> +++ b/sound/soc/codecs/cs42l73.c
> @@ -773,6 +773,14 @@ static const struct snd_soc_dapm_route cs42l73_audio_map[] = {
> {"HL Left Mixer", NULL, "VSPIN"},
> {"HL Right Mixer", NULL, "VSPIN"},
>
> + {"ASPINL", NULL, "ASP Playback"},
> + {"ASPINM", NULL, "ASP Playback"},
> + {"ASPINR", NULL, "ASP Playback"},
> + {"XSPINL", NULL, "XSP Playback"},
> + {"XSPINM", NULL, "XSP Playback"},
> + {"XSPINR", NULL, "XSP Playback"},
> + {"VSPIN", NULL, "VSP Playback"},
> +
> /* Capture Paths */
> {"MIC1", NULL, "MIC1 Bias"},
> {"PGA Left Mux", "Mic 1", "MIC1"},
> @@ -819,6 +827,13 @@ static const struct snd_soc_dapm_route cs42l73_audio_map[] = {
>
> {"VSPOUTL", NULL, "VSPL Output Mixer"},
> {"VSPOUTR", NULL, "VSPR Output Mixer"},
> +
> + {"ASP Capture", NULL, "ASPOUTL"},
> + {"ASP Capture", NULL, "ASPOUTR"},
> + {"XSP Capture", NULL, "XSPOUTL"},
> + {"XSP Capture", NULL, "XSPOUTR"},
> + {"VSP Capture", NULL, "VSPOUTL"},
> + {"VSP Capture", NULL, "VSPOUTR"},
> };
I forgot to add the other part in the SND_SOC_DAPM_AIF_IN and
SND_SOC_DAPM_AIF_OUT Widgets.
I'll resend this one, sorry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's
2012-05-09 17:14 ` [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's Brian Austin
2012-05-09 17:18 ` Brian Austin
@ 2012-05-09 17:18 ` Mark Brown
2012-05-09 17:20 ` Brian Austin
1 sibling, 1 reply; 9+ messages in thread
From: Mark Brown @ 2012-05-09 17:18 UTC (permalink / raw)
To: Brian Austin; +Cc: alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 253 bytes --]
On Wed, May 09, 2012 at 12:14:04PM -0500, Brian Austin wrote:
> Signed-off-by: Brian Austin <brian.austin@cirrus.com>
I'd also expect to see the stream name removed from the AIF widgets,
otherwise you get duplicate links (which is harmless but still).
[-- 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] 9+ messages in thread
* Re: [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver()
2012-05-09 17:14 [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver() Brian Austin
2012-05-09 17:14 ` [PATCH 2/3] ASoC: cs42l73: Remove Chip ID's from reg_default Brian Austin
2012-05-09 17:14 ` [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's Brian Austin
@ 2012-05-09 17:20 ` Mark Brown
2 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2012-05-09 17:20 UTC (permalink / raw)
To: Brian Austin; +Cc: alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 136 bytes --]
On Wed, May 09, 2012 at 12:14:02PM -0500, Brian Austin wrote:
> Signed-off-by: Brian Austin <brian.austin@cirrus.com>
Applied, thanks.
[-- 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] 9+ messages in thread
* Re: [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's
2012-05-09 17:18 ` Mark Brown
@ 2012-05-09 17:20 ` Brian Austin
2012-05-09 17:29 ` Mark Brown
0 siblings, 1 reply; 9+ messages in thread
From: Brian Austin @ 2012-05-09 17:20 UTC (permalink / raw)
To: Mark Brown; +Cc: Brian Austin, alsa-devel, lrg
On Wed, 9 May 2012, Mark Brown wrote:
> On Wed, May 09, 2012 at 12:14:04PM -0500, Brian Austin wrote:
>> Signed-off-by: Brian Austin <brian.austin@cirrus.com>
>
> I'd also expect to see the stream name removed from the AIF widgets,
> otherwise you get duplicate links (which is harmless but still).
>
can I just submit a new patch that adds the AIF widget changes? Or resend
this one with it included?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] ASoC: cs42l73: Remove Chip ID's from reg_default
2012-05-09 17:14 ` [PATCH 2/3] ASoC: cs42l73: Remove Chip ID's from reg_default Brian Austin
@ 2012-05-09 17:20 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2012-05-09 17:20 UTC (permalink / raw)
To: Brian Austin; +Cc: alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 123 bytes --]
On Wed, May 09, 2012 at 12:14:03PM -0500, Brian Austin wrote:
> We need to read the real register values
Applied, thanks.
[-- 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] 9+ messages in thread
* Re: [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's
2012-05-09 17:20 ` Brian Austin
@ 2012-05-09 17:29 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2012-05-09 17:29 UTC (permalink / raw)
To: Brian Austin; +Cc: alsa-devel, lrg
[-- Attachment #1.1: Type: text/plain, Size: 258 bytes --]
On Wed, May 09, 2012 at 12:20:29PM -0500, Brian Austin wrote:
> can I just submit a new patch that adds the AIF widget changes? Or
> resend this one with it included?
They really ought to be squashed down into a single patch since you're
sending anyway...
[-- 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] 9+ messages in thread
end of thread, other threads:[~2012-05-09 17:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-09 17:14 [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver() Brian Austin
2012-05-09 17:14 ` [PATCH 2/3] ASoC: cs42l73: Remove Chip ID's from reg_default Brian Austin
2012-05-09 17:20 ` Mark Brown
2012-05-09 17:14 ` [PATCH 3/3] ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's Brian Austin
2012-05-09 17:18 ` Brian Austin
2012-05-09 17:18 ` Mark Brown
2012-05-09 17:20 ` Brian Austin
2012-05-09 17:29 ` Mark Brown
2012-05-09 17:20 ` [PATCH 1/3] ASoC: cs42l73: Convert to module_i2c_driver() Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).