April 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Applied "ASoC: simple-card-utils: remove set but not used variable 'dai_name'" to the asoc tree
by Mark Brown 01 Apr '19

01 Apr '19

The patch ASoC: simple-card-utils: remove set but not used variable 'dai_name' 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 35146467bd43704c52d1d5760af9839a10ad5b12 Mon Sep 17 00:00:00 2001 From: YueHaibing <yuehaibing(a)huawei.com> Date: Mon, 25 Mar 2019 03:17:40 +0000 Subject: [PATCH] ASoC: simple-card-utils: remove set but not used variable 'dai_name' Fixes gcc '-Wunused-but-set-variable' warning: sound/soc/generic/simple-card-utils.c: In function 'asoc_simple_parse_clk': sound/soc/generic/simple-card-utils.c:164:18: warning: parameter 'dai_name' set but not used [-Wunused-but-set-parameter] It's not used since commit 0580dde59438 ("ASoC: simple-card-utils: add asoc_simple_debug_info()"), so can be removed. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reviewed-by: Mukesh Ojha <mojha(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/generic/simple-card-utils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 4ed68348f939..db1458a19985 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -173,10 +173,8 @@ int asoc_simple_parse_clk(struct device *dev, * see * soc-core.c :: snd_soc_init_multicodec() */ - if (dlc) { + if (dlc) dai_of_node = dlc->of_node; - dai_name = dlc->dai_name; - } /* * Parse dai->sysclk come from "clocks = <&xxx>" -- 2.20.1

1 0

[alsa-devel] [PATCH v3 1/2] ASoC: tlv320aic31xx: Add headphone/headset detection
by Andrew F. Davis 01 Apr '19

01 Apr '19

This device can detect the insertion/removal of headphones and headsets. Enable reporting this status by enabling this interrupt and forwarding this to upper-layers if a jack has been defined. This jack definition and the resulting operation from a jack detection event must currently be defined by sound card platform code until CODEC outputs to jack mappings can be defined generically. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- Changes from v1: - Rebase Changes from v2: - Rebase sound/soc/codecs/tlv320aic31xx.c | 48 +++++++++++++++++++++++++++++++- sound/soc/codecs/tlv320aic31xx.h | 11 ++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 6744f736501f..3e11b3d41f3d 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -25,6 +25,7 @@ #include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/core.h> +#include <sound/jack.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -89,6 +90,7 @@ static bool aic31xx_volatile(struct device *dev, unsigned int reg) case AIC31XX_INTRADCFLAG: /* Sticky interrupt flags */ case AIC31XX_INTRDACFLAG2: case AIC31XX_INTRADCFLAG2: + case AIC31XX_HSDETECT: return true; } return false; @@ -157,6 +159,7 @@ struct aic31xx_priv { int micbias_vg; struct aic31xx_pdata pdata; struct regulator_bulk_data supplies[AIC31XX_NUM_SUPPLIES]; + struct snd_soc_jack *jack; unsigned int sysclk; u8 p_div; int rate_div_line; @@ -1233,6 +1236,20 @@ static int aic31xx_set_bias_level(struct snd_soc_component *component, return 0; } +int aic31xx_set_jack(struct snd_soc_component *component, + struct snd_soc_jack *jack, void *data) +{ + struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component); + + aic31xx->jack = jack; + + /* Enable/Disable jack detection */ + regmap_write(aic31xx->regmap, AIC31XX_HSDETECT, + jack ? AIC31XX_HSD_ENABLE : 0); + + return 0; +} + static int aic31xx_codec_probe(struct snd_soc_component *component) { struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component); @@ -1258,6 +1275,7 @@ static int aic31xx_codec_probe(struct snd_soc_component *component) static const struct snd_soc_component_driver soc_codec_driver_aic31xx = { .probe = aic31xx_codec_probe, + .set_jack = aic31xx_set_jack, .set_bias_level = aic31xx_set_bias_level, .controls = common31xx_snd_controls, .num_controls = ARRAY_SIZE(common31xx_snd_controls), @@ -1362,8 +1380,35 @@ static irqreturn_t aic31xx_irq(int irq, void *data) dev_err(dev, "Short circuit on Left output is detected\n"); if (value & AIC31XX_HPRSCDETECT) dev_err(dev, "Short circuit on Right output is detected\n"); + if (value & AIC31XX_HSPLUG) { + unsigned int val; + int status = 0; + + ret = regmap_read(aic31xx->regmap, AIC31XX_HSDETECT, &val); + if (ret) { + dev_err(dev, "Failed to read headset type: %d\n", ret); + goto exit; + } + + switch ((val & AIC31XX_HSD_TYPE_MASK) >> + AIC31XX_HSD_TYPE_SHIFT) { + case AIC31XX_HSD_HP: + status |= SND_JACK_HEADPHONE; + break; + case AIC31XX_HSD_HS: + status |= SND_JACK_HEADSET; + break; + default: + break; + } + + if (aic31xx->jack) + snd_soc_jack_report(aic31xx->jack, status, + AIC31XX_JACK_MASK); + } if (value & ~(AIC31XX_HPLSCDETECT | - AIC31XX_HPRSCDETECT)) + AIC31XX_HPRSCDETECT | + AIC31XX_HSPLUG)) dev_err(dev, "Unknown DAC interrupt flags: 0x%08x\n", value); read_overflow: @@ -1476,6 +1521,7 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, AIC31XX_GPIO1_FUNC_SHIFT); regmap_write(aic31xx->regmap, AIC31XX_INT1CTRL, + AIC31XX_HSPLUGDET | AIC31XX_SC | AIC31XX_ENGINE); diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index 2636f2c6bc79..9985ceed97ae 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -20,6 +20,9 @@ #define AIC31XX_MINIDSP_BIT BIT(2) #define DAC31XX_BIT BIT(3) +#define AIC31XX_JACK_MASK (SND_JACK_HEADPHONE | \ + SND_JACK_HEADSET) + enum aic31xx_type { AIC3100 = 0, AIC3110 = AIC31XX_STEREO_CLASS_D_BIT, @@ -220,6 +223,14 @@ struct aic31xx_pdata { /* AIC31XX_DACMUTE */ #define AIC31XX_DACMUTE_MASK GENMASK(3, 2) +/* AIC31XX_HSDETECT */ +#define AIC31XX_HSD_ENABLE BIT(7) +#define AIC31XX_HSD_TYPE_MASK GENMASK(6, 5) +#define AIC31XX_HSD_TYPE_SHIFT 5 +#define AIC31XX_HSD_NONE 0x00 +#define AIC31XX_HSD_HP 0x01 +#define AIC31XX_HSD_HS 0x03 + /* AIC31XX_MICBIAS */ #define AIC31XX_MICBIAS_MASK GENMASK(1, 0) #define AIC31XX_MICBIAS_SHIFT 0 -- 2.21.0

