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

[PATCH] ASoC: twl4030: Drop legacy, non DT boot support
by Peter Ujfalusi 17 Jun '22

17 Jun '22

Legacy or non DT boot is no longer possible on systems where the tw4030/5030 is used. Drop the support for handling legacy pdata and replace it with a local board_params struct to allow further cleanups on the mfd side. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> --- sound/soc/codecs/twl4030.c | 101 ++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 47 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 0ba3546ef870..87b58017094b 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -34,6 +34,14 @@ #define TWL4030_CACHEREGNUM (TWL4030_REG_MISC_SET_2 + 1) +struct twl4030_board_params { + unsigned int digimic_delay; /* in ms */ + unsigned int ramp_delay_value; + unsigned int offset_cncl_path; + unsigned int hs_extmute:1; + int hs_extmute_gpio; +}; + /* codec private data */ struct twl4030_priv { unsigned int codec_powered; @@ -58,7 +66,7 @@ struct twl4030_priv { u8 carkitl_enabled, carkitr_enabled; u8 ctl_cache[TWL4030_REG_PRECKR_CTL - TWL4030_REG_EAR_CTL + 1]; - struct twl4030_codec_data *pdata; + struct twl4030_board_params *board_params; }; static void tw4030_init_ctl_cache(struct twl4030_priv *twl4030) @@ -193,73 +201,71 @@ static void twl4030_codec_enable(struct snd_soc_component *component, int enable udelay(10); } -static void twl4030_setup_pdata_of(struct twl4030_codec_data *pdata, - struct device_node *node) +static void +twl4030_get_board_param_values(struct twl4030_board_params *board_params, + struct device_node *node) { int value; - of_property_read_u32(node, "ti,digimic_delay", - &pdata->digimic_delay); - of_property_read_u32(node, "ti,ramp_delay_value", - &pdata->ramp_delay_value); - of_property_read_u32(node, "ti,offset_cncl_path", - &pdata->offset_cncl_path); + of_property_read_u32(node, "ti,digimic_delay", &board_params->digimic_delay); + of_property_read_u32(node, "ti,ramp_delay_value", &board_params->ramp_delay_value); + of_property_read_u32(node, "ti,offset_cncl_path", &board_params->offset_cncl_path); if (!of_property_read_u32(node, "ti,hs_extmute", &value)) - pdata->hs_extmute = value; + board_params->hs_extmute = value; - pdata->hs_extmute_gpio = of_get_named_gpio(node, - "ti,hs_extmute_gpio", 0); - if (gpio_is_valid(pdata->hs_extmute_gpio)) - pdata->hs_extmute = 1; + board_params->hs_extmute_gpio = of_get_named_gpio(node, "ti,hs_extmute_gpio", 0); + if (gpio_is_valid(board_params->hs_extmute_gpio)) + board_params->hs_extmute = 1; } -static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_component *component) +static struct twl4030_board_params* +twl4030_get_board_params(struct snd_soc_component *component) { - struct twl4030_codec_data *pdata = dev_get_platdata(component->dev); + struct twl4030_board_params *board_params = NULL; struct device_node *twl4030_codec_node = NULL; twl4030_codec_node = of_get_child_by_name(component->dev->parent->of_node, "codec"); - if (!pdata && twl4030_codec_node) { - pdata = devm_kzalloc(component->dev, - sizeof(struct twl4030_codec_data), - GFP_KERNEL); - if (!pdata) { + if (twl4030_codec_node) { + board_params = devm_kzalloc(component->dev, + sizeof(struct twl4030_board_params), + GFP_KERNEL); + if (!board_params) { of_node_put(twl4030_codec_node); return NULL; } - twl4030_setup_pdata_of(pdata, twl4030_codec_node); + twl4030_get_board_param_values(board_params, twl4030_codec_node); of_node_put(twl4030_codec_node); } - return pdata; + return board_params; } static void twl4030_init_chip(struct snd_soc_component *component) { - struct twl4030_codec_data *pdata; + struct twl4030_board_params *board_params; struct twl4030_priv *twl4030 = snd_soc_component_get_drvdata(component); u8 reg, byte; int i = 0; - pdata = twl4030_get_pdata(component); + board_params = twl4030_get_board_params(component); - if (pdata && pdata->hs_extmute) { - if (gpio_is_valid(pdata->hs_extmute_gpio)) { + if (board_params && board_params->hs_extmute) { + if (gpio_is_valid(board_params->hs_extmute_gpio)) { int ret; - if (!pdata->hs_extmute_gpio) + if (!board_params->hs_extmute_gpio) dev_warn(component->dev, "Extmute GPIO is 0 is this correct?\n"); - ret = gpio_request_one(pdata->hs_extmute_gpio, + ret = gpio_request_one(board_params->hs_extmute_gpio, GPIOF_OUT_INIT_LOW, "hs_extmute"); if (ret) { dev_err(component->dev, "Failed to get hs_extmute GPIO\n"); - pdata->hs_extmute_gpio = -1; + board_params->hs_extmute_gpio = -1; } } else { u8 pin_mux; @@ -290,14 +296,14 @@ static void twl4030_init_chip(struct snd_soc_component *component) twl4030_write(component, TWL4030_REG_ARXR2_APGA_CTL, 0x32); /* Machine dependent setup */ - if (!pdata) + if (!board_params) return; - twl4030->pdata = pdata; + twl4030->board_params = board_params; reg = twl4030_read(component, TWL4030_REG_HS_POPN_SET); reg &= ~TWL4030_RAMP_DELAY; - reg |= (pdata->ramp_delay_value << 2); + reg |= (board_params->ramp_delay_value << 2); twl4030_write(component, TWL4030_REG_HS_POPN_SET, reg); /* initiate offset cancellation */ @@ -305,7 +311,7 @@ static void twl4030_init_chip(struct snd_soc_component *component) reg = twl4030_read(component, TWL4030_REG_ANAMICL); reg &= ~TWL4030_OFFSET_CNCL_SEL; - reg |= pdata->offset_cncl_path; + reg |= board_params->offset_cncl_path; twl4030_write(component, TWL4030_REG_ANAMICL, reg | TWL4030_CNCL_OFFSET_START); @@ -692,7 +698,7 @@ static void headset_ramp(struct snd_soc_component *component, int ramp) { unsigned char hs_gain, hs_pop; struct twl4030_priv *twl4030 = snd_soc_component_get_drvdata(component); - struct twl4030_codec_data *pdata = twl4030->pdata; + struct twl4030_board_params *board_params = twl4030->board_params; /* Base values for ramp delay calculation: 2^19 - 2^26 */ unsigned int ramp_base[] = {524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864}; @@ -705,9 +711,9 @@ static void headset_ramp(struct snd_soc_component *component, int ramp) /* Enable external mute control, this dramatically reduces * the pop-noise */ - if (pdata && pdata->hs_extmute) { - if (gpio_is_valid(pdata->hs_extmute_gpio)) { - gpio_set_value(pdata->hs_extmute_gpio, 1); + if (board_params && board_params->hs_extmute) { + if (gpio_is_valid(board_params->hs_extmute_gpio)) { + gpio_set_value(board_params->hs_extmute_gpio, 1); } else { hs_pop |= TWL4030_EXTMUTE; twl4030_write(component, TWL4030_REG_HS_POPN_SET, hs_pop); @@ -741,9 +747,9 @@ static void headset_ramp(struct snd_soc_component *component, int ramp) } /* Disable external mute */ - if (pdata && pdata->hs_extmute) { - if (gpio_is_valid(pdata->hs_extmute_gpio)) { - gpio_set_value(pdata->hs_extmute_gpio, 0); + if (board_params && board_params->hs_extmute) { + if (gpio_is_valid(board_params->hs_extmute_gpio)) { + gpio_set_value(board_params->hs_extmute_gpio, 0); } else { hs_pop &= ~TWL4030_EXTMUTE; twl4030_write(component, TWL4030_REG_HS_POPN_SET, hs_pop); @@ -806,10 +812,10 @@ static int digimic_event(struct snd_soc_dapm_widget *w, { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct twl4030_priv *twl4030 = snd_soc_component_get_drvdata(component); - struct twl4030_codec_data *pdata = twl4030->pdata; + struct twl4030_board_params *board_params = twl4030->board_params; - if (pdata && pdata->digimic_delay) - twl4030_wait_ms(pdata->digimic_delay); + if (board_params && board_params->digimic_delay) + twl4030_wait_ms(board_params->digimic_delay); return 0; } @@ -2168,10 +2174,11 @@ static int twl4030_soc_probe(struct snd_soc_component *component) static void twl4030_soc_remove(struct snd_soc_component *component) { struct twl4030_priv *twl4030 = snd_soc_component_get_drvdata(component); - struct twl4030_codec_data *pdata = twl4030->pdata; + struct twl4030_board_params *board_params = twl4030->board_params; - if (pdata && pdata->hs_extmute && gpio_is_valid(pdata->hs_extmute_gpio)) - gpio_free(pdata->hs_extmute_gpio); + if (board_params && board_params->hs_extmute && + gpio_is_valid(board_params->hs_extmute_gpio)) + gpio_free(board_params->hs_extmute_gpio); } static const struct snd_soc_component_driver soc_component_dev_twl4030 = { -- 2.36.1

