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

[alsa-devel] [RFC PATCH 00/10] Add support for DMA and audio codec of F1C100s
by Mesih Kilinc 23 Oct '24

23 Oct '24

This is RFC patchset for Allwinner suniv F1C100s to support DMA and audio codec. Allwinner F1C100s has a audio codec that has necessary digital and analog parts. It has r-l headphone output and microphone, line, r-l FM inputs. ADC can capture any inputs and also output channels via mux. Any input channels or DAC samples can feed output channels. Add support for this audio codec. F1C100s utilizes DMA channels to send and receive ADC-DAC samples. So DMA support needed. Patch 1~5 adds support for DMA. Suniv F1C100s has very similar DMA to sun4i. But there is some dissimilarities also. Suniv features a DMA reset bit in clock control unit. It has smaller number of DMA channels. Several registers has different addresses. It's max burst size is 4 instead of 8. Also DMA endpoint numbers are different. Patch 6 adds DMA max burst option to sun4i-codec. Patch 7~8 Add support for suniv F1C100s audio codec. Patch 9 adds audio codec to suniv-f1c100s.dtsi Patch 10 adds audio codec support to Lichee Pi Nano board. Thanks! Mesih Kilinc (10): dma-engine: sun4i: Add a quirk to support different chips dma-engine: sun4i: Add has_reset option to quirk dt-bindings: dmaengine: Add Allwinner suniv F1C100s DMA dma-engine: sun4i: Add support for Allwinner suniv F1C100s ARM: dts: suniv: f1c100s: Add support for DMA ASoC: sun4i-codec: Add DMA Max Burst field dt-bindigs: sound: Add Allwinner suniv F1C100s Audio Codec ASoC: sun4i-codec: Add support for Allwinner suniv F1C100s ARM: dts: suniv: f1c100s: Add support for Audio Codec ARM: dts: suniv: f1c100s: Activate Audio Codec for Lichee Pi Nano .../devicetree/bindings/dma/sun4i-dma.txt | 4 +- .../devicetree/bindings/sound/sun4i-codec.txt | 5 + arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 8 + arch/arm/boot/dts/suniv-f1c100s.dtsi | 25 ++ drivers/dma/Kconfig | 4 +- drivers/dma/sun4i-dma.c | 221 ++++++++++-- sound/soc/sunxi/sun4i-codec.c | 371 ++++++++++++++++++++- 7 files changed, 601 insertions(+), 37 deletions(-) -- 2.7.4

5 17

[RESEND PATCH v2] drm/bridge: dw-hdmi-i2s: set insert_pcuv bit if hardware supports it
by Geraldo Nascimento 14 Sep '24

14 Sep '24

