Hi everyone,
As discussed in this thread [1], here are a V3 of the cleanup series for
the sun8i-a33 driver (introduced in v4.11-rc1) as fixes for v4.11.
Based on: Linus repository - master branch
Last commit: 8841b5f0cd ("Merge tag 'nfs-for-4.11-2' of
git://git.linux-nfs.org/projects/anna/linux-nfs")
Changes since v1 and v2:
- Patch 01: No changes from v1, it applies directly
- Patch 02: No changes from v1, it applies directly
once patch 01 has been applied.
- Patch 03: No changes from v2, it applies directly
- Patch 04: Rebased on master branch
- Patch 05: No changes from v2, it applies directly
Patch 01 removes some unnecessary widgets.
Patch 02 updates the driver to use SOC_DAPM_DOUBLE.
Patch 03 removes a space on a widget name that implies an error
on audio routing as the widget is unknown.
Patch 04 improves some widgets (names and types).
As widget names changed in patch 04, the patch 05 is needed to use
the same names on audio routing. Otherwise, the device tree for sun8i-a33
will be broken and the audio codec will not work.
Only patches 01 and 02 were initially wanted as fixes for v4.11 but, with Chen-Yu,
we thought that patch 03 and 04 could be also applied as fixes. As patch 04
creates a break with the device tree, I added patch 05 in this series.
Let me know what you think.
[1]: https://lkml.org/lkml/2017/3/14/4
Thank you in advance,
Best regards,
Myl?ne Josserand (5):
ASoC: sun8i-codec: Remove analog "HP" widget
ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE
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 | 67 ++++++++++++++++++----------------------
2 files changed, 32 insertions(+), 39 deletions(-)
--
2.11.0
The "HP" widget is already present and take part to
the analog part (sun8i-codec-analog).
Remove it from the digital part as it is unnecessary.
Signed-off-by: Myl?ne Josserand <redacted>
---
sound/soc/sunxi/sun8i-codec.c | 6 ------
1 file changed, 6 deletions(-)
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 <redacted>
---
sound/soc/sunxi/sun8i-codec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 <redacted>
---
sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
Update the driver to use the new SOC_DAPM_DOUBLE definition
on the digital DAC mixer.
Update the names accordingly as, when they are shared, the
controls are not prefixed with the widget's name anymore.
Signed-off-by: Myl?ne Josserand <redacted>
---
sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 24 deletions(-)
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 <redacted>
---
arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
From: Mark Brown <broonie@kernel.org> Date: 2017-03-20 11:40:28
On Sat, Mar 18, 2017 at 08:55:09AM +0100, Myl?ne Josserand wrote:
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.
Given that these are fixes it probably makes sense that they all go in
together, can I get some acks for this and I'll apply it?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170320/80765819/attachment.sig>
On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand
[off-list ref] wrote:
quoted hunk
Update the driver to use the new SOC_DAPM_DOUBLE definition
on the digital DAC mixer.
Update the names accordingly as, when they are shared, the
controls are not prefixed with the widget's name anymore.
Signed-off-by: Myl?ne Josserand <redacted>
---
sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 24 deletions(-)
On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand
[off-list ref] wrote:
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 <redacted>
As mentioned, this patch can be squashed into the previous patch, now
that you're resending the whole bunch of patches.
Otherwise,
Acked-by: Chen-Yu Tsai <redacted>
On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand
[off-list ref] wrote:
quoted hunk
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 <redacted>
---
sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand
[off-list ref] wrote:
The "HP" widget is already present and take part to
the analog part (sun8i-codec-analog).
Remove it from the digital part as it is unnecessary.
Signed-off-by: Myl?ne Josserand <redacted>
Hi Chen-Yu,
On 20/03/2017 12:46, Chen-Yu Tsai wrote:
On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand
[off-list ref] wrote:
quoted
Update the driver to use the new SOC_DAPM_DOUBLE definition
on the digital DAC mixer.
Update the names accordingly as, when they are shared, the
controls are not prefixed with the widget's name anymore.
Signed-off-by: Myl?ne Josserand <redacted>
---
sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 24 deletions(-)
@@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {{"Digital Right DAC",NULL,"DAC"},/* DAC Mixer Routes */-{"Left DAC Mixer","LSlot 0","Digital Left DAC"},-{"Right DAC Mixer","RSlot 0","Digital Right DAC"},+{"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 ",
The extra space fixed in the next patch could be squashed into this
patch. Otherwise,
Oh, yes, sorry about that.
I will send a V4 with the fixes you pointed me on this series.
Thanks!
Best regards,
--
Myl?ne Josserand, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
From: Mark Brown <broonie@kernel.org> Date: 2017-03-20 16:38:24
On Mon, Mar 20, 2017 at 07:53:37PM +0800, Chen-Yu Tsai wrote:
On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown [off-list ref] wrote:
quoted
Given that these are fixes it probably makes sense that they all go in
together, can I get some acks for this and I'll apply it?
Acked-by: Chen-Yu Tsai <redacted>
Though this patch should go in through the arm-soc tree.
Well, ideally but I'm not sure it's a super big deal to get the odd bit
coming through so long as it doesn't conflict, it's more of a big deal
to make sure that we don't get the ASoC side without the DT side and
vice versa.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170320/910a3028/attachment.sig>
From: Mark Brown <broonie@kernel.org> Date: 2017-03-20 18:25:52
On Sat, Mar 18, 2017 at 08:55:05AM +0100, Myl?ne Josserand wrote:
The "HP" widget is already present and take part to
the analog part (sun8i-codec-analog).
Remove it from the digital part as it is unnecessary.
I know I said to send against Linus' tree but it turns out this actually
conflicts with some of the existing fixes, please see my fixes/sunxi
branch and resend against that. Sorry for the hassle here.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170320/ed7e6790/attachment.sig>
On Sat, Mar 18, 2017 at 08:55:05AM +0100, Myl?ne Josserand wrote:
quoted
The "HP" widget is already present and take part to
the analog part (sun8i-codec-analog).
Remove it from the digital part as it is unnecessary.
I know I said to send against Linus' tree but it turns out this actually
conflicts with some of the existing fixes, please see my fixes/sunxi
branch and resend against that. Sorry for the hassle here.
Sure, no problem! I will rebase my V4 on your fixes/sunxi branch.
Best regards,
--
Myl?ne Josserand, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
On Sat, Mar 18, 2017 at 08:55:05AM +0100, Myl?ne Josserand wrote:
quoted
The "HP" widget is already present and take part to
the analog part (sun8i-codec-analog).
Remove it from the digital part as it is unnecessary.
I know I said to send against Linus' tree but it turns out this actually
conflicts with some of the existing fixes, please see my fixes/sunxi
branch and resend against that. Sorry for the hassle here.
From: Mark Brown <broonie@kernel.org> Date: 2017-03-21 18:45:46
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?=
[off-list ref]
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 <redacted>
Acked-by: Chen-Yu Tsai <redacted>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)