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

[PATCH] drm: bridge: adv7511: Add set_jack handler
by Jun Nie 04 Feb '21

04 Feb '21

With commit 55c5cc63ab, the hdmi_codec_set_jack() will report unsupport failure if set_jack handler is missing. Add set_jack handler to resolve this failure. Signed-off-by: Jun Nie <jun.nie(a)linaro.org> --- .../gpu/drm/bridge/adv7511/adv7511_audio.c | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c index f101dd2819b5..16de1a8ca7a0 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c @@ -217,22 +217,35 @@ static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component, return -EINVAL; } +static int adv7511_hdmi_i2s_hook_plugged_cb(struct device *dev, void *data, + hdmi_codec_plugged_cb fn, + struct device *codec_dev) +{ + struct adv7511 *adv7511 = data; + bool plugged = adv7511->connector.status == connector_status_connected; + + fn(codec_dev, plugged); + return 0; +} + static const struct hdmi_codec_ops adv7511_codec_ops = { .hw_params = adv7511_hdmi_hw_params, .audio_shutdown = audio_shutdown, .audio_startup = audio_startup, .get_dai_id = adv7511_hdmi_i2s_get_dai_id, -}; - -static const struct hdmi_codec_pdata codec_data = { - .ops = &adv7511_codec_ops, - .max_i2s_channels = 2, - .i2s = 1, - .spdif = 1, + .hook_plugged_cb = adv7511_hdmi_i2s_hook_plugged_cb, }; int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511) { + struct hdmi_codec_pdata codec_data = { + .ops = &adv7511_codec_ops, + .max_i2s_channels = 2, + .i2s = 1, + .spdif = 1, + .data = adv7511, + }; + adv7511->audio_pdev = platform_device_register_data(dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO, -- 2.25.1

2 2

[PATCH] ASoC: rt5682: Fix panic in rt5682_jack_detect_handler happening during system shutdown
by Ranjani Sridharan 04 Feb '21

04 Feb '21

From: Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> During Coldboot stress tests, system encountered the following panic. Panic logs depicts rt5682_i2c_shutdown() happened first and then later jack detect handler workqueue function triggered. This situation causes panic as rt5682_i2c_shutdown() resets codec. Fix this panic by cancelling properly delayed work. Panic log: [ 20.936124] sof_pci_shutdown [ 20.940248] snd_sof_device_shutdown [ 20.945023] snd_sof_shutdown [ 21.126849] rt5682_i2c_shutdown [ 21.286053] rt5682_jack_detect_handler [ 21.291235] BUG: kernel NULL pointer dereference, address: 000000000000037c [ 21.299302] #PF: supervisor read access in kernel mode [ 21.305254] #PF: error_code(0x0000) - not-present page [ 21.311218] PGD 0 P4D 0 [ 21.314155] Oops: 0000 [#1] PREEMPT SMP NOPTI [ 21.319206] CPU: 2 PID: 123 Comm: kworker/2:3 Tainted: G U 5.4.68 #10 [ 21.333687] ACPI: Preparing to enter system sleep state S5 [ 21.337669] Workqueue: events_power_efficient rt5682_jack_detect_handler [snd_soc_rt5682] [ 21.337671] RIP: 0010:rt5682_jack_detect_handler+0x6c/0x279 [snd_soc_rt5682] Fixes: a50067d4f3c1d ('ASoC: rt5682: split i2c driver into separate module') Signed-off-by: Jairaj Arava <jairaj.arava(a)intel.com> Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)intel.com> Reviewed-by: Shuming Fan <shumingf(a)realtek.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/soc/codecs/rt5682-i2c.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/rt5682-i2c.c b/sound/soc/codecs/rt5682-i2c.c index 37d13120f5ba..6effd2611e3c 100644 --- a/sound/soc/codecs/rt5682-i2c.c +++ b/sound/soc/codecs/rt5682-i2c.c @@ -273,6 +273,8 @@ static void rt5682_i2c_shutdown(struct i2c_client *client) { struct rt5682_priv *rt5682 = i2c_get_clientdata(client); + cancel_delayed_work_sync(&rt5682->jack_detect_work); + rt5682_reset(rt5682); } -- 2.25.1

2 2

hdspmixer: Hardware output loopback toggle buttons
by GitHub pull_request - reopened 04 Feb '21

04 Feb '21

alsa-project/alsa-tools pull request #4 was reopened from pfandl: Hi, as promised in the [sound/pci/rme9652 patch](https://github.com/tiwai/sound/commit/da2a040ee7cfe1dd57d5bec7906cb9… here are the user land changes which provide the user the ability to toggle the hardware output loopback functionality per output channel. I tried to hide the buttons for devices which do not expose the snd controls yet, but due to probably unnecessary struggle i cancelled that. Please let me know though should you want them removed for not yet enabled devices. Request URL : https://github.com/alsa-project/alsa-tools/pull/4 Patch URL : https://github.com/alsa-project/alsa-tools/pull/4.patch Repository URL: https://github.com/alsa-project/alsa-tools

1 0

[RFC PATCH] ALSA: hda: call ext hda codec link up/down if available
by Kai Vehmanen 04 Feb '21

04 Feb '21

The extended HDA bus (hdac_ext) provides interfaces for more fine-grained control of individual links than what plain HDA provides for. Links can be powered off when they are not used and if all links are released, controller can shut down the command DMA. These interfaces are currently not used by common HDA codec drivers. When a HDA codec is runtime suspended, it calls snd_hdac_codec_link_down(), but there is no link to the HDA extended bus, and links are shut down only when all codecs are suspended. To support more fine-grained control of link power, this patch implements new helper functions for codec drivers to turn codec links up and down. The HDA common suspend/resume code is modified to use the new functions. This allows to fully reuse the driver code both for plain and extended HDA controllers. For compatibility, code reverts to plain HDA implementation if HDA extended bus is disabled in the kernel build, or if the controller is a plain HDA one. Co-developed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- include/sound/hdaudio_ext.h | 15 +++++++++++++++ sound/hda/ext/hdac_ext_controller.c | 28 ++++++++++++++++++++++++++++ sound/pci/hda/hda_codec.c | 5 +++-- 3 files changed, 46 insertions(+), 2 deletions(-) NOTES: - RFC status due to new usage of hdaudio_ext.h - Not fully tested! Validation still ongoing... diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h index 7abf74c1c474..151922fa3c1e 100644 --- a/include/sound/hdaudio_ext.h +++ b/include/sound/hdaudio_ext.h @@ -131,6 +131,21 @@ void snd_hdac_ext_link_clear_stream_id(struct hdac_ext_link *link, int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, struct hdac_ext_link *link); int snd_hdac_ext_bus_link_put(struct hdac_bus *bus, struct hdac_ext_link *link); +#if IS_ENABLED(CONFIG_SND_HDA_EXT_CORE) +void snd_hdac_ext_codec_link_up(struct hdac_device *codec); +void snd_hdac_ext_codec_link_down(struct hdac_device *codec); +#else +static inline void snd_hdac_ext_codec_link_up(struct hdac_device *codec) +{ + snd_hdac_codec_link_up(codec); +} + +static inline void snd_hdac_ext_codec_link_down(struct hdac_device *codec) +{ + snd_hdac_codec_link_down(codec); +} +#endif + /* update register macro */ #define snd_hdac_updatel(addr, reg, mask, val) \ writel(((readl(addr + reg) & ~(mask)) | (val)), \ diff --git a/sound/hda/ext/hdac_ext_controller.c b/sound/hda/ext/hdac_ext_controller.c index b0c0ef824d7d..fd03b5d3a10e 100644 --- a/sound/hda/ext/hdac_ext_controller.c +++ b/sound/hda/ext/hdac_ext_controller.c @@ -332,3 +332,31 @@ int snd_hdac_ext_bus_link_put(struct hdac_bus *bus, return ret; } EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_put); + +void snd_hdac_ext_codec_link_up(struct hdac_device *codec) +{ + snd_hdac_codec_link_up(codec); + + if (codec->type == HDA_DEV_ASOC) { + const char *devname = dev_name(&codec->dev); + struct hdac_ext_link *hlink = + snd_hdac_ext_bus_get_link(codec->bus, devname); + if (hlink) + snd_hdac_ext_bus_link_get(codec->bus, hlink); + } +} +EXPORT_SYMBOL_GPL(snd_hdac_ext_codec_link_up); + +void snd_hdac_ext_codec_link_down(struct hdac_device *codec) +{ + snd_hdac_codec_link_down(codec); + + if (codec->type == HDA_DEV_ASOC) { + const char *devname = dev_name(&codec->dev); + struct hdac_ext_link *hlink = + snd_hdac_ext_bus_get_link(codec->bus, devname); + if (hlink) + snd_hdac_ext_bus_link_put(codec->bus, hlink); + } +} +EXPORT_SYMBOL_GPL(snd_hdac_ext_codec_link_down); diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 9b755062d841..6113f787b494 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -14,6 +14,7 @@ #include <linux/pm_runtime.h> #include <sound/core.h> #include <sound/hda_codec.h> +#include <sound/hdaudio_ext.h> #include <sound/asoundef.h> #include <sound/tlv.h> #include <sound/initval.h> @@ -2948,7 +2949,7 @@ static int hda_codec_runtime_suspend(struct device *dev) if (codec->link_down_at_suspend || (codec_has_clkstop(codec) && codec_has_epss(codec) && (state & AC_PWRST_CLK_STOP_OK))) - snd_hdac_codec_link_down(&codec->core); + snd_hdac_ext_codec_link_down(&codec->core); codec_display_power(codec, false); return 0; } @@ -2962,7 +2963,7 @@ static int hda_codec_runtime_resume(struct device *dev) return 0; codec_display_power(codec, true); - snd_hdac_codec_link_up(&codec->core); + snd_hdac_ext_codec_link_up(&codec->core); hda_call_codec_resume(codec); pm_runtime_mark_last_busy(dev); return 0; base-commit: 307cfa506ef4e6d7fe9430e513db2353925fb440 -- 2.29.2

2 4

[PATCH v4 00/13] MFD/extcon/ASoC: Rework arizona codec jack-detect support
by Hans de Goede 04 Feb '21

04 Feb '21

Hi all, Here is v4 of my series to rework the arizona codec jack-detect support to use the snd_soc_jack helpers instead of direct extcon reporting. This is done by reworking the extcon driver into an arizona-jackdet library and then modifying the codec drivers to use that directly, replacing the old separate extcon child-devices and extcon-driver. This brings the arizona-codec jack-detect handling inline with how all other ASoC codec driver do this. This was developed and tested on a Lenovo Yoga Tablet 1051L with a WM5102 codec. There are various interdependencies between the patches in this series, so IMHO it would be best if this entire series would be merged through the MFD tree. Note this series applies on top of my "[PATCH v4 0/5] MFD/ASoC: Add support for Intel Bay Trail boards with WM5102 codec" series. Changes in v4: - Add sound/soc/codecs/arizona-jack.c to the WOLFSON MICROELECTRONICS DRIVERS MAINTAINERS section - Small codying style tweaks to the "ASoC: arizona-jack: Cleanup logging" patch Changes in v3: - Move the bugfix patches to earlier in the series so that they apply to drivers/extcon/extcon-arizona.c so that they can be cherry-picked into the stable series - Split runtime_pm_get -> runtime_pm_get_sync changes out into their own patch - Simply move drivers/extcon/extcon-arizona.c to sound/soc/codecs/arizona-jack.c instead of first adding arizona-jack.c as a copy and then later removing extcon-arizona.c - Some other small tweaks, see individual patch changelogs Regards, Hans Hans de Goede (13): mfd: arizona: Drop arizona-extcon cells extcon: arizona: Fix some issues when HPDET IRQ fires after the jack has been unplugged extcon: arizona: Fix various races on driver unbind extcon: arizona: Fix flags parameter to the gpiod_get("wlf,micd-pol") call extcon: arizona: Always use pm_runtime_get_sync() when we need the device to be awake ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c ASoC: arizona-jack: Move jack-detect variables to struct arizona_priv ASoC: arizona-jack: Use arizona->dev for runtime-pm ASoC: arizona-jack: convert into a helper library for codec drivers ASoC: arizona-jack: Use snd_soc_jack to report jack events ASoC: arizona-jack: Cleanup logging ASoC: arizona: Make the wm5102, wm5110, wm8997 and wm8998 drivers use the new jack library ASoC: Intel: bytcr_wm5102: Add jack detect support MAINTAINERS | 3 +- drivers/extcon/Kconfig | 8 - drivers/extcon/Makefile | 1 - drivers/mfd/arizona-core.c | 20 - sound/soc/codecs/Makefile | 2 +- .../soc/codecs/arizona-jack.c | 577 +++++++----------- sound/soc/codecs/arizona.h | 44 ++ sound/soc/codecs/wm5102.c | 12 +- sound/soc/codecs/wm5110.c | 12 +- sound/soc/codecs/wm8997.c | 14 +- sound/soc/codecs/wm8998.c | 9 + sound/soc/intel/boards/bytcr_wm5102.c | 28 +- 12 files changed, 325 insertions(+), 405 deletions(-) rename drivers/extcon/extcon-arizona.c => sound/soc/codecs/arizona-jack.c (76%) -- 2.29.2

4 32

[PATCH] media: atomisp: Remove unneeded return variable
by Yang Li 04 Feb '21

04 Feb '21

This patch removes unneeded return variables, using only '0' instead. It fixes the following warning detected by coccinelle: ./drivers/staging/media/atomisp/pci/sh_css_mipi.c:39:5-8: Unneeded variable: "err". Return "0" on line 44 Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Yang Li <yang.lee(a)linux.alibaba.com> --- drivers/staging/media/atomisp/pci/sh_css_mipi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/sh_css_mipi.c index d5ae7f0..de8ee45 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_mipi.c +++ b/drivers/staging/media/atomisp/pci/sh_css_mipi.c @@ -36,12 +36,10 @@ int ia_css_mipi_frame_specify(const unsigned int size_mem_words, const bool contiguous) { - int err = 0; - my_css.size_mem_words = size_mem_words; (void)contiguous; - return err; + return 0; } /* -- 1.8.3.1

1 0

[PATCH] ALSA: usb-audio: endpoint : remove redundant check before usb_free_coherent()
by Xu Wang 04 Feb '21

04 Feb '21

usb_free_coherent() is safe with NULL addr and this check is not required. Signed-off-by: Xu Wang <vulab(a)iscas.ac.cn> --- sound/usb/endpoint.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 8e568823c992..d5ed4ddfd451 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -82,10 +82,9 @@ static inline unsigned get_usb_high_speed_rate(unsigned int rate) */ static void release_urb_ctx(struct snd_urb_ctx *u) { - if (u->buffer_size) - usb_free_coherent(u->ep->chip->dev, u->buffer_size, - u->urb->transfer_buffer, - u->urb->transfer_dma); + usb_free_coherent(u->ep->chip->dev, u->buffer_size, + u->urb->transfer_buffer, + u->urb->transfer_dma); usb_free_urb(u->urb); u->urb = NULL; } -- 2.17.1

2 1

[PATCH v3] arm64: defconfig: Enable RT5659
by Sameer Pujar 04 Feb '21

04 Feb '21

Enable the RT5659 audio codec driver. Jetson AGX Xavier has RT5658 codec which is compatible with this driver. This enables user to test external audio. Signed-off-by: Sameer Pujar <spujar(a)nvidia.com> Cc: Oder Chiou <oder_chiou(a)realtek.com> Cc: Bard Liao <bardliao(a)realtek.com> Acked-by: Jon Hunter <jonathanh(a)nvidia.com> --- This was part of original series, https://lore.kernel.org/alsa-devel/1611944866-29373-1-git-send-email-spujar… Since other patches from above series are already applied, sending this separately now. Also merging emails/groups from the resend version, https://lore.kernel.org/linux-arm-kernel/1612260252-31582-1-git-send-email-… Changelog ========= v2 -> v3: - Updated commit message to reflect usage of Jetson AGX Xavier - Added 'Acked-by' tag from Jon arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index d628125..496fcee 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -767,6 +767,7 @@ CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m CONFIG_SND_SOC_GTM601=m CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_RT5659=m CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m CONFIG_SND_SOC_TAS571X=m CONFIG_SND_SOC_WCD934X=m -- 2.7.4

1 0

[PATCH 0/2] Add remove path for Tegra audio graph card
by Sameer Pujar 04 Feb '21

04 Feb '21

Audio graph driver cleans up phandle references of CPU/CODEC nodes in graph_remove() path. As Tegra graph card driver is based on this populate remove callback for it. Sameer Pujar (2): ASoC: audio-graph: Export graph_remove() function ASoC: tegra: Add driver remove() callback include/sound/graph_card.h | 2 ++ sound/soc/generic/audio-graph-card.c | 3 ++- sound/soc/tegra/tegra_audio_graph_card.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) -- 2.7.4

3 9

[PATCH v1 0/2] ASoC: tegra: Add RT5631 machine driver
by Ion Agorria 03 Feb '21

03 Feb '21

From: Ion Agorria <ion(a)agorria.com> Adds support for Tegra SoC devices with RT5631 sound codec. Playback to speakers, headphones and internal mic recording works. This driver is used for ASUS Transformer TF201, TF700T and others Tegra based devices containing RT5631. Svyatoslav Ryhel (2): ASoC: dt-bindings: tegra: Add binding for RT5631 ASoC: tegra: Add RT5631 machine driver .../sound/nvidia,tegra-audio-rt5631.yaml | 134 +++++++++ sound/soc/tegra/Kconfig | 8 + sound/soc/tegra/Makefile | 2 + sound/soc/tegra/tegra_rt5631.c | 261 ++++++++++++++++++ 4 files changed, 405 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5631.yaml create mode 100644 sound/soc/tegra/tegra_rt5631.c -- 2.26.2

4 11