* [alsa-devel][PATCH 0/3] ASoC: TSCS42xx: Control Improvements
@ 2018-06-04 20:45 Steven Eckhoff
2018-06-04 20:45 ` [alsa-devel][PATCH 1/3] ASoC: TSCS42xx: Add mic bias boost control Steven Eckhoff
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Steven Eckhoff @ 2018-06-04 20:45 UTC (permalink / raw)
To: alsa-devel
Cc: Steven Eckhoff, Liam Girdwood, Mark Brown, Jaroslav Kysela,
Takashi Iwai, alsa-devel, linux-kernel
Steven Eckhoff (3):
Add mic bias boost control
Remove Playback/Capture from control names
Add headphone auto switching controls
sound/soc/codecs/tscs42xx.c | 37 +++++++++++++++++++++++--------------
sound/soc/codecs/tscs42xx.h | 8 ++++++++
2 files changed, 31 insertions(+), 14 deletions(-)
--
2.17.0
^ permalink raw reply [flat|nested] 9+ messages in thread* [alsa-devel][PATCH 1/3] ASoC: TSCS42xx: Add mic bias boost control 2018-06-04 20:45 [alsa-devel][PATCH 0/3] ASoC: TSCS42xx: Control Improvements Steven Eckhoff @ 2018-06-04 20:45 ` Steven Eckhoff 2018-06-18 11:59 ` Applied "ASoC: TSCS42xx: Add mic bias boost control" to the asoc tree Mark Brown 2018-06-04 20:46 ` [alsa-devel][PATCH 2/3] ASoC: TSCS42xx: Remove Playback/Capture in names Steven Eckhoff 2018-06-04 20:47 ` [alsa-devel][PATCH 3/3] ASoC: TSCS42xx: Add headphone auto switching Steven Eckhoff 2 siblings, 1 reply; 9+ messages in thread From: Steven Eckhoff @ 2018-06-04 20:45 UTC (permalink / raw) To: alsa-devel Cc: Steven Eckhoff, Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel Add mic bias boost control Signed-off-by: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> --- sound/soc/codecs/tscs42xx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index bbfc73a79b18..15505c3c9ed4 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -638,6 +638,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { /* Input Channel Map */ SOC_ENUM("Input Channel Map", ch_map_select_enum), + /* Mic Bias */ + SOC_SINGLE("Mic Bias Boost Switch", 0x71, 0x07, 1, 0), + /* Coefficient Ram */ COEFF_RAM_CTL("Cascade1L BiQuad1", BIQUAD_SIZE, 0x00), COEFF_RAM_CTL("Cascade1L BiQuad2", BIQUAD_SIZE, 0x05), -- 2.17.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Applied "ASoC: TSCS42xx: Add mic bias boost control" to the asoc tree 2018-06-04 20:45 ` [alsa-devel][PATCH 1/3] ASoC: TSCS42xx: Add mic bias boost control Steven Eckhoff @ 2018-06-18 11:59 ` Mark Brown 0 siblings, 0 replies; 9+ messages in thread From: Mark Brown @ 2018-06-18 11:59 UTC (permalink / raw) To: Steven Eckhoff Cc: Mark Brown, alsa-devel, alsa-devel, linux-kernel, Takashi Iwai, Liam Girdwood, Mark Brown, alsa-devel The patch ASoC: TSCS42xx: Add mic bias boost control has been applied to the asoc tree at https://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 58f7d470c85801f55bbae2d3c93fe1a3d34aa143 Mon Sep 17 00:00:00 2001 From: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> Date: Mon, 4 Jun 2018 15:45:40 -0500 Subject: [PATCH] ASoC: TSCS42xx: Add mic bias boost control Add mic bias boost control Signed-off-by: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/tscs42xx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index d18ff17719cc..743194052fc4 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -644,6 +644,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { /* Input Channel Map */ SOC_ENUM("Input Channel Map", ch_map_select_enum), + /* Mic Bias */ + SOC_SINGLE("Mic Bias Boost Switch", 0x71, 0x07, 1, 0), + /* Coefficient Ram */ COEFF_RAM_CTL("Cascade1L BiQuad1", BIQUAD_SIZE, 0x00), COEFF_RAM_CTL("Cascade1L BiQuad2", BIQUAD_SIZE, 0x05), -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [alsa-devel][PATCH 2/3] ASoC: TSCS42xx: Remove Playback/Capture in names 2018-06-04 20:45 [alsa-devel][PATCH 0/3] ASoC: TSCS42xx: Control Improvements Steven Eckhoff 2018-06-04 20:45 ` [alsa-devel][PATCH 1/3] ASoC: TSCS42xx: Add mic bias boost control Steven Eckhoff @ 2018-06-04 20:46 ` Steven Eckhoff 2018-06-18 11:31 ` Mark Brown 2018-06-18 11:59 ` Applied "ASoC: TSCS42xx: Remove Playback/Capture in names" to the asoc tree Mark Brown 2018-06-04 20:47 ` [alsa-devel][PATCH 3/3] ASoC: TSCS42xx: Add headphone auto switching Steven Eckhoff 2 siblings, 2 replies; 9+ messages in thread From: Steven Eckhoff @ 2018-06-04 20:46 UTC (permalink / raw) To: alsa-devel Cc: Steven Eckhoff, Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel These aren't needed and some userspace apps don't work consistently with them. Remove Playback/Capture from control names Signed-off-by: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> --- sound/soc/codecs/tscs42xx.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index 15505c3c9ed4..c79c075228a6 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -619,19 +619,19 @@ static int bytes_info_ext(struct snd_kcontrol *kcontrol, static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { /* Volumes */ - SOC_DOUBLE_R_TLV("Headphone Playback Volume", R_HPVOLL, R_HPVOLR, + SOC_DOUBLE_R_TLV("Headphone Volume", R_HPVOLL, R_HPVOLR, FB_HPVOLL, 0x7F, 0, hpvol_scale), - SOC_DOUBLE_R_TLV("Speaker Playback Volume", R_SPKVOLL, R_SPKVOLR, + SOC_DOUBLE_R_TLV("Speaker Volume", R_SPKVOLL, R_SPKVOLR, FB_SPKVOLL, 0x7F, 0, spkvol_scale), - SOC_DOUBLE_R_TLV("Master Playback Volume", R_DACVOLL, R_DACVOLR, + SOC_DOUBLE_R_TLV("Master Volume", R_DACVOLL, R_DACVOLR, FB_DACVOLL, 0xFF, 0, dacvol_scale), - SOC_DOUBLE_R_TLV("PCM Capture Volume", R_ADCVOLL, R_ADCVOLR, + SOC_DOUBLE_R_TLV("PCM Volume", R_ADCVOLL, R_ADCVOLR, FB_ADCVOLL, 0xFF, 0, adcvol_scale), - SOC_DOUBLE_R_TLV("Master Capture Volume", R_INVOLL, R_INVOLR, + SOC_DOUBLE_R_TLV("Input Volume", R_INVOLL, R_INVOLR, FB_INVOLL, 0x3F, 0, invol_scale), /* INSEL */ - SOC_DOUBLE_R_TLV("Mic Boost Capture Volume", R_INSELL, R_INSELR, + SOC_DOUBLE_R_TLV("Mic Boost Volume", R_INSELL, R_INSELR, FB_INSELL_MICBSTL, FV_INSELL_MICBSTL_30DB, 0, mic_boost_scale), @@ -730,9 +730,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { R_CLECTL, FB_CLECTL_LIMIT_EN, 1, 0), SOC_SINGLE("Comp Switch", R_CLECTL, FB_CLECTL_COMP_EN, 1, 0), - SOC_SINGLE_TLV("CLE Make-Up Gain Playback Volume", + SOC_SINGLE_TLV("CLE Make-Up Gain Volume", R_MUGAIN, FB_MUGAIN_CLEMUG, 0x1f, 0, mugain_scale), - SOC_SINGLE_TLV("Comp Thresh Playback Volume", + SOC_SINGLE_TLV("Comp Thresh Volume", R_COMPTH, FB_COMPTH, 0xff, 0, compth_scale), SOC_ENUM("Comp Ratio", compressor_ratio_enum), SND_SOC_BYTES("Comp Atk Time", R_CATKTCL, 2), @@ -763,9 +763,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { SOC_SINGLE("MBC1 Phase Invert Switch", R_DACMBCMUG1, FB_DACMBCMUG1_PHASE, 1, 0), - SOC_SINGLE_TLV("DAC MBC1 Make-Up Gain Playback Volume", + SOC_SINGLE_TLV("DAC MBC1 Make-Up Gain Volume", R_DACMBCMUG1, FB_DACMBCMUG1_MUGAIN, 0x1f, 0, mugain_scale), - SOC_SINGLE_TLV("DAC MBC1 Comp Thresh Playback Volume", + SOC_SINGLE_TLV("DAC MBC1 Comp Thresh Volume", R_DACMBCTHR1, FB_DACMBCTHR1_THRESH, 0xff, 0, compth_scale), SOC_ENUM("DAC MBC1 Comp Ratio", dac_mbc1_compressor_ratio_enum), @@ -775,9 +775,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { SOC_SINGLE("MBC2 Phase Invert Switch", R_DACMBCMUG2, FB_DACMBCMUG2_PHASE, 1, 0), - SOC_SINGLE_TLV("DAC MBC2 Make-Up Gain Playback Volume", + SOC_SINGLE_TLV("DAC MBC2 Make-Up Gain Volume", R_DACMBCMUG2, FB_DACMBCMUG2_MUGAIN, 0x1f, 0, mugain_scale), - SOC_SINGLE_TLV("DAC MBC2 Comp Thresh Playback Volume", + SOC_SINGLE_TLV("DAC MBC2 Comp Thresh Volume", R_DACMBCTHR2, FB_DACMBCTHR2_THRESH, 0xff, 0, compth_scale), SOC_ENUM("DAC MBC2 Comp Ratio", dac_mbc2_compressor_ratio_enum), @@ -787,9 +787,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { SOC_SINGLE("MBC3 Phase Invert Switch", R_DACMBCMUG3, FB_DACMBCMUG3_PHASE, 1, 0), - SOC_SINGLE_TLV("DAC MBC3 Make-Up Gain Playback Volume", + SOC_SINGLE_TLV("DAC MBC3 Make-Up Gain Volume", R_DACMBCMUG3, FB_DACMBCMUG3_MUGAIN, 0x1f, 0, mugain_scale), - SOC_SINGLE_TLV("DAC MBC3 Comp Thresh Playback Volume", + SOC_SINGLE_TLV("DAC MBC3 Comp Thresh Volume", R_DACMBCTHR3, FB_DACMBCTHR3_THRESH, 0xff, 0, compth_scale), SOC_ENUM("DAC MBC3 Comp Ratio", dac_mbc3_compressor_ratio_enum), -- 2.17.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [alsa-devel][PATCH 2/3] ASoC: TSCS42xx: Remove Playback/Capture in names 2018-06-04 20:46 ` [alsa-devel][PATCH 2/3] ASoC: TSCS42xx: Remove Playback/Capture in names Steven Eckhoff @ 2018-06-18 11:31 ` Mark Brown 2018-06-20 17:34 ` Steven Eckhoff 2018-06-18 11:59 ` Applied "ASoC: TSCS42xx: Remove Playback/Capture in names" to the asoc tree Mark Brown 1 sibling, 1 reply; 9+ messages in thread From: Mark Brown @ 2018-06-18 11:31 UTC (permalink / raw) To: Steven Eckhoff Cc: alsa-devel, Liam Girdwood, Jaroslav Kysela, Takashi Iwai, linux-kernel [-- Attachment #1: Type: text/plain, Size: 286 bytes --] On Mon, Jun 04, 2018 at 03:46:28PM -0500, Steven Eckhoff wrote: > These aren't needed and some userspace apps don't work consistently with > them. > > Remove Playback/Capture from control names Really? They're part of the spec so it indicates that the apps have a problem... [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [alsa-devel][PATCH 2/3] ASoC: TSCS42xx: Remove Playback/Capture in names 2018-06-18 11:31 ` Mark Brown @ 2018-06-20 17:34 ` Steven Eckhoff 0 siblings, 0 replies; 9+ messages in thread From: Steven Eckhoff @ 2018-06-20 17:34 UTC (permalink / raw) To: Mark Brown Cc: alsa-devel, Liam Girdwood, Jaroslav Kysela, Takashi Iwai, linux-kernel On Mon, Jun 18, 2018 at 12:31:54PM +0100, Mark Brown wrote: > Really? They're part of the spec so it indicates that the apps have a > problem... I apologize for the delayed response. I am unable to reproduce the issue that I was seeing with controls that had Playback or Capture in their names. I am going look into this further. I was seeing an issue with amixer set where it would not find the control, but I could use the numid. I wanted to make sure that it would always work, so I could provide amixer set commands using the name of the control in our documentation. Regards, Steven ^ permalink raw reply [flat|nested] 9+ messages in thread
* Applied "ASoC: TSCS42xx: Remove Playback/Capture in names" to the asoc tree 2018-06-04 20:46 ` [alsa-devel][PATCH 2/3] ASoC: TSCS42xx: Remove Playback/Capture in names Steven Eckhoff 2018-06-18 11:31 ` Mark Brown @ 2018-06-18 11:59 ` Mark Brown 1 sibling, 0 replies; 9+ messages in thread From: Mark Brown @ 2018-06-18 11:59 UTC (permalink / raw) To: Steven Eckhoff Cc: Mark Brown, alsa-devel, alsa-devel, linux-kernel, Takashi Iwai, Liam Girdwood, Mark Brown, alsa-devel The patch ASoC: TSCS42xx: Remove Playback/Capture in names has been applied to the asoc tree at https://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 19d996cc3ad698379bcd8482dabe78abe3dc8d96 Mon Sep 17 00:00:00 2001 From: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> Date: Mon, 4 Jun 2018 15:46:28 -0500 Subject: [PATCH] ASoC: TSCS42xx: Remove Playback/Capture in names These aren't needed and some userspace apps don't work consistently with them. Remove Playback/Capture from control names Signed-off-by: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/tscs42xx.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index 743194052fc4..5d596e4dab0c 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -625,19 +625,19 @@ static int bytes_info_ext(struct snd_kcontrol *kcontrol, static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { /* Volumes */ - SOC_DOUBLE_R_TLV("Headphone Playback Volume", R_HPVOLL, R_HPVOLR, + SOC_DOUBLE_R_TLV("Headphone Volume", R_HPVOLL, R_HPVOLR, FB_HPVOLL, 0x7F, 0, hpvol_scale), - SOC_DOUBLE_R_TLV("Speaker Playback Volume", R_SPKVOLL, R_SPKVOLR, + SOC_DOUBLE_R_TLV("Speaker Volume", R_SPKVOLL, R_SPKVOLR, FB_SPKVOLL, 0x7F, 0, spkvol_scale), - SOC_DOUBLE_R_TLV("Master Playback Volume", R_DACVOLL, R_DACVOLR, + SOC_DOUBLE_R_TLV("Master Volume", R_DACVOLL, R_DACVOLR, FB_DACVOLL, 0xFF, 0, dacvol_scale), - SOC_DOUBLE_R_TLV("PCM Capture Volume", R_ADCVOLL, R_ADCVOLR, + SOC_DOUBLE_R_TLV("PCM Volume", R_ADCVOLL, R_ADCVOLR, FB_ADCVOLL, 0xFF, 0, adcvol_scale), - SOC_DOUBLE_R_TLV("Master Capture Volume", R_INVOLL, R_INVOLR, + SOC_DOUBLE_R_TLV("Input Volume", R_INVOLL, R_INVOLR, FB_INVOLL, 0x3F, 0, invol_scale), /* INSEL */ - SOC_DOUBLE_R_TLV("Mic Boost Capture Volume", R_INSELL, R_INSELR, + SOC_DOUBLE_R_TLV("Mic Boost Volume", R_INSELL, R_INSELR, FB_INSELL_MICBSTL, FV_INSELL_MICBSTL_30DB, 0, mic_boost_scale), @@ -736,9 +736,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { R_CLECTL, FB_CLECTL_LIMIT_EN, 1, 0), SOC_SINGLE("Comp Switch", R_CLECTL, FB_CLECTL_COMP_EN, 1, 0), - SOC_SINGLE_TLV("CLE Make-Up Gain Playback Volume", + SOC_SINGLE_TLV("CLE Make-Up Gain Volume", R_MUGAIN, FB_MUGAIN_CLEMUG, 0x1f, 0, mugain_scale), - SOC_SINGLE_TLV("Comp Thresh Playback Volume", + SOC_SINGLE_TLV("Comp Thresh Volume", R_COMPTH, FB_COMPTH, 0xff, 0, compth_scale), SOC_ENUM("Comp Ratio", compressor_ratio_enum), SND_SOC_BYTES("Comp Atk Time", R_CATKTCL, 2), @@ -769,9 +769,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { SOC_SINGLE("MBC1 Phase Invert Switch", R_DACMBCMUG1, FB_DACMBCMUG1_PHASE, 1, 0), - SOC_SINGLE_TLV("DAC MBC1 Make-Up Gain Playback Volume", + SOC_SINGLE_TLV("DAC MBC1 Make-Up Gain Volume", R_DACMBCMUG1, FB_DACMBCMUG1_MUGAIN, 0x1f, 0, mugain_scale), - SOC_SINGLE_TLV("DAC MBC1 Comp Thresh Playback Volume", + SOC_SINGLE_TLV("DAC MBC1 Comp Thresh Volume", R_DACMBCTHR1, FB_DACMBCTHR1_THRESH, 0xff, 0, compth_scale), SOC_ENUM("DAC MBC1 Comp Ratio", dac_mbc1_compressor_ratio_enum), @@ -781,9 +781,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { SOC_SINGLE("MBC2 Phase Invert Switch", R_DACMBCMUG2, FB_DACMBCMUG2_PHASE, 1, 0), - SOC_SINGLE_TLV("DAC MBC2 Make-Up Gain Playback Volume", + SOC_SINGLE_TLV("DAC MBC2 Make-Up Gain Volume", R_DACMBCMUG2, FB_DACMBCMUG2_MUGAIN, 0x1f, 0, mugain_scale), - SOC_SINGLE_TLV("DAC MBC2 Comp Thresh Playback Volume", + SOC_SINGLE_TLV("DAC MBC2 Comp Thresh Volume", R_DACMBCTHR2, FB_DACMBCTHR2_THRESH, 0xff, 0, compth_scale), SOC_ENUM("DAC MBC2 Comp Ratio", dac_mbc2_compressor_ratio_enum), @@ -793,9 +793,9 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { SOC_SINGLE("MBC3 Phase Invert Switch", R_DACMBCMUG3, FB_DACMBCMUG3_PHASE, 1, 0), - SOC_SINGLE_TLV("DAC MBC3 Make-Up Gain Playback Volume", + SOC_SINGLE_TLV("DAC MBC3 Make-Up Gain Volume", R_DACMBCMUG3, FB_DACMBCMUG3_MUGAIN, 0x1f, 0, mugain_scale), - SOC_SINGLE_TLV("DAC MBC3 Comp Thresh Playback Volume", + SOC_SINGLE_TLV("DAC MBC3 Comp Thresh Volume", R_DACMBCTHR3, FB_DACMBCTHR3_THRESH, 0xff, 0, compth_scale), SOC_ENUM("DAC MBC3 Comp Ratio", dac_mbc3_compressor_ratio_enum), -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [alsa-devel][PATCH 3/3] ASoC: TSCS42xx: Add headphone auto switching 2018-06-04 20:45 [alsa-devel][PATCH 0/3] ASoC: TSCS42xx: Control Improvements Steven Eckhoff 2018-06-04 20:45 ` [alsa-devel][PATCH 1/3] ASoC: TSCS42xx: Add mic bias boost control Steven Eckhoff 2018-06-04 20:46 ` [alsa-devel][PATCH 2/3] ASoC: TSCS42xx: Remove Playback/Capture in names Steven Eckhoff @ 2018-06-04 20:47 ` Steven Eckhoff 2018-06-18 11:59 ` Applied "ASoC: TSCS42xx: Add headphone auto switching" to the asoc tree Mark Brown 2 siblings, 1 reply; 9+ messages in thread From: Steven Eckhoff @ 2018-06-04 20:47 UTC (permalink / raw) To: alsa-devel Cc: Steven Eckhoff, Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel Add headphone auto switching controls Signed-off-by: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> --- sound/soc/codecs/tscs42xx.c | 6 ++++++ sound/soc/codecs/tscs42xx.h | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index c79c075228a6..4f56d2937a35 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -641,6 +641,12 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { /* Mic Bias */ SOC_SINGLE("Mic Bias Boost Switch", 0x71, 0x07, 1, 0), + /* Headphone Auto Switching */ + SOC_SINGLE("Headphone Auto Switching Switch", + R_CTL, FB_CTL_HPSWEN, 1, 0), + SOC_SINGLE("Headphone Detect Polarity Toggle Switch", + R_CTL, FB_CTL_HPSWPOL, 1, 0), + /* Coefficient Ram */ COEFF_RAM_CTL("Cascade1L BiQuad1", BIQUAD_SIZE, 0x00), COEFF_RAM_CTL("Cascade1L BiQuad2", BIQUAD_SIZE, 0x05), diff --git a/sound/soc/codecs/tscs42xx.h b/sound/soc/codecs/tscs42xx.h index d4a30bcbf64b..9b15bf89c4d0 100644 --- a/sound/soc/codecs/tscs42xx.h +++ b/sound/soc/codecs/tscs42xx.h @@ -34,6 +34,7 @@ enum { #define R_DACSR 0x19 #define R_PWRM1 0x1A #define R_PWRM2 0x1B +#define R_CTL 0x1C #define R_CONFIG0 0x1F #define R_CONFIG1 0x20 #define R_DMICCTL 0x24 @@ -1110,6 +1111,13 @@ enum { #define RV_PWRM2_VREF_DISABLE \ RV(FV_PWRM2_VREF_DISABLE, FB_PWRM2_VREF) +/****************************** + * R_CTL (0x1C) * + ******************************/ + +/* Fiel Offsets */ +#define FB_CTL_HPSWEN 7 +#define FB_CTL_HPSWPOL 6 /****************************** * R_CONFIG0 (0x1F) * -- 2.17.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Applied "ASoC: TSCS42xx: Add headphone auto switching" to the asoc tree 2018-06-04 20:47 ` [alsa-devel][PATCH 3/3] ASoC: TSCS42xx: Add headphone auto switching Steven Eckhoff @ 2018-06-18 11:59 ` Mark Brown 0 siblings, 0 replies; 9+ messages in thread From: Mark Brown @ 2018-06-18 11:59 UTC (permalink / raw) To: Steven Eckhoff Cc: Mark Brown, alsa-devel, alsa-devel, linux-kernel, Takashi Iwai, Liam Girdwood, Mark Brown, alsa-devel The patch ASoC: TSCS42xx: Add headphone auto switching has been applied to the asoc tree at https://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 53af408cd9f2d1c66bc081c1d82797bfe44af3e5 Mon Sep 17 00:00:00 2001 From: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> Date: Mon, 4 Jun 2018 15:47:02 -0500 Subject: [PATCH] ASoC: TSCS42xx: Add headphone auto switching Add headphone auto switching controls Signed-off-by: Steven Eckhoff <steven.eckhoff.opensource@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/tscs42xx.c | 6 ++++++ sound/soc/codecs/tscs42xx.h | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index 5d596e4dab0c..7396a6e5277e 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -647,6 +647,12 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { /* Mic Bias */ SOC_SINGLE("Mic Bias Boost Switch", 0x71, 0x07, 1, 0), + /* Headphone Auto Switching */ + SOC_SINGLE("Headphone Auto Switching Switch", + R_CTL, FB_CTL_HPSWEN, 1, 0), + SOC_SINGLE("Headphone Detect Polarity Toggle Switch", + R_CTL, FB_CTL_HPSWPOL, 1, 0), + /* Coefficient Ram */ COEFF_RAM_CTL("Cascade1L BiQuad1", BIQUAD_SIZE, 0x00), COEFF_RAM_CTL("Cascade1L BiQuad2", BIQUAD_SIZE, 0x05), diff --git a/sound/soc/codecs/tscs42xx.h b/sound/soc/codecs/tscs42xx.h index 814c8f3c4a68..6b3a21081635 100644 --- a/sound/soc/codecs/tscs42xx.h +++ b/sound/soc/codecs/tscs42xx.h @@ -34,6 +34,7 @@ enum { #define R_DACSR 0x19 #define R_PWRM1 0x1A #define R_PWRM2 0x1B +#define R_CTL 0x1C #define R_CONFIG0 0x1F #define R_CONFIG1 0x20 #define R_DMICCTL 0x24 @@ -1110,6 +1111,13 @@ enum { #define RV_PWRM2_VREF_DISABLE \ RV(FV_PWRM2_VREF_DISABLE, FB_PWRM2_VREF) +/****************************** + * R_CTL (0x1C) * + ******************************/ + +/* Fiel Offsets */ +#define FB_CTL_HPSWEN 7 +#define FB_CTL_HPSWPOL 6 /****************************** * R_CONFIG0 (0x1F) * -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-06-20 17:35 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-06-04 20:45 [alsa-devel][PATCH 0/3] ASoC: TSCS42xx: Control Improvements Steven Eckhoff 2018-06-04 20:45 ` [alsa-devel][PATCH 1/3] ASoC: TSCS42xx: Add mic bias boost control Steven Eckhoff 2018-06-18 11:59 ` Applied "ASoC: TSCS42xx: Add mic bias boost control" to the asoc tree Mark Brown 2018-06-04 20:46 ` [alsa-devel][PATCH 2/3] ASoC: TSCS42xx: Remove Playback/Capture in names Steven Eckhoff 2018-06-18 11:31 ` Mark Brown 2018-06-20 17:34 ` Steven Eckhoff 2018-06-18 11:59 ` Applied "ASoC: TSCS42xx: Remove Playback/Capture in names" to the asoc tree Mark Brown 2018-06-04 20:47 ` [alsa-devel][PATCH 3/3] ASoC: TSCS42xx: Add headphone auto switching Steven Eckhoff 2018-06-18 11:59 ` Applied "ASoC: TSCS42xx: Add headphone auto switching" 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; as well as URLs for NNTP newsgroup(s).