Hi Mark, resending this as it failed to apply in my last submission. Added Neil Armstrong to Cc: as hopefully he will be able to better review this. Thanks, Geraldo Nascimento --- Starting with version 2.10a of Synopsys DesignWare HDMI controller the insert_pcuv bit was introduced. On RK3399pro SoM (Radxa Rock Pi N10), for example, if we neglect to set this bit and proceed to enable hdmi_sound and i2s2 on the device tree there will be extreme clipping of sound output, to the point that music sounds like white noise. Problem could also manifest as just mild cracking depending of HDMI audio implementation of sink. Setting insert_pcuv bit (bit 2 of aud_conf2 Audio Sample register) fixes this. Signed-off-by: Geraldo Nascimento <geraldogabriel(a)gmail.com> --- v1->v2: SoC->SoM on description, better commenting, minor style changes, conditional application of fix for L-PCM only --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio-20221017.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio-20221017.c @@ -42,6 +42,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, struct dw_hdmi *hdmi = audio->hdmi; u8 conf0 = 0; u8 conf1 = 0; + u8 conf2 = 0; u8 inputclkfs = 0; /* it cares I2S only */ @@ -101,6 +102,28 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, return -EINVAL; } + /* + * dw-hdmi introduced insert_pcuv bit in + * version 2.10a. + * + * This single bit (bit 2 of HDMI_AUD_CONF2) + * when set to 1 will enable the insertion of the PCUV + * (Parity, Channel Status, User bit and Validity) + * bits on the incoming audio stream. + * + * Support is limited to Linear PCM audio. If + * neglected, the lack of valid PCUV bits + * on L-PCM streams will cause anything from + * mild cracking to full blown extreme + * clipping depending on the HDMI audio + * implementation of the sink. + * + */ + + if (hdmi_read(audio, HDMI_DESIGN_ID) >= 0x21 && + !(hparms->iec.status[0] & IEC958_AES0_NONAUDIO)) + conf2 = HDMI_AUD_CONF2_INSERT_PCUV; + dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate); dw_hdmi_set_channel_status(hdmi, hparms->iec.status); dw_hdmi_set_channel_count(hdmi, hparms->channels); @@ -109,6 +120,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS); hdmi_write(audio, conf0, HDMI_AUD_CONF0); hdmi_write(audio, conf1, HDMI_AUD_CONF1); + hdmi_write(audio, conf2, HDMI_AUD_CONF2); return 0; } --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-20221017.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-20221017.h @@ -931,6 +931,11 @@ enum { HDMI_AUD_CONF1_WIDTH_16 = 0x10, HDMI_AUD_CONF1_WIDTH_24 = 0x18, +/* AUD_CONF2 field values */ + HDMI_AUD_CONF2_HBR = 0x01, + HDMI_AUD_CONF2_NLPCM = 0x02, + HDMI_AUD_CONF2_INSERT_PCUV = 0x04, + /* AUD_CTS3 field values */ HDMI_AUD_CTS3_N_SHIFT_OFFSET = 5, HDMI_AUD_CTS3_N_SHIFT_MASK = 0xe0,

3 3

[alsa-devel] unsupported variant of snd_hda_intel
by Alexandre 04 Jul '24

04 Jul '24

Hello, I have an Acer Aspire 4736G laptop. The soundcard that is shipped in this laptop is intel-hda based as shown (actually it's a realtek): cat /proc/asound/cards 0 [Intel ]: HDA-Intel - HDA Intel HDA Intel at 0x9b300000 irq 46 Basic sound output is correct but few feature are missing: - internal mic seems to be found but do not works. - sound output stop working when trying to send it using HDMI output - heads do not work when plugged neither when forcing pulseaudio to use it. I have an ubuntu 10.10 which is shipped with alsa 1.0.23. I have googled around and tried loading the snd-hda-intel with several parameters () as found in HD-Audio-Models.txt to no avail. cat /proc/asound/pcm 00-00: ALC888 Analog : ALC888 Analog : playback 1 : capture 1 00-01: ALC888 Digital : ALC888 Digital : playback 1 00-03: NVIDIA HDMI : NVIDIA HDMI : playback 1 Where can I begin to help implement the support for this sound card? I have very skills in developement in general but am ready to try if it is not to hard (I supose I can use previous code for similar models).. I just need a shepherd. Thanks

4 4

ALSA 1.2.8 release
by Jaroslav Kysela 11 Jun '24

11 Jun '24

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-utils alsa-ucm-conf tinycompress Full list of changes: https://www.alsa-project.org/wiki/Changes_v1.2.7.2_v1.2.8 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 4

[PATCH v4 0/7] Patches to update for rockchip pdm
by Sugar Zhang 23 Apr '24

23 Apr '24

These patches fixup or update for rockchip pdm. Changes in v4: - Acked by Rob Herring Changes in v3: - Fix property 'path-map' suggested by Rob Herring. Changes in v2: - Fix yamllint errors. Sugar Zhang (7): ASoC: rockchip: Add support for rv1126 pdm ASoC: dt-bindings: rockchip: Add binding for rv1126 pdm ASoC: rockchip: pdm: Add support for rk3568 pdm ASoC: dt-bindings: rockchip: Add binding for rk3568 pdm ASoC: rockchip: pdm: Add support for path map ASoC: dt-bindings: rockchip: pdm: Document property 'rockchip,path-map' ASoC: dt-bindings: rockchip: Convert pdm bindings to yaml .../devicetree/bindings/sound/rockchip,pdm.txt | 46 -------- .../devicetree/bindings/sound/rockchip,pdm.yaml | 120 +++++++++++++++++++++ sound/soc/rockchip/rockchip_pdm.c | 112 +++++++++++++++++-- sound/soc/rockchip/rockchip_pdm.h | 6 ++ 4 files changed, 232 insertions(+), 52 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.yaml -- 2.7.4

3 9

Yamaha YIT-W12TX not working
by Julian Sikorski 27 Nov '23

27 Nov '23

Hi list, Yamaha YIT-W12TX is a USB dongle which allows to transmit audio from PC to the YSP-4300 sound bar [1][2]. While it is quite old and no longer sold, I recently tried to make it work under linux. Unfortunately, it did not work: [ 3676.366404] usb 2-1.1: new full-speed USB device number 5 using ehci-pci [ 3676.445995] usb 2-1.1: config 1 has an invalid interface number: 4 but max is 3 [ 3676.446001] usb 2-1.1: config 1 has no interface number 2 [ 3676.446664] usb 2-1.1: New USB device found, idVendor=0499, idProduct=3108, bcdDevice= 1.00 [ 3676.446666] usb 2-1.1: New USB device strings: Mfr=2, Product=1, SerialNumber=0 [ 3676.446679] usb 2-1.1: Product: YIT-W12TX [ 3676.446683] usb 2-1.1: Manufacturer: YAMAHA Corp. [ 3676.449508] hid-generic 0003:0499:3108.0001: hiddev96,hidraw0: USB HID v0.01 Device [YAMAHA Corp. YIT-W12TX] on usb-0000:00:1d.0-1.1/input3 [ 3676.450846] input: YAMAHA Corp. YIT-W12TX as /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.1/2-1.1:1.4/0003:0499:3108.0002/input/input34 [ 3676.503844] hid-generic 0003:0499:3108.0002: input,hidraw1: USB HID v1.00 Device [YAMAHA Corp. YIT-W12TX] on usb-0000:00:1d.0-1.1/input4 [ 3676.671641] usb 2-1.1: 1:1: cannot get freq at ep 0x1 [ 3676.675786] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.676476] usbcore: registered new interface driver snd-usb-audio [ 3676.731911] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.735658] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.739399] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.743131] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.746920] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.750648] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.754445] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.758524] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.762274] usb 2-1.1: 5:0: cannot get min/max values for control 2 (id 5) [ 3676.789671] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.790049] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.790414] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.790773] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.791169] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.792134] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.792547] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.792899] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.793254] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.793634] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.794900] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.795255] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.795634] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.796008] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.796384] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.797543] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.797879] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.798254] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.798634] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.799007] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.813819] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.814281] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.814686] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.815281] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.815929] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.817807] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.818155] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.818592] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.819165] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.819801] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.822163] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.822802] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.823284] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.824161] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.824907] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.827683] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.828159] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.828675] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.829415] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.830157] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.841801] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.842155] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.842551] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.843158] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.843785] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.844909] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.845283] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.845673] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.846156] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.846800] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.848287] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.848799] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.849280] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.850031] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.850799] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.852677] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.853154] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.853674] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.854429] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.855155] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.858916] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.859277] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.859672] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.860280] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.860909] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.862033] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.862418] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.862797] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.863279] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.863923] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.865471] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.866033] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.866590] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.867410] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.868157] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.870162] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.870674] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.871155] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.871908] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.872676] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 [ 3676.900672] usb 2-1.1: USB disconnect, device number 5 [ 3676.900688] usb 2-1.1: 1:1: cannot set freq 44100 to ep 0x1 This is with kernel-5.9.13-200.fc33.x86_64 and alsa-lib-1.2.4-5.fc33.x86_64 on Fedora 33. Under Windows 10 the dongle works without any special drivers from Yamaha, everything appears to be downloaded by Windows automatically, so I was hoping the device could be made to work under Linux relatively easily. Best regards, Julian [1] https://europe.yamaha.com/en/products/audio_visual/accessories/yit-w12/down… [2] https://europe.yamaha.com/en/products/audio_visual/sound_bar/ysp-4300/downl…

