ASoC: wm8960: Fix input boost mixer left/right naming
Subsystems (3)
PATCH 1/1 ASoC: wm8960: Fix input boost mixer left/right naming
From: Stuart Henderson <[email protected]>
INBMIX1 controls LINPUTs and INBMIX2 controls RINPUTs, so fix the naming accordingly.
--- sound/soc/codecs/wm8960.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8960.c +4 -4
@@ -240,13 +240,13 @@ SOC_DOUBLE_R("Capture Volume ZC Switch", WM8960_LINVOL, WM8960_RINVOL,SOC_DOUBLE_R ("Capture Switch" ,WM8960_LINVOL ,WM8960_RINVOL ,7 ,1 ,1 ), -SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT3 Volume" , +SOC_SINGLE_TLV ("Left Input Boost Mixer LINPUT3 Volume" ,WM8960_INBMIX1 ,4 ,7 ,0 , lineinboost_tlv), -SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT2 Volume" , +SOC_SINGLE_TLV ("Left Input Boost Mixer LINPUT2 Volume" ,WM8960_INBMIX1 ,1 ,7 ,0 , lineinboost_tlv), -SOC_SINGLE_TLV ("Left Input Boost Mixer LINPUT3 Volume" , +SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT3 Volume" ,WM8960_INBMIX2 ,4 ,7 ,0 , lineinboost_tlv), -SOC_SINGLE_TLV ("Left Input Boost Mixer LINPUT2 Volume" , +SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT2 Volume" ,WM8960_INBMIX2 ,1 ,7 ,0 , lineinboost_tlv),SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT1 Volume" , WM8960_RINPATH, 4, 3, 0, micboost_tlv),
Signature · 1 line
2.1.4
PATCH 1/1 ASoC: wm8960: Fix WM8960_SYSCLK_PLL mode
From: Stuart Henderson <[email protected]>
With the introduction of WM8960_SYSCLK_AUTO mode, WM8960_SYSCLK_PLL mode was made unusable. Ensure we're not PLL mode before trying to use MCLK.
--- sound/soc/codecs/wm8960.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
sound/soc/codecs/wm8960.c +17 -15
@@ -643,29 +643,31 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)return -EINVAL ; } -/* check if the sysclk frequency is available. */ -for (i =0 ; i <ARRAY_SIZE (sysclk_divs); ++i) { -if (sysclk_divs[i] ==-1 ) -continue ; - sysclk = freq_out / sysclk_divs[i]; -for (j =0 ; j <ARRAY_SIZE (dac_divs); ++j) { -if (sysclk == dac_divs[j] * lrclk) { +if (wm8960->clk_id !=WM8960_SYSCLK_PLL ) { +/* check if the sysclk frequency is available. */ +for (i =0 ; i <ARRAY_SIZE (sysclk_divs); ++i) { +if (sysclk_divs[i] ==-1 ) +continue ; + sysclk = freq_out / sysclk_divs[i]; +for (j =0 ; j <ARRAY_SIZE (dac_divs); ++j) { +if (sysclk != dac_divs[j] * lrclk) +continue ;for (k =0 ; k <ARRAY_SIZE (bclk_divs); ++k)if (sysclk == bclk * bclk_divs[k] /10 )break ;if (k !=ARRAY_SIZE (bclk_divs))break ; } +if (j !=ARRAY_SIZE (dac_divs)) +break ; } -if (j !=ARRAY_SIZE (dac_divs)) -break ; - } -if (i !=ARRAY_SIZE (sysclk_divs)) { - goto configure_clock; - }else if (wm8960->clk_id !=WM8960_SYSCLK_AUTO ) { -dev_err (codec->dev,"failed to configure clock\n" ); -return -EINVAL ; +if (i !=ARRAY_SIZE (sysclk_divs)) { + goto configure_clock; + }else if (wm8960->clk_id !=WM8960_SYSCLK_AUTO ) { +dev_err (codec->dev,"failed to configure clock\n" ); +return -EINVAL ; + } }/* get a available pll out frequency and set pll */ for (i =0 ; i <ARRAY_SIZE (sysclk_divs); ++i) {
Signature · 1 line
2.1.4
Re: [PATCH] ASoC: wm8960: Fix WM8960_SYSCLK_PLL mode
Quoted 8 lines · On Tue, Jan 19, 2016 at 01:09:09PM +0000, [email protected]…
From: Stuart Henderson <[email protected]>
With the introduction of
WM8960_SYSCLK_AUTOmode,WM8960_SYSCLK_PLLmode was made unusable. Ensure we're not PLL mode before trying to use MCLK.Fixes 3176bf2d7ccd ("ASoC: wm8960: update pll and clock setting function")Signed-off-by Stuart Henderson <[email protected]>---
Thanks,
Charles
Mark Brown
maintainerRe: [PATCH] ASoC: wm8960: Fix WM8960_SYSCLK_PLL mode
In reply to [email protected]Quoted 1 line · On Tue, Jan 19, 2016 at 01:09:09PM +0000, [email protected]…
From: Stuart Henderson <[email protected]>
I'm moderately sure that "[email protected]" is the same person but it'd be a lot better if everything joined up. Please also note that if your mail server adds any unfortunate disclaimers or anything you probably don't want community e-mails going to there.
Re: [PATCH] ASoC: wm8960: Fix WM8960_SYSCLK_PLL mode
Quoted 2 lines · Mark Brown
I'm moderately sure that "[email protected]" is the same person but it'd be a lot better if everything joined up.
I'm happy to respin the patches using the o.wm.com email address if that makes things easier.
Stu
Mark Brown
maintainerApplied "ASoC: wm8960: Fix WM8960_SYSCLK_PLL mode" to the asoc tree
In reply to [email protected]The patch
ASoC: wm8960: Fix WM8960_SYSCLK_PLL mode
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
Quoted 1 line
From
6bb7451429084cefcb3a18fff809f7992595d2afMon Sep 17 00:00:00 2001
From: Stuart Henderson <[email protected]>
Date: Tue, 19 Jan 2016 13:09:09 +0000
Subject: [PATCH] ASoC: wm8960: Fix WM8960_SYSCLK_PLL mode
With the introduction of WM8960_SYSCLK_AUTO mode, WM8960_SYSCLK_PLL mode was made unusable. Ensure we're not PLL mode before trying to use MCLK.
--- sound/soc/codecs/wm8960.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
sound/soc/codecs/wm8960.c +17 -15
@@ -631,29 +631,31 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)return -EINVAL ; } -/* check if the sysclk frequency is available. */ -for (i =0 ; i <ARRAY_SIZE (sysclk_divs); ++i) { -if (sysclk_divs[i] ==-1 ) -continue ; - sysclk = freq_out / sysclk_divs[i]; -for (j =0 ; j <ARRAY_SIZE (dac_divs); ++j) { -if (sysclk == dac_divs[j] * lrclk) { +if (wm8960->clk_id !=WM8960_SYSCLK_PLL ) { +/* check if the sysclk frequency is available. */ +for (i =0 ; i <ARRAY_SIZE (sysclk_divs); ++i) { +if (sysclk_divs[i] ==-1 ) +continue ; + sysclk = freq_out / sysclk_divs[i]; +for (j =0 ; j <ARRAY_SIZE (dac_divs); ++j) { +if (sysclk != dac_divs[j] * lrclk) +continue ;for (k =0 ; k <ARRAY_SIZE (bclk_divs); ++k)if (sysclk == bclk * bclk_divs[k] /10 )break ;if (k !=ARRAY_SIZE (bclk_divs))break ; } +if (j !=ARRAY_SIZE (dac_divs)) +break ; } -if (j !=ARRAY_SIZE (dac_divs)) -break ; - } -if (i !=ARRAY_SIZE (sysclk_divs)) { - goto configure_clock; - }else if (wm8960->clk_id !=WM8960_SYSCLK_AUTO ) { -dev_err (codec->dev,"failed to configure clock\n" ); -return -EINVAL ; +if (i !=ARRAY_SIZE (sysclk_divs)) { + goto configure_clock; + }else if (wm8960->clk_id !=WM8960_SYSCLK_AUTO ) { +dev_err (codec->dev,"failed to configure clock\n" ); +return -EINVAL ; + } }/* get a available pll out frequency and set pll */ for (i =0 ; i <ARRAY_SIZE (sysclk_divs); ++i) {
Signature · 1 line
2.7.0.rc3
Quoted 7 lines · On Tue, Jan 19, 2016 at 01:09:08PM +0000, [email protected]…
From: Stuart Henderson <[email protected]>
INBMIX1 controls LINPUTs and INBMIX2 controls RINPUTs, so fix the naming accordingly.
Signed-off-by Stuart Henderson <[email protected]>---
Thanks,
Charles
Mark Brown
maintainerApplied "ASoC: wm8960: Fix input boost mixer left/right naming" to the asoc tree
In reply to [email protected]The patch
ASoC: wm8960: Fix input boost mixer left/right naming
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
Quoted 1 line
From
95826a37991de87659e21b3649f265a049724aa2Mon Sep 17 00:00:00 2001
From: Stuart Henderson <[email protected]>
Date: Tue, 19 Jan 2016 13:09:08 +0000
Subject: [PATCH] ASoC: wm8960: Fix input boost mixer left/right naming
INBMIX1 controls LINPUTs and INBMIX2 controls RINPUTs, so fix the naming accordingly.
--- sound/soc/codecs/wm8960.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8960.c +4 -4
@@ -231,13 +231,13 @@ SOC_DOUBLE_R("Capture Volume ZC Switch", WM8960_LINVOL, WM8960_RINVOL,SOC_DOUBLE_R ("Capture Switch" ,WM8960_LINVOL ,WM8960_RINVOL ,7 ,1 ,1 ), -SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT3 Volume" , +SOC_SINGLE_TLV ("Left Input Boost Mixer LINPUT3 Volume" ,WM8960_INBMIX1 ,4 ,7 ,0 , lineinboost_tlv), -SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT2 Volume" , +SOC_SINGLE_TLV ("Left Input Boost Mixer LINPUT2 Volume" ,WM8960_INBMIX1 ,1 ,7 ,0 , lineinboost_tlv), -SOC_SINGLE_TLV ("Left Input Boost Mixer LINPUT3 Volume" , +SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT3 Volume" ,WM8960_INBMIX2 ,4 ,7 ,0 , lineinboost_tlv), -SOC_SINGLE_TLV ("Left Input Boost Mixer LINPUT2 Volume" , +SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT2 Volume" ,WM8960_INBMIX2 ,1 ,7 ,0 , lineinboost_tlv),SOC_SINGLE_TLV ("Right Input Boost Mixer RINPUT1 Volume" , WM8960_RINPATH, 4, 3, 0, micboost_tlv),
Signature · 1 line
2.7.0.rc3