* [PATCH v2 0/3] ASoC: sun8i-codec: Clean-up
@ 2017-03-09 9:55 Mylène Josserand
2017-03-09 9:56 ` [PATCH v2 1/3] ASoC: sun8i-codec: Fix space on audio-routing widget Mylène Josserand
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Mylène Josserand @ 2017-03-09 9:55 UTC (permalink / raw)
To: lgirdwood, broonie, robh+dt, mark.rutland, maxime.ripard, wens,
perex, tiwai
Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel,
alexandre.belloni, mylene.josserand, linux-arm-kernel
Hello everyone,
Thanks to Chen-Yu's review [1], a first version of this patchset to
clean-up my sun8i A33 audio driver has been sent and merged.
One patch [2] needs a rework so this cover-letter is for its V2.
Changes with v1:
- Remove patches 01, 02 and 03 as they are merged in asoc/for-next.
- Added a patch to fix an error on an widget name
- Split the patch 04 into two patches to separate the device tree
modifications with the codec driver's one.
Patches tested on asoc/for-next branch, last commit: 698b3eb9af.
Patch 1: Fix a dapm routing error because of an unwanted space.
Patch 2: Convert SND_SOC_DAPM_DAC to SND_SOC_DAPM_AIF_IN definition.
The AIF interfaces are renamed to be more precise.
Patch 3: Update the audio-routing's device tree to use the AIF interfaces
renamed in patch 01.
After this series, amixer commands to test an audio file:
amixer set 'Headphone' 75%
amixer set 'Headphone' on
amixer set 'DAC' on
amixer set 'AIF1 Slot 0 Digital DAC' on
[1] https://lkml.org/lkml/2017/2/7/103
[2] https://patchwork.kernel.org/patch/9566325/
Thank you in advance,
Best regards,
Mylène Josserand (3):
ASoC: sun8i-codec: Fix space on audio-routing widget
ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
ARM: dts: sun8i: Update audio-routing with renamed widgets
arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++--
sound/soc/sunxi/sun8i-codec.c | 22 ++++++++++++----------
2 files changed, 14 insertions(+), 12 deletions(-)
--
2.11.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 1/3] ASoC: sun8i-codec: Fix space on audio-routing widget
2017-03-09 9:55 [PATCH v2 0/3] ASoC: sun8i-codec: Clean-up Mylène Josserand
@ 2017-03-09 9:56 ` Mylène Josserand
2017-03-15 18:13 ` Applied "ASoC: sun8i-codec: Fix space on audio-routing widget" to the asoc tree Mark Brown
2017-03-21 18:45 ` Mark Brown
2017-03-09 9:56 ` [PATCH v2 2/3] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Mylène Josserand
2017-03-09 9:56 ` [PATCH v2 3/3] ARM: dts: sun8i: Update audio-routing with renamed widgets Mylène Josserand
2 siblings, 2 replies; 9+ messages in thread
From: Mylène Josserand @ 2017-03-09 9:56 UTC (permalink / raw)
To: lgirdwood, broonie, robh+dt, mark.rutland, maxime.ripard, wens,
perex, tiwai
Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel,
alexandre.belloni, mylene.josserand, linux-arm-kernel
An unwanted space is present in an audio widget's name on the dapm
routing. It causes an error on the recognition of this widget (error:
("no dapm match for AIF1 Slot 0 Right").
Remove the space fixes it.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
sound/soc/sunxi/sun8i-codec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index a75a983974d9..90cda9569503 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -335,7 +335,7 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
/* DAC Mixer Routes */
{ "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
"Digital Left DAC"},
- { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ",
+ { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
"Digital Right DAC"},
};
--
2.11.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Applied "ASoC: sun8i-codec: Fix space on audio-routing widget" to the asoc tree
2017-03-09 9:56 ` [PATCH v2 1/3] ASoC: sun8i-codec: Fix space on audio-routing widget Mylène Josserand
@ 2017-03-15 18:13 ` Mark Brown
2017-03-21 18:45 ` Mark Brown
1 sibling, 0 replies; 9+ messages in thread
From: Mark Brown @ 2017-03-15 18:13 UTC (permalink / raw)
Cc: mark.rutland, thomas.petazzoni, alsa-devel, devicetree,
linux-kernel, tiwai, lgirdwood, robh+dt, wens, broonie,
alexandre.belloni, maxime.ripard, mylene.josserand,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 2299 bytes --]
The patch
ASoC: sun8i-codec: Fix space on audio-routing widget
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 80405d44c3721c775f5c508f0cdbcc0e8498eeef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?=
<mylene.josserand@free-electrons.com>
Date: Thu, 9 Mar 2017 10:56:00 +0100
Subject: [PATCH] ASoC: sun8i-codec: Fix space on audio-routing widget
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
An unwanted space is present in an audio widget's name on the dapm
routing. It causes an error on the recognition of this widget (error:
("no dapm match for AIF1 Slot 0 Right").
Remove the space fixes it.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sunxi/sun8i-codec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index a75a983974d9..90cda9569503 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -335,7 +335,7 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
/* DAC Mixer Routes */
{ "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
"Digital Left DAC"},
- { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ",
+ { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
"Digital Right DAC"},
};
--
2.11.0
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread* Applied "ASoC: sun8i-codec: Fix space on audio-routing widget" to the asoc tree
2017-03-09 9:56 ` [PATCH v2 1/3] ASoC: sun8i-codec: Fix space on audio-routing widget Mylène Josserand
2017-03-15 18:13 ` Applied "ASoC: sun8i-codec: Fix space on audio-routing widget" to the asoc tree Mark Brown
@ 2017-03-21 18:45 ` Mark Brown
1 sibling, 0 replies; 9+ messages in thread
From: Mark Brown @ 2017-03-21 18:45 UTC (permalink / raw)
Cc: mark.rutland, thomas.petazzoni, alsa-devel, devicetree,
linux-kernel, tiwai, lgirdwood, robh+dt, wens, broonie,
alexandre.belloni, maxime.ripard, mylene.josserand,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 2339 bytes --]
The patch
ASoC: sun8i-codec: Fix space on audio-routing widget
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 79e26de81448fad80f6c15ae1e3c9e7fca2740cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?=
<mylene.josserand@free-electrons.com>
Date: Sat, 18 Mar 2017 08:55:07 +0100
Subject: [PATCH] ASoC: sun8i-codec: Fix space on audio-routing widget
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
An unwanted space is present in an audio widget's name on the dapm
routing. It causes an error on the recognition of this widget (error:
("no dapm match for AIF1 Slot 0 Right").
Remove the space fixes it.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sunxi/sun8i-codec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 107fa8213600..adb13fbd2006 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -337,7 +337,7 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
/* DAC Mixer Routes */
{ "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
"Digital Left DAC"},
- { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ",
+ { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
"Digital Right DAC"},
};
--
2.11.0
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/3] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
2017-03-09 9:55 [PATCH v2 0/3] ASoC: sun8i-codec: Clean-up Mylène Josserand
2017-03-09 9:56 ` [PATCH v2 1/3] ASoC: sun8i-codec: Fix space on audio-routing widget Mylène Josserand
@ 2017-03-09 9:56 ` Mylène Josserand
2017-03-15 18:13 ` Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree Mark Brown
2017-03-09 9:56 ` [PATCH v2 3/3] ARM: dts: sun8i: Update audio-routing with renamed widgets Mylène Josserand
2 siblings, 1 reply; 9+ messages in thread
From: Mylène Josserand @ 2017-03-09 9:56 UTC (permalink / raw)
To: lgirdwood, broonie, robh+dt, mark.rutland, maxime.ripard, wens,
perex, tiwai
Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel,
alexandre.belloni, mylene.josserand, linux-arm-kernel
Update the driver to use SND_SOC_DAPM_AIF_IN instead of
SND_SOC_DAPM_DAC.
Rename the interface's widgets to be more precise on which slot
the interface is connected.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 90cda9569503..5723c3404f6b 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA,
0, NULL, 0),
- /* Analog DAC */
- SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
- SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
+ /* Analog DAC AIF */
+ SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
+ SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
/* DAC Mixers */
SOC_MIXER_ARRAY("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
@@ -329,14 +331,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
{ "DAC", NULL, "MODCLK DAC" },
/* DAC Routes */
- { "Digital Left DAC", NULL, "DAC" },
- { "Digital Right DAC", NULL, "DAC" },
+ { "AIF1 Slot 0 Right", NULL, "DAC" },
+ { "AIF1 Slot 0 Left", NULL, "DAC" },
/* DAC Mixer Routes */
{ "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
- "Digital Left DAC"},
+ "AIF1 Slot 0 Left"},
{ "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
- "Digital Right DAC"},
+ "AIF1 Slot 0 Right"},
};
static struct snd_soc_dai_ops sun8i_codec_dai_ops = {
--
2.11.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree
2017-03-09 9:56 ` [PATCH v2 2/3] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Mylène Josserand
@ 2017-03-15 18:13 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2017-03-15 18:13 UTC (permalink / raw)
Cc: mark.rutland, thomas.petazzoni, alsa-devel, devicetree,
linux-kernel, tiwai, lgirdwood, robh+dt, perex, wens, broonie,
alexandre.belloni, maxime.ripard, mylene.josserand,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 3372 bytes --]
The patch
ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 9123aa8645463ca30ac8c62a07eb23e07c3aa091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?=
<mylene.josserand@free-electrons.com>
Date: Thu, 9 Mar 2017 10:56:01 +0100
Subject: [PATCH] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Update the driver to use SND_SOC_DAPM_AIF_IN instead of
SND_SOC_DAPM_DAC.
Rename the interface's widgets to be more precise on which slot
the interface is connected.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 90cda9569503..5723c3404f6b 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA,
0, NULL, 0),
- /* Analog DAC */
- SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
- SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
+ /* Analog DAC AIF */
+ SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
+ SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
/* DAC Mixers */
SOC_MIXER_ARRAY("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
@@ -329,14 +331,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
{ "DAC", NULL, "MODCLK DAC" },
/* DAC Routes */
- { "Digital Left DAC", NULL, "DAC" },
- { "Digital Right DAC", NULL, "DAC" },
+ { "AIF1 Slot 0 Right", NULL, "DAC" },
+ { "AIF1 Slot 0 Left", NULL, "DAC" },
/* DAC Mixer Routes */
{ "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
- "Digital Left DAC"},
+ "AIF1 Slot 0 Left"},
{ "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
- "Digital Right DAC"},
+ "AIF1 Slot 0 Right"},
};
static struct snd_soc_dai_ops sun8i_codec_dai_ops = {
--
2.11.0
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] ARM: dts: sun8i: Update audio-routing with renamed widgets
2017-03-09 9:55 [PATCH v2 0/3] ASoC: sun8i-codec: Clean-up Mylène Josserand
2017-03-09 9:56 ` [PATCH v2 1/3] ASoC: sun8i-codec: Fix space on audio-routing widget Mylène Josserand
2017-03-09 9:56 ` [PATCH v2 2/3] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Mylène Josserand
@ 2017-03-09 9:56 ` Mylène Josserand
2017-03-21 18:45 ` Applied "ARM: dts: sun8i: Update audio-routing with renamed widgets" to the asoc tree Mark Brown
2 siblings, 1 reply; 9+ messages in thread
From: Mylène Josserand @ 2017-03-09 9:56 UTC (permalink / raw)
To: lgirdwood, broonie, robh+dt, mark.rutland, maxime.ripard, wens,
perex, tiwai
Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel,
alexandre.belloni, mylene.josserand, linux-arm-kernel
The digital AIF interfaces has been renamed in the sun8i audio codec
driver so the audio-routing in the device tree must be renamed too.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 18c174fef84f..0467fb365bfc 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -113,8 +113,8 @@
simple-audio-card,mclk-fs = <512>;
simple-audio-card,aux-devs = <&codec_analog>;
simple-audio-card,routing =
- "Left DAC", "Digital Left DAC",
- "Right DAC", "Digital Right DAC";
+ "Left DAC", "AIF1 Slot 0 Left",
+ "Right DAC", "AIF1 Slot 0 Right";
status = "disabled";
simple-audio-card,cpu {
--
2.11.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Applied "ARM: dts: sun8i: Update audio-routing with renamed widgets" to the asoc tree
2017-03-09 9:56 ` [PATCH v2 3/3] ARM: dts: sun8i: Update audio-routing with renamed widgets Mylène Josserand
@ 2017-03-21 18:45 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2017-03-21 18:45 UTC (permalink / raw)
Cc: mark.rutland, thomas.petazzoni, alsa-devel, devicetree,
linux-kernel, tiwai, lgirdwood, robh+dt, perex, wens, broonie,
alexandre.belloni, maxime.ripard, mylene.josserand,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 2248 bytes --]
The patch
ARM: dts: sun8i: Update audio-routing with renamed widgets
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From eb3abaea7ea42619a48fa84e4b1ff48f1b18d863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?=
<mylene.josserand@free-electrons.com>
Date: Sat, 18 Mar 2017 08:55:09 +0100
Subject: [PATCH] ARM: dts: sun8i: Update audio-routing with renamed widgets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The digital AIF interfaces has been renamed in the sun8i audio codec
driver so the audio-routing in the device tree must be renamed too.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 18c174fef84f..0467fb365bfc 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -113,8 +113,8 @@
simple-audio-card,mclk-fs = <512>;
simple-audio-card,aux-devs = <&codec_analog>;
simple-audio-card,routing =
- "Left DAC", "Digital Left DAC",
- "Right DAC", "Digital Right DAC";
+ "Left DAC", "AIF1 Slot 0 Left",
+ "Right DAC", "AIF1 Slot 0 Right";
status = "disabled";
simple-audio-card,cpu {
--
2.11.0
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
@ 2017-03-18 7:55 Mylène Josserand
2017-03-21 18:45 ` Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree Mark Brown
0 siblings, 1 reply; 9+ messages in thread
From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt,
mark.rutland
Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel,
alexandre.belloni, Mylène Josserand, linux-arm-kernel
Update the driver to use SND_SOC_DAPM_AIF_IN instead of
SND_SOC_DAPM_DAC.
Rename the interface's widgets to be more precise on which slot
the interface is connected.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index adb13fbd2006..7527ba29a5a0 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA,
0, NULL, 0),
- /* Analog DAC */
- SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
- SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
+ /* Analog DAC AIF */
+ SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
+ SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
/* DAC Mixers */
SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
@@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
{ "DAC", NULL, "MODCLK DAC" },
/* DAC Routes */
- { "Digital Left DAC", NULL, "DAC" },
- { "Digital Right DAC", NULL, "DAC" },
+ { "AIF1 Slot 0 Right", NULL, "DAC" },
+ { "AIF1 Slot 0 Left", NULL, "DAC" },
/* DAC Mixer Routes */
{ "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
- "Digital Left DAC"},
+ "AIF1 Slot 0 Left"},
{ "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
- "Digital Right DAC"},
+ "AIF1 Slot 0 Right"},
};
static struct snd_soc_dai_ops sun8i_codec_dai_ops = {
--
2.11.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree
2017-03-18 7:55 [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Mylène Josserand
@ 2017-03-21 18:45 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2017-03-21 18:45 UTC (permalink / raw)
Cc: mark.rutland, thomas.petazzoni, alsa-devel, Mylène Josserand,
devicetree, linux-kernel, tiwai, robh+dt, lgirdwood, wens,
broonie, alexandre.belloni, maxime.ripard, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 3414 bytes --]
The patch
ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From d1792285ca63e17f8a7eb42efa48834c261a2d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?=
<mylene.josserand@free-electrons.com>
Date: Sat, 18 Mar 2017 08:55:08 +0100
Subject: [PATCH] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Update the driver to use SND_SOC_DAPM_AIF_IN instead of
SND_SOC_DAPM_DAC.
Rename the interface's widgets to be more precise on which slot
the interface is connected.
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index adb13fbd2006..7527ba29a5a0 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA,
0, NULL, 0),
- /* Analog DAC */
- SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
- SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL,
- SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
+ /* Analog DAC AIF */
+ SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
+ SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0,
+ SUN8I_AIF1_DACDAT_CTRL,
+ SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
/* DAC Mixers */
SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
@@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
{ "DAC", NULL, "MODCLK DAC" },
/* DAC Routes */
- { "Digital Left DAC", NULL, "DAC" },
- { "Digital Right DAC", NULL, "DAC" },
+ { "AIF1 Slot 0 Right", NULL, "DAC" },
+ { "AIF1 Slot 0 Left", NULL, "DAC" },
/* DAC Mixer Routes */
{ "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
- "Digital Left DAC"},
+ "AIF1 Slot 0 Left"},
{ "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
- "Digital Right DAC"},
+ "AIF1 Slot 0 Right"},
};
static struct snd_soc_dai_ops sun8i_codec_dai_ops = {
--
2.11.0
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-03-21 18:45 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-09 9:55 [PATCH v2 0/3] ASoC: sun8i-codec: Clean-up Mylène Josserand
2017-03-09 9:56 ` [PATCH v2 1/3] ASoC: sun8i-codec: Fix space on audio-routing widget Mylène Josserand
2017-03-15 18:13 ` Applied "ASoC: sun8i-codec: Fix space on audio-routing widget" to the asoc tree Mark Brown
2017-03-21 18:45 ` Mark Brown
2017-03-09 9:56 ` [PATCH v2 2/3] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Mylène Josserand
2017-03-15 18:13 ` Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree Mark Brown
2017-03-09 9:56 ` [PATCH v2 3/3] ARM: dts: sun8i: Update audio-routing with renamed widgets Mylène Josserand
2017-03-21 18:45 ` Applied "ARM: dts: sun8i: Update audio-routing with renamed widgets" to the asoc tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2017-03-18 7:55 [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Mylène Josserand
2017-03-21 18:45 ` Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox