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

[alsa-devel] [PATCH] ALSA: hda/realtek: Enable audio jacks of ASUS UX362FA with ALC294
by Jian-Hong Pan 21 Feb '19

21 Feb '19

The ASUS UX362FA with ALC294 cannot detect the headset MIC and outputs through the internal speaker and the headphone. This issue can be fixed by the quirk in the commit 4e0511067 ALSA: hda/realtek: Enable audio jacks of ASUS UX533FD with ALC294. Besides, ASUS UX362FA and UX533FD have the same audio initial pin config values. So, this patch replaces SND_PCI_QUIRK of UX533FD with a new SND_HDA_PIN_QUIRK which benefits both UX362FA and UX533FD. Signed-off-by: Jian-Hong Pan <jian-hong(a)endlessm.com> Signed-off-by: Ming Shuo Chiu <chiu(a)endlessm.com> --- sound/pci/hda/patch_realtek.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1ffa36e987b4..6421864a8a0f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6771,7 +6771,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), - SND_PCI_QUIRK(0x1043, 0x14a1, "ASUS UX533FD", ALC294_FIXUP_ASUS_SPK), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), @@ -7388,6 +7387,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x14, 0x90170110}, {0x1b, 0x90a70130}, {0x21, 0x04211020}), + SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK, + {0x12, 0x90a60130}, + {0x17, 0x90170110}, + {0x21, 0x03211020}), SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK, {0x12, 0x90a60130}, {0x17, 0x90170110}, -- 2.20.1

2 1

[alsa-devel] [asoc:for-5.1 255/257] sound/soc/samsung/odroid.c:298:22: warning: 'cpu_dai' may be used uninitialized in this function
by kbuild test robot 20 Feb '19

20 Feb '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1 head: 70b773219a32c7b8f3e53e041bc023ad99fd81f4 commit: d832d2b246c516eacb2d0ba53ec17ed59c3cd62b [255/257] ASoC: samsung: odroid: Fix of_node refcount unbalance config: sh-allmodconfig (attached as .config) compiler: sh4-linux-gnu-gcc (Debian 8.2.0-11) 8.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout d832d2b246c516eacb2d0ba53ec17ed59c3cd62b # save the attached .config to linux build tree GCC_VERSION=8.2.0 make.cross ARCH=sh Note: it may well be a FALSE warning. FWIW you are at least aware of it now. http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings All warnings (new ones prefixed by >>): sound/soc/samsung/odroid.c: In function 'odroid_audio_probe': >> sound/soc/samsung/odroid.c:298:22: warning: 'cpu_dai' may be used uninitialized in this function [-Wmaybe-uninitialized] priv->clk_i2s_bus = of_clk_get_by_name(cpu_dai, "iis"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ vim +/cpu_dai +298 sound/soc/samsung/odroid.c aba611fc Sylwester Nawrocki 2017-04-21 193 aba611fc Sylwester Nawrocki 2017-04-21 194 static int odroid_audio_probe(struct platform_device *pdev) aba611fc Sylwester Nawrocki 2017-04-21 195 { aba611fc Sylwester Nawrocki 2017-04-21 196 struct device *dev = &pdev->dev; bc3cf17b Sylwester Nawrocki 2019-02-14 197 struct device_node *cpu, *cpu_dai, *codec; aba611fc Sylwester Nawrocki 2017-04-21 198 struct odroid_priv *priv; aba611fc Sylwester Nawrocki 2017-04-21 199 struct snd_soc_card *card; bc3cf17b Sylwester Nawrocki 2019-02-14 200 struct snd_soc_dai_link *link, *codec_link; bc3cf17b Sylwester Nawrocki 2019-02-14 201 int num_pcms, ret, i; bc3cf17b Sylwester Nawrocki 2019-02-14 202 struct of_phandle_args args = {}; aba611fc Sylwester Nawrocki 2017-04-21 203 aba611fc Sylwester Nawrocki 2017-04-21 204 priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); aba611fc Sylwester Nawrocki 2017-04-21 205 if (!priv) aba611fc Sylwester Nawrocki 2017-04-21 206 return -ENOMEM; aba611fc Sylwester Nawrocki 2017-04-21 207 aba611fc Sylwester Nawrocki 2017-04-21 208 card = &priv->card; aba611fc Sylwester Nawrocki 2017-04-21 209 card->dev = dev; aba611fc Sylwester Nawrocki 2017-04-21 210 aba611fc Sylwester Nawrocki 2017-04-21 211 card->owner = THIS_MODULE; aba611fc Sylwester Nawrocki 2017-04-21 212 card->fully_routed = true; aba611fc Sylwester Nawrocki 2017-04-21 213 b5c16a24 Sylwester Nawrocki 2019-02-14 214 spin_lock_init(&priv->lock); aba611fc Sylwester Nawrocki 2017-04-21 215 snd_soc_card_set_drvdata(card, priv); aba611fc Sylwester Nawrocki 2017-04-21 216 aba611fc Sylwester Nawrocki 2017-04-21 217 ret = snd_soc_of_parse_card_name(card, "model"); aba611fc Sylwester Nawrocki 2017-04-21 218 if (ret < 0) aba611fc Sylwester Nawrocki 2017-04-21 219 return ret; aba611fc Sylwester Nawrocki 2017-04-21 220 aba611fc Sylwester Nawrocki 2017-04-21 221 if (of_property_read_bool(dev->of_node, "samsung,audio-widgets")) { aba611fc Sylwester Nawrocki 2017-04-21 222 ret = snd_soc_of_parse_audio_simple_widgets(card, aba611fc Sylwester Nawrocki 2017-04-21 223 "samsung,audio-widgets"); aba611fc Sylwester Nawrocki 2017-04-21 224 if (ret < 0) aba611fc Sylwester Nawrocki 2017-04-21 225 return ret; aba611fc Sylwester Nawrocki 2017-04-21 226 } aba611fc Sylwester Nawrocki 2017-04-21 227 aba611fc Sylwester Nawrocki 2017-04-21 228 if (of_property_read_bool(dev->of_node, "samsung,audio-routing")) { aba611fc Sylwester Nawrocki 2017-04-21 229 ret = snd_soc_of_parse_audio_routing(card, aba611fc Sylwester Nawrocki 2017-04-21 230 "samsung,audio-routing"); aba611fc Sylwester Nawrocki 2017-04-21 231 if (ret < 0) aba611fc Sylwester Nawrocki 2017-04-21 232 return ret; aba611fc Sylwester Nawrocki 2017-04-21 233 } aba611fc Sylwester Nawrocki 2017-04-21 234 bc3cf17b Sylwester Nawrocki 2019-02-14 235 card->dai_link = odroid_card_dais; bc3cf17b Sylwester Nawrocki 2019-02-14 236 card->num_links = ARRAY_SIZE(odroid_card_dais); aba611fc Sylwester Nawrocki 2017-04-21 237 aba611fc Sylwester Nawrocki 2017-04-21 238 cpu = of_get_child_by_name(dev->of_node, "cpu"); aba611fc Sylwester Nawrocki 2017-04-21 239 codec = of_get_child_by_name(dev->of_node, "codec"); bc3cf17b Sylwester Nawrocki 2019-02-14 240 link = card->dai_link; bc3cf17b Sylwester Nawrocki 2019-02-14 241 codec_link = &card->dai_link[1]; bc3cf17b Sylwester Nawrocki 2019-02-14 242 bc3cf17b Sylwester Nawrocki 2019-02-14 243 /* bc3cf17b Sylwester Nawrocki 2019-02-14 244 * For backwards compatibility create the secondary CPU DAI link only bc3cf17b Sylwester Nawrocki 2019-02-14 245 * if there are 2 CPU DAI entries in the cpu sound-dai property in DT. f89aea0f Sylwester Nawrocki 2019-02-15 246 * Also add required DAPM routes not available in old DTS. bc3cf17b Sylwester Nawrocki 2019-02-14 247 */ bc3cf17b Sylwester Nawrocki 2019-02-14 248 num_pcms = of_count_phandle_with_args(cpu, "sound-dai", bc3cf17b Sylwester Nawrocki 2019-02-14 249 "#sound-dai-cells"); f89aea0f Sylwester Nawrocki 2019-02-15 250 if (num_pcms == 1) { f89aea0f Sylwester Nawrocki 2019-02-15 251 card->dapm_routes = odroid_dapm_routes; f89aea0f Sylwester Nawrocki 2019-02-15 252 card->num_dapm_routes = ARRAY_SIZE(odroid_dapm_routes); bc3cf17b Sylwester Nawrocki 2019-02-14 253 card->num_links--; f89aea0f Sylwester Nawrocki 2019-02-15 254 } bc3cf17b Sylwester Nawrocki 2019-02-14 255 bc3cf17b Sylwester Nawrocki 2019-02-14 256 for (i = 0; i < num_pcms; i++, link += 2) { bc3cf17b Sylwester Nawrocki 2019-02-14 257 ret = of_parse_phandle_with_args(cpu, "sound-dai", bc3cf17b Sylwester Nawrocki 2019-02-14 258 "#sound-dai-cells", i, &args); bc3cf17b Sylwester Nawrocki 2019-02-14 259 if (ret < 0) d832d2b2 Sylwester Nawrocki 2019-02-20 260 break; aba611fc Sylwester Nawrocki 2017-04-21 261 bc3cf17b Sylwester Nawrocki 2019-02-14 262 if (!args.np) { bc3cf17b Sylwester Nawrocki 2019-02-14 263 dev_err(dev, "sound-dai property parse error: %d\n", ret); d832d2b2 Sylwester Nawrocki 2019-02-20 264 ret = -EINVAL; d832d2b2 Sylwester Nawrocki 2019-02-20 265 break; aba611fc Sylwester Nawrocki 2017-04-21 266 } aba611fc Sylwester Nawrocki 2017-04-21 267 bc3cf17b Sylwester Nawrocki 2019-02-14 268 ret = snd_soc_get_dai_name(&args, &link->cpu_dai_name); bc3cf17b Sylwester Nawrocki 2019-02-14 269 of_node_put(args.np); bc3cf17b Sylwester Nawrocki 2019-02-14 270 aba611fc Sylwester Nawrocki 2017-04-21 271 if (ret < 0) d832d2b2 Sylwester Nawrocki 2019-02-20 272 break; bc3cf17b Sylwester Nawrocki 2019-02-14 273 } d832d2b2 Sylwester Nawrocki 2019-02-20 274 if (ret == 0) bc3cf17b Sylwester Nawrocki 2019-02-14 275 cpu_dai = of_parse_phandle(cpu, "sound-dai", 0); d832d2b2 Sylwester Nawrocki 2019-02-20 276 bc3cf17b Sylwester Nawrocki 2019-02-14 277 of_node_put(cpu); bc3cf17b Sylwester Nawrocki 2019-02-14 278 of_node_put(codec); d832d2b2 Sylwester Nawrocki 2019-02-20 279 if (ret < 0) d832d2b2 Sylwester Nawrocki 2019-02-20 280 return ret; aba611fc Sylwester Nawrocki 2017-04-21 281 bc3cf17b Sylwester Nawrocki 2019-02-14 282 ret = snd_soc_of_get_dai_link_codecs(dev, codec, codec_link); bc3cf17b Sylwester Nawrocki 2019-02-14 283 if (ret < 0) d832d2b2 Sylwester Nawrocki 2019-02-20 284 goto err_put_cpu_dai; aba611fc Sylwester Nawrocki 2017-04-21 285 bc3cf17b Sylwester Nawrocki 2019-02-14 286 /* Set capture capability only for boards with the MAX98090 CODEC */ bc3cf17b Sylwester Nawrocki 2019-02-14 287 if (codec_link->num_codecs > 1) { bc3cf17b Sylwester Nawrocki 2019-02-14 288 card->dai_link[0].dpcm_capture = 1; bc3cf17b Sylwester Nawrocki 2019-02-14 289 card->dai_link[1].dpcm_capture = 1; bc3cf17b Sylwester Nawrocki 2019-02-14 290 } a8ad0c85 Sylwester Nawrocki 2017-08-04 291 bc3cf17b Sylwester Nawrocki 2019-02-14 292 priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); a8ad0c85 Sylwester Nawrocki 2017-08-04 293 if (IS_ERR(priv->sclk_i2s)) { a8ad0c85 Sylwester Nawrocki 2017-08-04 294 ret = PTR_ERR(priv->sclk_i2s); d832d2b2 Sylwester Nawrocki 2019-02-20 295 goto err_put_cpu_dai; a8ad0c85 Sylwester Nawrocki 2017-08-04 296 } a8ad0c85 Sylwester Nawrocki 2017-08-04 297 bc3cf17b Sylwester Nawrocki 2019-02-14 @298 priv->clk_i2s_bus = of_clk_get_by_name(cpu_dai, "iis"); a8ad0c85 Sylwester Nawrocki 2017-08-04 299 if (IS_ERR(priv->clk_i2s_bus)) { a8ad0c85 Sylwester Nawrocki 2017-08-04 300 ret = PTR_ERR(priv->clk_i2s_bus); a8ad0c85 Sylwester Nawrocki 2017-08-04 301 goto err_put_sclk; a8ad0c85 Sylwester Nawrocki 2017-08-04 302 } bc3cf17b Sylwester Nawrocki 2019-02-14 303 of_node_put(cpu_dai); a8ad0c85 Sylwester Nawrocki 2017-08-04 304 aba611fc Sylwester Nawrocki 2017-04-21 305 ret = devm_snd_soc_register_card(dev, card); aba611fc Sylwester Nawrocki 2017-04-21 306 if (ret < 0) { aba611fc Sylwester Nawrocki 2017-04-21 307 dev_err(dev, "snd_soc_register_card() failed: %d\n", ret); a8ad0c85 Sylwester Nawrocki 2017-08-04 308 goto err_put_clk_i2s; aba611fc Sylwester Nawrocki 2017-04-21 309 } aba611fc Sylwester Nawrocki 2017-04-21 310 aba611fc Sylwester Nawrocki 2017-04-21 311 return 0; aba611fc Sylwester Nawrocki 2017-04-21 312 a8ad0c85 Sylwester Nawrocki 2017-08-04 313 err_put_clk_i2s: a8ad0c85 Sylwester Nawrocki 2017-08-04 314 clk_put(priv->clk_i2s_bus); a8ad0c85 Sylwester Nawrocki 2017-08-04 315 err_put_sclk: a8ad0c85 Sylwester Nawrocki 2017-08-04 316 clk_put(priv->sclk_i2s); d832d2b2 Sylwester Nawrocki 2019-02-20 317 err_put_cpu_dai: d832d2b2 Sylwester Nawrocki 2019-02-20 318 of_node_put(cpu_dai); bc3cf17b Sylwester Nawrocki 2019-02-14 319 snd_soc_of_put_dai_link_codecs(codec_link); aba611fc Sylwester Nawrocki 2017-04-21 320 return ret; aba611fc Sylwester Nawrocki 2017-04-21 321 } aba611fc Sylwester Nawrocki 2017-04-21 322 :::::: The code at line 298 was first introduced by commit :::::: bc3cf17b575a7a97b4af7ddcf86133175da7a582 ASoC: samsung: odroid: Add support for secondary CPU DAI :::::: TO: Sylwester Nawrocki <s.nawrocki(a)samsung.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: samsung: odroid: Fix of_node refcount unbalance
by Sylwester Nawrocki 20 Feb '19

20 Feb '19

In odroid_audio_probe() some OF nodes are left without reference count decrease after use. Fix it by ensuring required of_node_calls() are done before exiting probe. Reported-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- sound/soc/samsung/odroid.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index bd2c5163dc7f..c3b0f6c612cb 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -257,27 +257,31 @@ static int odroid_audio_probe(struct platform_device *pdev) ret = of_parse_phandle_with_args(cpu, "sound-dai", "#sound-dai-cells", i, &args); if (ret < 0) - return ret; + break; if (!args.np) { dev_err(dev, "sound-dai property parse error: %d\n", ret); - return -EINVAL; + ret = -EINVAL; + break; } ret = snd_soc_get_dai_name(&args, &link->cpu_dai_name); of_node_put(args.np); if (ret < 0) - return ret; + break; } + if (ret == 0) + cpu_dai = of_parse_phandle(cpu, "sound-dai", 0); - cpu_dai = of_parse_phandle(cpu, "sound-dai", 0); of_node_put(cpu); of_node_put(codec); + if (ret < 0) + return ret; ret = snd_soc_of_get_dai_link_codecs(dev, codec, codec_link); if (ret < 0) - goto err_put_codec_n; + goto err_put_cpu_dai; /* Set capture capability only for boards with the MAX98090 CODEC */ if (codec_link->num_codecs > 1) { @@ -288,7 +292,7 @@ static int odroid_audio_probe(struct platform_device *pdev) priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); if (IS_ERR(priv->sclk_i2s)) { ret = PTR_ERR(priv->sclk_i2s); - goto err_put_codec_n; + goto err_put_cpu_dai; } priv->clk_i2s_bus = of_clk_get_by_name(cpu_dai, "iis"); @@ -310,7 +314,8 @@ static int odroid_audio_probe(struct platform_device *pdev) clk_put(priv->clk_i2s_bus); err_put_sclk: clk_put(priv->sclk_i2s); -err_put_codec_n: +err_put_cpu_dai: + of_node_put(cpu_dai); snd_soc_of_put_dai_link_codecs(codec_link); return ret; } -- 2.17.1

2 1

[alsa-devel] [PATCH 0/6] ASoC: Fix of-node refcount unbalance
by Takashi Iwai 20 Feb '19

20 Feb '19

Hi, this is a patchset covering the OF-node refcount problem on a few ASoC drivers. thanks, Takashi === Takashi Iwai (6): ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt() ASoC: simple-card: Fix missing of_node_put() at simple_dai_link_of() ASoC: simple-card: Fix of-node refcount unbalance in DAI-link parser ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of() ASoC: qcom: Fix of-node refcount unbalance in qcom_snd_parse_of() ASoC: samsung: Fix of-node refcount unbalance in odroid_audio_probe() sound/soc/fsl/fsl_ssi.c | 6 ++++-- sound/soc/generic/simple-card.c | 19 +++++++++++++------ sound/soc/qcom/apq8016_sbc.c | 21 ++++++++++++++++----- sound/soc/qcom/common.c | 10 ++++++++-- sound/soc/samsung/odroid.c | 5 +++-- 5 files changed, 44 insertions(+), 17 deletions(-) -- 2.16.4

5 16

[alsa-devel] [PATCH] ALSA: hda/realtek - Reduce click noise on Dell Precision 5820 headphone
by Takashi Iwai 20 Feb '19

20 Feb '19

Dell Precision 5820 with ALC3234 codec (which is equivalent with ALC255) shows click noises at (runtime) PM resume on the headphone. The biggest source of the noise comes from the cleared headphone pin control at resume, which is done via the standard shutup procedure. Although we have an override of the standard shutup callback to replace with NOP, this would skip other needed stuff (e.g. the pull down of headset power). So, instead, this "fixes" the behavior of alc_fixup_no_shutup() by introducing spec->no_shutup_pins flag. When this flag is set, Realtek codec won't call the standard snd_hda_shutup_pins() & co. Now alc_fixup_no_shutup() just sets this flag instead of overriding spec->shutup callback itself. This allows us to apply the similar fix for other entries easily if needed in future. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 57 ++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1212955f7ab5..5855648b500c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -118,6 +118,7 @@ struct alc_spec { unsigned int has_alc5505_dsp:1; unsigned int no_depop_delay:1; unsigned int done_hp_init:1; + unsigned int no_shutup_pins:1; /* for PLL fix */ hda_nid_t pll_nid; @@ -476,6 +477,14 @@ static void alc_auto_setup_eapd(struct hda_codec *codec, bool on) set_eapd(codec, *p, on); } +static void alc_shutup_pins(struct hda_codec *codec) +{ + struct alc_spec *spec = codec->spec; + + if (!spec->no_shutup_pins) + snd_hda_shutup_pins(codec); +} + /* generic shutup callback; * just turning off EAPD and a little pause for avoiding pop-noise */ @@ -486,7 +495,7 @@ static void alc_eapd_shutup(struct hda_codec *codec) alc_auto_setup_eapd(codec, false); if (!spec->no_depop_delay) msleep(200); - snd_hda_shutup_pins(codec); + alc_shutup_pins(codec); } /* generic EAPD initialization */ @@ -814,7 +823,7 @@ static inline void alc_shutup(struct hda_codec *codec) if (spec && spec->shutup) spec->shutup(codec); else - snd_hda_shutup_pins(codec); + alc_shutup_pins(codec); } static void alc_reboot_notify(struct hda_codec *codec) @@ -2922,7 +2931,7 @@ static void alc269_shutup(struct hda_codec *codec) (alc_get_coef0(codec) & 0x00ff) == 0x018) { msleep(150); } - snd_hda_shutup_pins(codec); + alc_shutup_pins(codec); } static struct coef_fw alc282_coefs[] = { @@ -3025,14 +3034,15 @@ static void alc282_shutup(struct hda_codec *codec) if (hp_pin_sense) msleep(85); - snd_hda_codec_write(codec, hp_pin, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); + if (!spec->no_shutup_pins) + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); if (hp_pin_sense) msleep(100); alc_auto_setup_eapd(codec, false); - snd_hda_shutup_pins(codec); + alc_shutup_pins(codec); alc_write_coef_idx(codec, 0x78, coef78); } @@ -3138,15 +3148,16 @@ static void alc283_shutup(struct hda_codec *codec) if (hp_pin_sense) msleep(100); - snd_hda_codec_write(codec, hp_pin, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); + if (!spec->no_shutup_pins) + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); alc_update_coef_idx(codec, 0x46, 0, 3 << 12); if (hp_pin_sense) msleep(100); alc_auto_setup_eapd(codec, false); - snd_hda_shutup_pins(codec); + alc_shutup_pins(codec); alc_write_coef_idx(codec, 0x43, 0x9614); } @@ -3212,14 +3223,15 @@ static void alc256_shutup(struct hda_codec *codec) /* NOTE: call this before clearing the pin, otherwise codec stalls */ alc_update_coef_idx(codec, 0x46, 0, 3 << 12); - snd_hda_codec_write(codec, hp_pin, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); + if (!spec->no_shutup_pins) + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); if (hp_pin_sense) msleep(100); alc_auto_setup_eapd(codec, false); - snd_hda_shutup_pins(codec); + alc_shutup_pins(codec); } static void alc225_init(struct hda_codec *codec) @@ -3306,7 +3318,7 @@ static void alc225_shutup(struct hda_codec *codec) msleep(100); alc_auto_setup_eapd(codec, false); - snd_hda_shutup_pins(codec); + alc_shutup_pins(codec); } static void alc_default_init(struct hda_codec *codec) @@ -3360,14 +3372,15 @@ static void alc_default_shutup(struct hda_codec *codec) if (hp_pin_sense) msleep(85); - snd_hda_codec_write(codec, hp_pin, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); + if (!spec->no_shutup_pins) + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); if (hp_pin_sense) msleep(100); alc_auto_setup_eapd(codec, false); - snd_hda_shutup_pins(codec); + alc_shutup_pins(codec); } static void alc294_hp_init(struct hda_codec *codec) @@ -3384,8 +3397,9 @@ static void alc294_hp_init(struct hda_codec *codec) msleep(100); - snd_hda_codec_write(codec, hp_pin, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); + if (!spec->no_shutup_pins) + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); alc_update_coef_idx(codec, 0x6f, 0x000f, 0);/* Set HP depop to manual mode */ alc_update_coefex_idx(codec, 0x58, 0x00, 0x8000, 0x8000); /* HP depop procedure start */ @@ -4981,16 +4995,12 @@ static void alc_fixup_auto_mute_via_amp(struct hda_codec *codec, } } -static void alc_no_shutup(struct hda_codec *codec) -{ -} - static void alc_fixup_no_shutup(struct hda_codec *codec, const struct hda_fixup *fix, int action) { if (action == HDA_FIXUP_ACT_PRE_PROBE) { struct alc_spec *spec = codec->spec; - spec->shutup = alc_no_shutup; + spec->no_shutup_pins = 1; } } @@ -6639,6 +6649,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13 9350", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), SND_PCI_QUIRK(0x1028, 0x0706, "Dell Inspiron 7559", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER), SND_PCI_QUIRK(0x1028, 0x0725, "Dell Inspiron 3162", ALC255_FIXUP_DELL_SPK_NOISE), + SND_PCI_QUIRK(0x1028, 0x0738, "Dell Precision 5820", ALC269_FIXUP_NO_SHUTUP), SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), SND_PCI_QUIRK(0x1028, 0x075c, "Dell XPS 27 7760", ALC298_FIXUP_SPK_VOLUME), SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME), -- 2.16.4