2 7

Re: RFC: usb: gadget: u_audio: Notifying gadget that host started playback/capture?
by Pavel Hofman 30 Oct '23

30 Oct '23

Hi, Dne 08. 09. 21 v 10:21 Pavel Hofman napsal(a): > Hi, > > The current audio gadget has no way to inform the gadget side that the > host side has started playback/capture and that gadget-side alsa > processes should be started. > > Playback/capture processes on the host side do not get stuck without the > gadget side consuming/producing data (OUT requests are ignored in > u_audio_iso_complete, IN ones send initial zeros in their req->buf). > > However, playback/capture processes on the gadget side get stuck without > the host side sending playback OUT packets or capture IN requests and > time out with error. If there was a way to inform the gadget side that > playback/capture has started on the host side, the gadget clients could > react accordingly. > I drafted a simple patch for u_audio.c which defines read-only boolean ctl elems "Capture Requested" and "Playback Requested". Their values are set/reset in methods u_audio_start_capture/playback and u_audio_stop_capture/playback, i.e. at changes of respective altsettings from 0 to 1 and back. Every ctl elem value change sends notification via snd_ctl_notify. The principle works OK for capture/playback start/stop on the host, as monitored by alsactl: pi@raspberrypi:~ $ alsactl monitor hw:UAC2Gadget node hw:UAC2Gadget, #4 (3,0,0,Capture Requested,0) VALUE node hw:UAC2Gadget, #4 (3,0,0,Capture Requested,0) VALUE node hw:UAC2Gadget, #3 (3,0,0,Playback Requested,0) VALUE node hw:UAC2Gadget, #3 (3,0,0,Playback Requested,0) VALUE However at enumeration the USB host switches both playback and capture altsettings repeatedly, generating "fake" events from the gadget side POW. The host even sends regular-sized EP-OUT packets filled with zeros during enumeration (tested on linux only for now). Please is there any way to "detect" the enumeration stage to mask out the "fake" playback/capture start/stop events? The attached patch does not apply cleanly to mainline u_audio.c because it's rebased on other patches not submitted yet but it's only a discussion inducer for now. Thanks a lot, Pavel.