2 1

ALSA 1.2.7.1 release
by Jaroslav Kysela 17 Jun '22

17 Jun '22

Hello all, new ALSA userspace packages were released. You may download them from the ALSA website http://www.alsa-project.org or directly: HTTP: https://www.alsa-project.org/files/pub FTP: ftp://ftp.alsa-project.org/pub Released packages: alsa-lib alsa-ucm-conf alsa-plugins Full list of changes: https://www.alsa-project.org/wiki/Changes_v1.2.7_v1.2.7.1 The fingerprint of the public signing key is: F04D F507 37AC 1A88 4C4B 3D71 8380 596D A6E5 9C91 Have fun, Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

1 0

[PATCH 0/5] ALSA: rawmidi: Make code robust for external calls
by Takashi Iwai 17 Jun '22

17 Jun '22

Hi, here is a small patch set for ALSA core rawmidi code to make the code a bit more robust, especially for the case where the exported functions get called from the external drivers. Currently most of those functions assume naively that they aren't called at a wrong timing. With the patch set, it tries to harden a bit not to hit serious breakage. Takashi === Takashi Iwai (5): ALSA: rawmidi: Make internal functions local static ALSA: rawmidi: Move lock to snd_rawmidi_substream ALSA: rawmidi: Take open_mutex around parameter changes ALSA: rawmidi: Check stream state at exported functions ALSA: rawmidi: Take buffer refcount while draining output include/sound/rawmidi.h | 6 +- sound/core/rawmidi.c | 274 +++++++++++++++++++++++++--------------- 2 files changed, 170 insertions(+), 110 deletions(-) -- 2.35.3