1 0

[alsa-devel] [PATCH 1/2] ASoC: wm_adsp: Allow compressed buffers in any memory region
by Charles Keepax 20 Feb '19

20 Feb '19

From: Andrew Ford <aford(a)opensource.cirrus.com> Currently, compressed buffers can only be specified in the XM memory region. There is no reason to have such a restriction with the newer meta-data based way of specifying the buffers, so remove it. Signed-off-by: Andrew Ford <aford(a)opensource.cirrus.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 1dd291cebe67..12ef85e85c29 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -344,6 +344,7 @@ struct wm_adsp_compr_buf { u32 irq_count; int read_index; int avail; + int host_buf_mem_type; }; struct wm_adsp_compr { @@ -3219,14 +3220,14 @@ static int wm_adsp_write_data_word(struct wm_adsp *dsp, int mem_type, static inline int wm_adsp_buffer_read(struct wm_adsp_compr_buf *buf, unsigned int field_offset, u32 *data) { - return wm_adsp_read_data_word(buf->dsp, WMFW_ADSP2_XM, + return wm_adsp_read_data_word(buf->dsp, buf->host_buf_mem_type, buf->host_buf_ptr + field_offset, data); } static inline int wm_adsp_buffer_write(struct wm_adsp_compr_buf *buf, unsigned int field_offset, u32 data) { - return wm_adsp_write_data_word(buf->dsp, WMFW_ADSP2_XM, + return wm_adsp_write_data_word(buf->dsp, buf->host_buf_mem_type, buf->host_buf_ptr + field_offset, data); } @@ -3264,6 +3265,8 @@ static int wm_adsp_legacy_host_buf_addr(struct wm_adsp_compr_buf *buf) if (!buf->host_buf_ptr) return -EIO; + buf->host_buf_mem_type = WMFW_ADSP2_XM; + adsp_dbg(dsp, "host_buf_ptr=%x\n", buf->host_buf_ptr); return 0; @@ -3282,6 +3285,7 @@ wm_adsp_find_host_buffer_ctrl(struct wm_adsp_compr_buf *buf) if (!ctl->enabled) continue; + buf->host_buf_mem_type = ctl->alg_region.type; return ctl; } -- 2.11.0

2 4

[alsa-devel] [PATCH 1/2] ALSA: hda/realtek - Fix a typo in model documentation
by Takashi Iwai 20 Feb '19

20 Feb '19

Some garbage was taken via copy-and-paste error. Clean up. Fixes: a26d96c7802e ("ALSA: hda/realtek - Comprehensive model list for ALC259 & co") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Documentation/sound/hd-audio/models.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/sound/hd-audio/models.rst b/Documentation/sound/hd-audio/models.rst index 368a07a165f5..ef6101a78136 100644 --- a/Documentation/sound/hd-audio/models.rst +++ b/Documentation/sound/hd-audio/models.rst @@ -254,7 +254,7 @@ alc274-dell-aio ALC274 fixups on Dell AIO machines alc255-dummy-lineout Dell Precision 3930 fixups -alc255-dell-headset"}, +alc255-dell-headset Dell Precision 3630 fixups alc295-hp-x360 HP Spectre X360 fixups -- 2.16.4

1 1

[alsa-devel] [PATCH 0/3] ALSA: Fix of-node refcount unbalance
by Takashi Iwai 19 Feb '19

19 Feb '19

Hi, here is a few patches to address the unbalanced OF-node refcount on powerpc and ac97 driver code. Another patchset for ASoC will follow later. Takashi === Takashi Iwai (3): ALSA: ac97: Fix of-node refcount unbalance ALSA: aoa: Fix of-node refcount unbalance ALSA: ppc: Fix of-node refcount unbalance sound/ac97/bus.c | 2 +- sound/aoa/core/gpio-feature.c | 1 + sound/ppc/tumbler.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) -- 2.16.4

3 6

[alsa-devel] [PATCH] ASoC: fsl_spdif: fix sysclk_df type
by Viorel Suman 19 Feb '19

19 Feb '19

According to RM SPDIF STC SYSCLK_DF field is 9-bit wide, values being in 0..511 range. Use a proper type to handle sysclk_df. Signed-off-by: Viorel Suman <viorel.suman(a)nxp.com> --- sound/soc/fsl/fsl_spdif.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index a26686e..4842e6d 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -96,7 +96,7 @@ struct fsl_spdif_priv { bool dpll_locked; u32 txrate[SPDIF_TXRATE_MAX]; u8 txclk_df[SPDIF_TXRATE_MAX]; - u8 sysclk_df[SPDIF_TXRATE_MAX]; + u16 sysclk_df[SPDIF_TXRATE_MAX]; u8 txclk_src[SPDIF_TXRATE_MAX]; u8 rxclk_src; struct clk *txclk[SPDIF_TXRATE_MAX]; @@ -376,7 +376,8 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, struct platform_device *pdev = spdif_priv->pdev; unsigned long csfs = 0; u32 stc, mask, rate; - u8 clk, txclk_df, sysclk_df; + u16 sysclk_df; + u8 clk, txclk_df; int ret; switch (sample_rate) { @@ -1109,8 +1110,9 @@ static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv, static const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 }; bool is_sysclk = clk_is_match(clk, spdif_priv->sysclk); u64 rate_ideal, rate_actual, sub; - u32 sysclk_dfmin, sysclk_dfmax; - u32 txclk_df, sysclk_df, arate; + u32 arate; + u16 sysclk_dfmin, sysclk_dfmax, sysclk_df; + u8 txclk_df; /* The sysclk has an extra divisor [2, 512] */ sysclk_dfmin = is_sysclk ? 2 : 1; -- 2.7.4

3 3

[alsa-devel] [PATCH] ASoC: fsl_spdif: fix TXCLK_DF mask
by Viorel Suman 19 Feb '19

19 Feb '19

According to RM SPDIF TXCLK_DF mask is 7-bit wide. Signed-off-by: Viorel Suman <viorel.suman(a)nxp.com> --- sound/soc/fsl/fsl_spdif.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h index 7666dab..e6c61e0 100644 --- a/sound/soc/fsl/fsl_spdif.h +++ b/sound/soc/fsl/fsl_spdif.h @@ -152,7 +152,7 @@ enum spdif_gainsel { #define STC_TXCLK_ALL_EN_MASK (1 << STC_TXCLK_ALL_EN_OFFSET) #define STC_TXCLK_ALL_EN (1 << STC_TXCLK_ALL_EN_OFFSET) #define STC_TXCLK_DF_OFFSET 0 -#define STC_TXCLK_DF_MASK (0x7ff << STC_TXCLK_DF_OFFSET) +#define STC_TXCLK_DF_MASK (0x7f << STC_TXCLK_DF_OFFSET) #define STC_TXCLK_DF(x) ((((x) - 1) << STC_TXCLK_DF_OFFSET) & STC_TXCLK_DF_MASK) #define STC_TXCLK_SRC_MAX 8 -- 2.7.4

3 2