| Message ID | 20170318075509.3836-2-mylene.josserand@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> 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 <mylene.josserand@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
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.
Hi Mark, On 20/03/2017 18:39, Mark Brown wrote: > 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. > Sure, no problem! I will rebase my V4 on your fixes/sunxi branch. Best regards,
Mark, On 20/03/2017 18:39, Mark Brown wrote: > 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. > It does not apply because my driver ("sun8i-codec") is, currently, not available in your fix/sunxi branch: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/tree/sound/soc/sunxi?h=fix/sunxi Should I apply the patches (which add my driver) as "dependencies" and indicate it in my cover letter? Let me know what I should do. Thank you for the help! Best regards,
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index b92bdc8361af..d60f6fbd36a2 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -321,8 +321,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SUN8I_MOD_RST_CTL_AIF1, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("RST DAC", SUN8I_MOD_RST_CTL, SUN8I_MOD_RST_CTL_DAC, 0, NULL, 0), - - SND_SOC_DAPM_OUTPUT("HP"), }; static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { @@ -344,10 +342,6 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { /* DAC Mixer Routes */ { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, - - /* End of route : HP out */ - { "HP", NULL, "Left DAC Mixer" }, - { "HP", NULL, "Right DAC Mixer" }, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = {
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 <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 6 ------ 1 file changed, 6 deletions(-)