2 6

[alsa-devel] echo-cancellation plugin advice?
by Max Klein 27 Oct '23

27 Oct '23

> Well, asym wouldn't be the answer. Basically you'll need to open two > slave PCMs in one plugin. So, it's no simple filter-type plugin. > It's doable, but not easy as it sounds, I guess. Takashi, can you please further explain why asym is not the solution and what you see as a problem? I am also trying to figure out if it would be possible to create such a plugin for ALSA? I am still searching for some good starting points on how to write an ALSA plugin... Jean-Marc Valin (http://lists.linuxaudio.org/pipermail/linux-audio-dev/2005-June/012454.html) already released his work as part of speex but as far I know there is no plugin that has been made out of it? Thanks for any hint! -- NEU: FreePhone 3-fach-Flat mit kostenlosem Smartphone! Jetzt informieren: http://mobile.1und1.de/?ac=OM.PW.PW003K20328T7073a

3 2

[PATCH] ASoC: fsl_sai: Enable MCTL_MCLK_EN bit for master mode
by Shengjiu Wang 07 Jul '23

07 Jul '23

On i.MX8MM, the MCTL_MCLK_EN bit it is not only the gate for MCLK output to PAD, but also the gate bit between root clock and SAI module, So it is need to be enabled for master mode, otherwise there is no bclk generated. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_sai.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index fa950dde5310..dae16a14f177 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -437,6 +437,12 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq) FSL_SAI_CR2_DIV_MASK | FSL_SAI_CR2_BYP, savediv / 2 - 1); + if (sai->soc_data->max_register >= FSL_SAI_MCTL) { + /* SAI is in master mode at this point, so enable MCLK */ + regmap_update_bits(sai->regmap, FSL_SAI_MCTL, + FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN); + } + return 0; } -- 2.17.1

5 4

[PATCH 1/2] ASoC: fsl-asoc-card: add nau8822 support
by Hui Wang 22 Jun '23

22 Jun '23

This is for an imx6sx EVB which has a nau8822 codec connects to the SSI2 interface, so add the nau8822 support in this machine driver. Because the codec driver nau8822.c doesn't handle mclk enabling, here adding a codec_priv->mclk for nau8822 and similar codecs which need to enable the mclk in the machine driver, and enable the mclk in the card_late_probe() conditionally. Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/soc/fsl/fsl-asoc-card.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index d9a0d4768c4d..89504865cb1d 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -27,6 +27,7 @@ #include "../codecs/wm8960.h" #include "../codecs/wm8994.h" #include "../codecs/tlv320aic31xx.h" +#include "../codecs/nau8822.h" #define CS427x_SYSCLK_MCLK 0 @@ -45,6 +46,7 @@ * @pll_id: PLL id for set_pll() */ struct codec_priv { + struct clk *mclk; unsigned long mclk_freq; unsigned long free_freq; u32 mclk_id; @@ -522,6 +524,9 @@ static int fsl_asoc_card_late_probe(struct snd_soc_card *card) return ret; } + if (!IS_ERR_OR_NULL(codec_priv->mclk)) + clk_prepare_enable(codec_priv->mclk); + return 0; } @@ -682,6 +687,14 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->codec_priv.free_freq = priv->codec_priv.mclk_freq; priv->card.dapm_routes = NULL; priv->card.num_dapm_routes = 0; + } else if (of_device_is_compatible(np, "fsl,imx-audio-nau8822")) { + codec_dai_name = "nau8822-hifi"; + priv->codec_priv.mclk_id = NAU8822_CLK_MCLK; + priv->codec_priv.fll_id = NAU8822_CLK_PLL; + priv->codec_priv.pll_id = NAU8822_CLK_PLL; + priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; + if (codec_dev) + priv->codec_priv.mclk = devm_clk_get(codec_dev, NULL); } else { dev_err(&pdev->dev, "unknown Device Tree compatible\n"); ret = -EINVAL; @@ -907,6 +920,7 @@ static const struct of_device_id fsl_asoc_card_dt_ids[] = { { .compatible = "fsl,imx-audio-wm8524", }, { .compatible = "fsl,imx-audio-si476x", }, { .compatible = "fsl,imx-audio-wm8958", }, + { .compatible = "fsl,imx-audio-nau8822", }, {} }; MODULE_DEVICE_TABLE(of, fsl_asoc_card_dt_ids); -- 2.25.1

2 2