2 2

Re: [alsa-devel] [PATCH 1/3] ASoC: cros_ec_codec: Rename ec_response_codec_gain into ec_codec_i2s_gain
by Mark Brown 01 Apr '19

01 Apr '19

On Fri, Mar 29, 2019 at 10:56:36AM -0700, Gwendal Grignou wrote: > In preparation to update cros_ec_commands.h to match ChromeOS EC code > base, rename data structure that will be merged together. > > TEST=compile. This doesn't apply against current code, please check and resend.

1 0

Re: [alsa-devel] [PATCH] max98357a:add dai without triggered by pcm
by Mark Brown 01 Apr '19

01 Apr '19

On Fri, Mar 29, 2019 at 09:51:59AM +0800, tony.zou.hq(a)gmail.com wrote: > max98357a's enable pin need setting independently > when max98357a is shared I2S with other codec. > add dai "max98357a-hifi" without pcm trigger, > and use "Spk PA Switch" to set the enable pin. This sounds like a really bad idea - if you have multiple CODECs on a single DAI link tell the core about it, don't try to bodge around it. There's support for multiple CODECs on a DAI link already. > +static const char * const ext_spk_text[] = { > + "Off", "On" > +}; Simple on/off switches should be normal switch controls, not enums.

1 0

Re: [alsa-devel] INFO: task hung in evdev_release
by syzbot 01 Apr '19

01 Apr '19

syzbot has bisected this bug to: commit e32d99af6830c9a8f37b4f2637ef0cdc60fa79fb Author: Jerome Brunet <jbrunet(a)baylibre.com> Date: Tue Jul 17 15:42:50 2018 +0000 ASoC: meson: add axg fifos DT binding documentation bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=13fba69b200000 start commit: 9dcd936c Merge tag 'for-4.19/dm-fixes-4' of git://git.kern.. git tree: upstream final crash: https://syzkaller.appspot.com/x/report.txt?x=1007a69b200000 console output: https://syzkaller.appspot.com/x/log.txt?x=17fba69b200000 kernel config: https://syzkaller.appspot.com/x/.config?x=88e9a8a39dc0be2d dashboard link: https://syzkaller.appspot.com/bug?extid=a979743610b4755d4d57 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=10fcd826400000 Reported-by: syzbot+a979743610b4755d4d57(a)syzkaller.appspotmail.com Fixes: e32d99af6830 ("ASoC: meson: add axg fifos DT binding documentation") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

2 1