* [PATCH] ASoC: Ensure output PGA is enabled for line outputs in wm_hubs
@ 2011-05-15 4:41 Mark Brown
2011-05-15 12:36 ` Alan Horstmann
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2011-05-15 4:41 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
Also fix a left/right typo while we're at it.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm_hubs.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 4005e9a..7d674ee 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -787,17 +787,17 @@ static const struct snd_soc_dapm_route analogue_routes[] = {
static const struct snd_soc_dapm_route lineout1_diff_routes[] = {
{ "LINEOUT1 Mixer", "IN1L Switch", "IN1L PGA" },
{ "LINEOUT1 Mixer", "IN1R Switch", "IN1R PGA" },
- { "LINEOUT1 Mixer", "Output Switch", "Left Output Mixer" },
+ { "LINEOUT1 Mixer", "Output Switch", "Left Output PGA" },
{ "LINEOUT1N Driver", NULL, "LINEOUT1 Mixer" },
{ "LINEOUT1P Driver", NULL, "LINEOUT1 Mixer" },
};
static const struct snd_soc_dapm_route lineout1_se_routes[] = {
- { "LINEOUT1N Mixer", "Left Output Switch", "Left Output Mixer" },
- { "LINEOUT1N Mixer", "Right Output Switch", "Left Output Mixer" },
+ { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" },
+ { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" },
- { "LINEOUT1P Mixer", "Left Output Switch", "Left Output Mixer" },
+ { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" },
{ "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },
{ "LINEOUT1P Driver", NULL, "LINEOUT1P Mixer" },
@@ -806,17 +806,17 @@ static const struct snd_soc_dapm_route lineout1_se_routes[] = {
static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
{ "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" },
{ "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" },
- { "LINEOUT2 Mixer", "Output Switch", "Right Output Mixer" },
+ { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" },
{ "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },
{ "LINEOUT2P Driver", NULL, "LINEOUT2 Mixer" },
};
static const struct snd_soc_dapm_route lineout2_se_routes[] = {
- { "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" },
- { "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" },
+ { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },
+ { "LINEOUT2N Mixer", "Right Output Switch", "Left Output PGA" },
- { "LINEOUT2P Mixer", "Right Output Switch", "Right Output Mixer" },
+ { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" },
{ "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" },
{ "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" },
--
1.7.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: Ensure output PGA is enabled for line outputs in wm_hubs
2011-05-15 4:41 [PATCH] ASoC: Ensure output PGA is enabled for line outputs in wm_hubs Mark Brown
@ 2011-05-15 12:36 ` Alan Horstmann
2011-05-15 15:45 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Alan Horstmann @ 2011-05-15 12:36 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel
On Sunday 15 May 2011 05:41, Mark Brown wrote:
> Also fix a left/right typo while we're at it.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> sound/soc/codecs/wm_hubs.c | 16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
> index 4005e9a..7d674ee 100644
> --- a/sound/soc/codecs/wm_hubs.c
> +++ b/sound/soc/codecs/wm_hubs.c
> @@ -787,17 +787,17 @@ static const struct snd_soc_dapm_route
> analogue_routes[] = { static const struct snd_soc_dapm_route
> lineout1_diff_routes[] = { { "LINEOUT1 Mixer", "IN1L Switch", "IN1L PGA" },
> { "LINEOUT1 Mixer", "IN1R Switch", "IN1R PGA" },
> - { "LINEOUT1 Mixer", "Output Switch", "Left Output Mixer" },
> + { "LINEOUT1 Mixer", "Output Switch", "Left Output PGA" },
>
> { "LINEOUT1N Driver", NULL, "LINEOUT1 Mixer" },
> { "LINEOUT1P Driver", NULL, "LINEOUT1 Mixer" },
> };
>
> static const struct snd_soc_dapm_route lineout1_se_routes[] = {
> - { "LINEOUT1N Mixer", "Left Output Switch", "Left Output Mixer" },
> - { "LINEOUT1N Mixer", "Right Output Switch", "Left Output Mixer" },
> + { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" },
> + { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" },
>
> - { "LINEOUT1P Mixer", "Left Output Switch", "Left Output Mixer" },
> + { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" },
>
> { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },
> { "LINEOUT1P Driver", NULL, "LINEOUT1P Mixer" },
> @@ -806,17 +806,17 @@ static const struct snd_soc_dapm_route
> lineout1_se_routes[] = { static const struct snd_soc_dapm_route
> lineout2_diff_routes[] = { { "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" },
> { "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" },
> - { "LINEOUT2 Mixer", "Output Switch", "Right Output Mixer" },
> + { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" },
>
> { "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },
> { "LINEOUT2P Driver", NULL, "LINEOUT2 Mixer" },
> };
>
> static const struct snd_soc_dapm_route lineout2_se_routes[] = {
> - { "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" },
> - { "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" },
> + { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },
> + { "LINEOUT2N Mixer", "Right Output Switch", "Left Output PGA" },
Is this also left/right typo?
>
> - { "LINEOUT2P Mixer", "Right Output Switch", "Right Output Mixer" },
> + { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" },
>
> { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" },
> { "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" },
Alan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: Ensure output PGA is enabled for line outputs in wm_hubs
2011-05-15 12:36 ` Alan Horstmann
@ 2011-05-15 15:45 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-05-15 15:45 UTC (permalink / raw)
To: Alan Horstmann; +Cc: alsa-devel
On Sun, May 15, 2011 at 01:36:22PM +0100, Alan Horstmann wrote:
> On Sunday 15 May 2011 05:41, Mark Brown wrote:
> > - { "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" },
> > - { "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" },
> > + { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },
> > + { "LINEOUT2N Mixer", "Right Output Switch", "Left Output PGA" },
> Is this also left/right typo?
Yes, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ASoC: Ensure output PGA is enabled for line outputs in wm_hubs
@ 2011-05-15 15:48 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-05-15 15:48 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
Also fix a left/right typo while we're at it.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm_hubs.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 4005e9a..c7c2fec 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -787,17 +787,17 @@ static const struct snd_soc_dapm_route analogue_routes[] = {
static const struct snd_soc_dapm_route lineout1_diff_routes[] = {
{ "LINEOUT1 Mixer", "IN1L Switch", "IN1L PGA" },
{ "LINEOUT1 Mixer", "IN1R Switch", "IN1R PGA" },
- { "LINEOUT1 Mixer", "Output Switch", "Left Output Mixer" },
+ { "LINEOUT1 Mixer", "Output Switch", "Left Output PGA" },
{ "LINEOUT1N Driver", NULL, "LINEOUT1 Mixer" },
{ "LINEOUT1P Driver", NULL, "LINEOUT1 Mixer" },
};
static const struct snd_soc_dapm_route lineout1_se_routes[] = {
- { "LINEOUT1N Mixer", "Left Output Switch", "Left Output Mixer" },
- { "LINEOUT1N Mixer", "Right Output Switch", "Left Output Mixer" },
+ { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" },
+ { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" },
- { "LINEOUT1P Mixer", "Left Output Switch", "Left Output Mixer" },
+ { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" },
{ "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },
{ "LINEOUT1P Driver", NULL, "LINEOUT1P Mixer" },
@@ -806,17 +806,17 @@ static const struct snd_soc_dapm_route lineout1_se_routes[] = {
static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
{ "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" },
{ "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" },
- { "LINEOUT2 Mixer", "Output Switch", "Right Output Mixer" },
+ { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" },
{ "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },
{ "LINEOUT2P Driver", NULL, "LINEOUT2 Mixer" },
};
static const struct snd_soc_dapm_route lineout2_se_routes[] = {
- { "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" },
- { "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" },
+ { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },
+ { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" },
- { "LINEOUT2P Mixer", "Right Output Switch", "Right Output Mixer" },
+ { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" },
{ "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" },
{ "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" },
--
1.7.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-15 15:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-15 4:41 [PATCH] ASoC: Ensure output PGA is enabled for line outputs in wm_hubs Mark Brown
2011-05-15 12:36 ` Alan Horstmann
2011-05-15 15:45 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2011-05-15 15:48 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.