1 5

[PATCH] ALSA: hda/realtek: Add quirk for Clevo PD70PNT
by Tim Crawford 17 Jun '22

17 Jun '22

Fixes speaker output and headset detection on Clevo PD70PNT. Signed-off-by: Tim Crawford <tcrawford(a)system76.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b937f63d0d09..ff9a09a670ed 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2634,6 +2634,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x67e1, "Clevo PB71[DE][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x67f1, "Clevo PC70H[PRS]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), + SND_PCI_QUIRK(0x1558, 0x67f5, "Clevo PD70PN[NRT]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x70d1, "Clevo PC70[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170SM", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x7715, "Clevo X170KM-G", ALC1220_FIXUP_CLEVO_PB51ED), -- 2.35.3

2 1

Silent speaker on ThinkPad T14s Gen 2i
by GitHub issues - opened 17 Jun '22

17 Jun '22

alsa-project/alsa-ucm-conf issue #171 was opened from joakim-tjernlund: Noted that speakers are silent and not sure when that happened. I note that pavucontrol shows sound playing on HDMI / Display port 2 (which is unplugged) when I test audio in MATE volume control. It seems that HDMI now is default even though it is unplugged ? Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/171 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Can anyone test with AMD onboard or HDMI/DP?
by Takashi Iwai 17 Jun '22

17 Jun '22

Hi, can anyone have an AMD onboard audio device and/or AMD HDMI/DP output for testing a patch below with 5.18.x or 5.19-rc kernels? It's a pending fix (for 5.18+), but currently it can't be verified whether it causes a regression on the actual audio I/O (while it fixes the kernel crash). If the generic allocator still doesn't work as expected here, it should show some audio stuttering or such effect. Thanks! Takashi -- 8< -- From: Takashi Iwai <tiwai(a)suse.de> Subject: [PATCH] ALSA: memalloc: Drop x86-specific hack for WC allocations The recent report for a crash on Haswell machines implied that the x86-specific (rather hackish) implementation for write-cache memory buffer allocation in ALSA core is buggy with the recent kernel in some corner cases. This patch drops the x86-specific implementation and uses the standard dma_alloc_wc() & co generically for avoiding the bug and also for simplification. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=216112 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/memalloc.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 15dc7160ba34..8cfdaee77905 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -431,33 +431,17 @@ static const struct snd_malloc_ops snd_dma_iram_ops = { */ static void *snd_dma_dev_alloc(struct snd_dma_buffer *dmab, size_t size) { - void *p; - - p = dma_alloc_coherent(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP); -#ifdef CONFIG_X86 - if (p && dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC) - set_memory_wc((unsigned long)p, PAGE_ALIGN(size) >> PAGE_SHIFT); -#endif - return p; + return dma_alloc_coherent(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP); } static void snd_dma_dev_free(struct snd_dma_buffer *dmab) { -#ifdef CONFIG_X86 - if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC) - set_memory_wb((unsigned long)dmab->area, - PAGE_ALIGN(dmab->bytes) >> PAGE_SHIFT); -#endif dma_free_coherent(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); } static int snd_dma_dev_mmap(struct snd_dma_buffer *dmab, struct vm_area_struct *area) { -#ifdef CONFIG_X86 - if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC) - area->vm_page_prot = pgprot_writecombine(area->vm_page_prot); -#endif return dma_mmap_coherent(dmab->dev.dev, area, dmab->area, dmab->addr, dmab->bytes); } @@ -471,10 +455,6 @@ static const struct snd_malloc_ops snd_dma_dev_ops = { /* * Write-combined pages */ -#ifdef CONFIG_X86 -/* On x86, share the same ops as the standard dev ops */ -#define snd_dma_wc_ops snd_dma_dev_ops -#else /* CONFIG_X86 */ static void *snd_dma_wc_alloc(struct snd_dma_buffer *dmab, size_t size) { return dma_alloc_wc(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP); @@ -497,7 +477,6 @@ static const struct snd_malloc_ops snd_dma_wc_ops = { .free = snd_dma_wc_free, .mmap = snd_dma_wc_mmap, }; -#endif /* CONFIG_X86 */ #ifdef CONFIG_SND_DMA_SGBUF static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size); -- 2.35.3

2 3

[PATCH 00/23] tests: refine test implementation
by GitHub pull_request - opened 17 Jun '22

17 Jun '22

alsa-project/alsa-gobject pull request #76 was opened from takaswie: Current implementation of test just supports GObject-derived object, enumerations, and flags. It's not possible to test the other types of glib/gobject elements such as boxed structure. This patchset refines test implementation. Some helper functions for boxed structure and namespace/object functions are added. The existent helper function is renamed as 'test_object' and rewritten to walk through Python MRO hierarchy to check properties, virtual methods, and signals, defined by both GObject-derived objects and interfaces. I note that the tests are not done to execute actual symbols. They are just to check they are available or not via interface described in metadata of GObject Introspection. ``` Takashi Sakamoto (23): tests: rename helper function to test object interface tests: add helper function to test enumerations and flags tests: add test script for ALSACtl.ElemId boxed structure tests: add test script for ALSATimer.DeviceId boxed structure tests: add test script for ALSATimer.TickEvent boxed structure tests: add test script for ALSATimer.TstampEvent boxed structure tests: add test script for ALSASeq.Addr boxed structure tests: add test script for ALSASeq.EventCntr boxed structure tests: add test script for ALSASeq.Event boxed structure tests: add test script for ALSASeq.EventDataConnect boxed object tests: add test script for ALSASeq.EventDataCtl boxed structure tests: add test script for ALSASeq.EventDataNote boxed structure tests: add test script for ALSASeq.EventDataQueue boxed structure tests: add test script for ALSASeq.EventDataResult boxed structure tests: add test script for ALSASeq.RemoveFilter boxed structure tests: test object type instead of its instance tests: refine helper function to test object tests: test virtual functions in object tests: add test script for ALSACtl.ElemInfoCommon interface tests: add test script for ALSACtl.ElemInfoSingleArray interface tests: add test script for ALSAHwdep.DeviceCommon interface tests: add test script for ALSASeq.QueueTimerCommon interface tests: add test scripts for namespace functions tests/alsactl-card | 8 ++-- tests/alsactl-card-info | 7 +-- tests/alsactl-elem-id | 14 +++--- tests/alsactl-elem-info-boolean | 8 ++-- tests/alsactl-elem-info-bytes | 8 ++-- tests/alsactl-elem-info-common | 24 +++++++++++ tests/alsactl-elem-info-enumerated | 10 +++-- tests/alsactl-elem-info-iec60958 | 8 ++-- tests/alsactl-elem-info-integer | 14 +++--- tests/alsactl-elem-info-integer64 | 14 +++--- tests/alsactl-elem-info-single-array | 21 +++++++++ tests/alsactl-elem-value | 7 +-- tests/alsactl-enums | 11 ++--- tests/alsactl-functions | 26 +++++++++++ tests/alsahwdep-device-common | 32 ++++++++++++++ tests/alsahwdep-device-info | 7 +-- tests/alsahwdep-enums | 11 ++--- tests/alsahwdep-functions | 27 ++++++++++++ tests/alsarawmidi-enums | 11 ++--- tests/alsarawmidi-functions | 27 ++++++++++++ tests/alsarawmidi-stream-pair | 8 ++-- tests/alsarawmidi-substream-info | 7 +-- tests/alsarawmidi-substream-params | 7 +-- tests/alsarawmidi-substream-status | 7 +-- tests/alsaseq-addr | 21 +++++++++ tests/alsaseq-client-info | 7 +-- tests/alsaseq-client-pool | 7 +-- tests/alsaseq-enums | 13 +++--- tests/alsaseq-event | 61 ++++++++++++++++++++++++++ tests/alsaseq-event-cntr | 18 ++++++++ tests/alsaseq-event-data-connect | 21 +++++++++ tests/alsaseq-event-data-ctl | 23 ++++++++++ tests/alsaseq-event-data-note | 27 ++++++++++++ tests/alsaseq-event-data-queue | 33 ++++++++++++++ tests/alsaseq-event-data-result | 24 +++++++++++ tests/alsaseq-functions | 35 +++++++++++++++ tests/alsaseq-port-info | 7 +-- tests/alsaseq-queue-info | 7 +-- tests/alsaseq-queue-status | 7 +-- tests/alsaseq-queue-tempo | 7 +-- tests/alsaseq-queue-timer-alsa | 14 +++--- tests/alsaseq-queue-timer-common | 22 ++++++++++ tests/alsaseq-remove-filter | 21 +++++++++ tests/alsaseq-subscribe-data | 7 +-- tests/alsaseq-system-info | 7 +-- tests/alsaseq-user-client | 13 ++++-- tests/alsatimer-device-id | 18 +++----- tests/alsatimer-device-info | 7 +-- tests/alsatimer-device-params | 7 +-- tests/alsatimer-device-status | 7 +-- tests/alsatimer-enums | 10 ++--- tests/alsatimer-functions | 29 +++++++++++++ tests/alsatimer-instance-info | 7 +-- tests/alsatimer-instance-params | 7 +-- tests/alsatimer-instance-status | 7 +-- tests/alsatimer-tick-event | 19 +++++++++ tests/alsatimer-tstamp-event | 20 +++++++++ tests/alsatimer-user-instance | 14 +++--- tests/helper.py | 64 +++++++++++++++++++++++----- tests/meson.build | 22 ++++++++++ 60 files changed, 800 insertions(+), 164 deletions(-) create mode 100644 tests/alsactl-elem-info-common create mode 100644 tests/alsactl-elem-info-single-array create mode 100644 tests/alsactl-functions create mode 100644 tests/alsahwdep-device-common create mode 100644 tests/alsahwdep-functions create mode 100644 tests/alsarawmidi-functions create mode 100644 tests/alsaseq-addr create mode 100644 tests/alsaseq-event create mode 100644 tests/alsaseq-event-cntr create mode 100644 tests/alsaseq-event-data-connect create mode 100644 tests/alsaseq-event-data-ctl create mode 100644 tests/alsaseq-event-data-note create mode 100644 tests/alsaseq-event-data-queue create mode 100644 tests/alsaseq-event-data-result create mode 100644 tests/alsaseq-functions create mode 100644 tests/alsaseq-queue-timer-common create mode 100644 tests/alsaseq-remove-filter create mode 100644 tests/alsatimer-functions create mode 100644 tests/alsatimer-tick-event create mode 100644 tests/alsatimer-tstamp-event ``` Request URL : https://github.com/alsa-project/alsa-gobject/pull/76 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/76.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

[PATCH 0/2] ALSA: x86: intel_hdmi_audio: pm_runtime updates
by Pierre-Louis Bossart 17 Jun '22

17 Jun '22

While cleaning up the code to use pm_runtime_resume_and_get(), I realized we never called pm_runtime_enable() for this driver. This is potentially very invasive and error-prone, so feedback and test results are welcome - all my BYT/CHT devices are not longer functional unfortunately, and our CI MinnowBoard uses the 'other' HDMI solution based on HDaudio. In addition, the resume was assumed to be always successful, which isn't a very good idea. Pierre-Louis Bossart (2): ALSA: x86: intel_hdmi_audio: enable pm_runtime and set autosuspend delay ALSA: x86: intel_hdmi_audio: use pm_runtime_resume_and_get() sound/x86/intel_hdmi_audio.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.34.1

2 3

[PATCH] ALSA: hda: intel-nhlt: remove use of __func__ in dev_dbg
by Pierre-Louis Bossart 17 Jun '22

17 Jun '22

The module and function information can be added with 'modprobe foo dyndbg=+pmf' Suggested-by: Greg KH <gregkh(a)linuxfoundation.org> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- sound/hda/intel-nhlt.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sound/hda/intel-nhlt.c b/sound/hda/intel-nhlt.c index 4063da3782833..9db5ccd9aa2db 100644 --- a/sound/hda/intel-nhlt.c +++ b/sound/hda/intel-nhlt.c @@ -55,8 +55,8 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt) /* find max number of channels based on format_configuration */ if (fmt_configs->fmt_count) { - dev_dbg(dev, "%s: found %d format definitions\n", - __func__, fmt_configs->fmt_count); + dev_dbg(dev, "found %d format definitions\n", + fmt_configs->fmt_count); for (i = 0; i < fmt_configs->fmt_count; i++) { struct wav_fmt_ext *fmt_ext; @@ -66,9 +66,9 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt) if (fmt_ext->fmt.channels > max_ch) max_ch = fmt_ext->fmt.channels; } - dev_dbg(dev, "%s: max channels found %d\n", __func__, max_ch); + dev_dbg(dev, "max channels found %d\n", max_ch); } else { - dev_dbg(dev, "%s: No format information found\n", __func__); + dev_dbg(dev, "No format information found\n"); } if (cfg->device_config.config_type != NHLT_CONFIG_TYPE_MIC_ARRAY) { @@ -95,17 +95,16 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt) } if (dmic_geo > 0) { - dev_dbg(dev, "%s: Array with %d dmics\n", __func__, dmic_geo); + dev_dbg(dev, "Array with %d dmics\n", dmic_geo); } if (max_ch > dmic_geo) { - dev_dbg(dev, "%s: max channels %d exceed dmic number %d\n", - __func__, max_ch, dmic_geo); + dev_dbg(dev, "max channels %d exceed dmic number %d\n", + max_ch, dmic_geo); } } } - dev_dbg(dev, "%s: dmic number %d max_ch %d\n", - __func__, dmic_geo, max_ch); + dev_dbg(dev, "dmic number %d max_ch %d\n", dmic_geo, max_ch); return dmic_geo; } -- 2.34.1

2 1

[PATCH] ALSA: hda: intel-dspcfg: use SOF for UpExtreme and UpExtreme11 boards
by Pierre-Louis Bossart 17 Jun '22

17 Jun '22

The UpExtreme BIOS reports microphones that are not physically present, so this module ends-up selecting SOF, while the UpExtreme11 BIOS does not report microphones so the snd-hda-intel driver is selected. For consistency use SOF unconditionally in autodetection mode. The use of the snd-hda-intel driver can still be enabled with 'options snd-intel-dspcfg dsp_driver=1' Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/hda/intel-dsp-config.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index a8fe01764b254..ec9cbb219bc14 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -196,6 +196,12 @@ static const struct config_entry config_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Google"), } }, + { + .ident = "UP-WHL", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), + } + }, {} } }, @@ -358,6 +364,12 @@ static const struct config_entry config_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Google"), } }, + { + .ident = "UPX-TGL", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), + } + }, {} } }, -- 2.34.1

2 1