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

[PATCH 00/31] Fix and improve Rockchip RK3128 support
by Alex Bee 13 Dec '23

13 Dec '23

Hi list, this series fixes some issues I found when testing my "new" RK3128 board with the mainline kernel and adds some core functionality like SMP bringup, usb and networking. The propably most distinctive change is the split up of the DTs for the different SoCs of this platform: RK3126 and RK3128. Even if I'm not adding a RK3126 board in this series: I think this change should be done as early as possible in order to avoid issues in future. Actually it should have been done like that in the first place. All patches have been tested on both SoCs: Patch 01-04 are dt-bindings additions for this SoC platform and the new board I'm addding here Patch 05-07 are some clock driver fixes (there is more to do, but I'm limiting it to the things which can work now) Patch 08 and 09 adding support for the usb 2 phy found in RK312x platform to the Rockchip Innosilicon usb phy driver. Patch 10-14 are DT patches which I did in the "old" rk3128.dtsi in order to be backportable. Patch 15 does the aforementioned split-up of the current rk3128.dtsi in rk312x.dtsi, rk3126.dtsi and rk3128.dtsi Patch 16-20 adds SMP bringup and cpu frequency scaling Patch 21-23 adds power controller, GPU and I2S nodes to the RK312x DT Patch 24-26 adds the second I2S, S/PDIF and gmac nodes to the RK3128 DT Patch 27-30 adds fixes for the usb controllers and adds a missing pincontrol for the sd card detection Patch 31 finnaly adds a DT for Genatech XPI-3128 board There are quite some HW blocks which can easily be added for this platform, but I guess this series is pretty huge already, so that it is limited to some core devices for now. I hope the single patches are small enough, that reviewing won't be a burden ;) The plan is to sync the DT changes to u-boot after they are merged where I'm planning to add "full" TPL/SPL for this platform (dram controller/phy driver is currently missing) I'm planing the add a RK3126 (tablet) board here as well, but I will have to add support for RK816 pmic first. Alex Bee (29): dt-bindings: mfd: syscon: Add rockchip,rk3128-qos compatible dt-bindings: gpu: mali-utgard: Add Rockchip RK3128 compatible dt-bindings: ASoC: rockchip: Add compatible for RK3128 spdif dt-bindings: arm: rockchip: Add Geniatech XPI-3128 clk: rockchip: rk3128: Fix SCLK_SDMMC's clock name phy: rockchip-inno-usb2: Split ID interrupt phy registers phy: phy-rockchip-inno-usb2: Add RK3128 support ARM: dts: rockchip: Fix i2c0 register address for RK3128 ARM: dts: rockchip: Add missing arm timer interrupt for RK3128 ARM: dts: rockchip: Add missing quirk for RK3128's dma engine ARM: dts: rockchip: Fix timer clocks for RK3128 ARM: dts: rockchip: Disable non-required timers for RK3128 ARM: dts: rockchip: Split RK3128 devictree for RK312x SoC family ARM: dts: rockchip: Add SRAM node for RK312x ARM: dts: rockchip: Add CPU resets for RK312x ARM: dts: rockchip: Enable SMP bringup for RK312x ARM: dts: rockchip: Switch to operating-points-v2 for RK312x's CPU ARM: dts: rockchip: Add extra CPU voltages for RK3126 ARM: dts: rockchip: add power controller for RK312x ARM: dts: rockchip: Add GPU node for RK312x ARM: dts: rockchip: Add 2-channel I2S for RK312x ARM: dts: rockchip: Add 8-channel I2S for RK3128 ARM: dts: rockchip: Add spdif for RK3128 ARM: dts: rockchip: Add gmac for RK3128 ARM: dts: rockchip: Add dwc2 otg fifo siztes for RK312x ARM: dts: rockchip: Add USB host clocks for RK312x ARM: dts: rockchip: Make usbphy the parent of SCLK_USB480M for RK312x ARM: dts: rockchip: Add sdmmc_det pinctrl for RK312x ARM: dts: Add Geniatech XPI-3128 RK3128 board Finley Xiao (2): clk: rockchip: rk3128: Fix aclk_peri_src parent clk: rockchip: rk3128: Fix hclk_otg gate .../devicetree/bindings/arm/rockchip.yaml | 5 + .../bindings/gpu/arm,mali-utgard.yaml | 1 + .../devicetree/bindings/mfd/syscon.yaml | 1 + .../bindings/sound/rockchip-spdif.yaml | 1 + arch/arm/boot/dts/rockchip/Makefile | 1 + arch/arm/boot/dts/rockchip/rk3126.dtsi | 36 + .../arm/boot/dts/rockchip/rk3128-xpi-3128.dts | 431 +++++++ arch/arm/boot/dts/rockchip/rk3128.dtsi | 920 +------------- arch/arm/boot/dts/rockchip/rk312x.dtsi | 1101 +++++++++++++++++ drivers/clk/rockchip/clk-rk3128.c | 24 +- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 147 ++- 11 files changed, 1754 insertions(+), 914 deletions(-) create mode 100644 arch/arm/boot/dts/rockchip/rk3126.dtsi create mode 100644 arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts create mode 100644 arch/arm/boot/dts/rockchip/rk312x.dtsi base-commit: 2dde18cd1d8fac735875f2e4987f11817cc0bc2c -- 2.42.0

6 46

Regression apparently caused by commit 088a40980efbc2c449b72f0f2c7ebd82f71d08e2 "ASoC: amd: acp: add pm ops support for acp pci driver"
by Marian Postevca 05 Dec '23

05 Dec '23

I'm trying to develop a sound machine driver based on the acp legacy driver. The first version of the driver was sent for review on the alsa mailing list this spring: https://lore.kernel.org/all/20230320203519.20137-1-posteuca@mutex.one I'm trying to fix some of the issues that were brought up during the review back then, but when I ported the patches to the latest commit on the for-next branch, I noticed a regression where I couldn't hear any sound at all. So I started a bisect session and found that the first bad commit is: ASoC: amd: acp: add pm ops support for acp pci driver commit 088a40980efbc2c449b72f0f2c7ebd82f71d08e2 https://lore.kernel.org/lkml/20230622152406.3709231-11-Syed.SabaKareem@amd.… If I revert this commit sound works as expected. So I started tinkering a little bit with it and I believe that what happens is that the acp pci driver enters the autosuspend state and never leaves this state at all. I noticed this because if I increase the autosuspend delay to a much larger value, then the sound works until that delay passes. I added traces and I can see that when the delay expires the suspend callback snd_acp_suspend() gets called, but the resume callback snd_acp_resume() never gets called. I'm no expert in runtime power management (though I did read a bit on it), so I don't understand all the things that happen underneath, but one thing that is not clear to me is who's supposed to mark activity on this device and keep it from entering autosuspend if the user wants to play some sound? Shouldn't there be some counterpart that calls pm_runtime_mark_last_busy() ? I looked through the code and can't find who's calling pm_runtime_mark_last_busy(). Some help here would be welcome. Is there something missing in my machine driver code, or is the runtime pm handling in acp pci driver wrong?

5 12

[PATCH] ASoC: qcom: audioreach: Add 4 channel support
by Krzysztof Kozlowski 30 Nov '23

30 Nov '23

Add support four channel streams. Map channel 3 and 4 to left/right surround ("quad(side)" from ffmpeg standard channel list) to match what is in qdsp6/q6dsp-common.c driver. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- quad(side): https://trac.ffmpeg.org/wiki/AudioChannelManipulation#Listchannelnamesandst… --- sound/soc/qcom/qdsp6/audioreach.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c index 5974c7929dd3..4dd2a2e261c9 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -833,6 +833,11 @@ static int audioreach_mfc_set_media_format(struct q6apm_graph *graph, } else if (num_channels == 2) { media_format->channel_mapping[0] = PCM_CHANNEL_L; media_format->channel_mapping[1] = PCM_CHANNEL_R; + } else if (num_channels == 4) { + media_format->channel_mapping[0] = PCM_CHANNEL_FL; + media_format->channel_mapping[1] = PCM_CHANNEL_FR; + media_format->channel_mapping[2] = PCM_CHANNEL_LS; + media_format->channel_mapping[3] = PCM_CHANNEL_RS; } rc = q6apm_send_cmd_sync(graph->apm, pkt, 0); @@ -869,6 +874,11 @@ static int audioreach_set_compr_media_format(struct media_format *media_fmt_hdr, } else if (mcfg->num_channels == 2) { mp3_cfg->channel_mapping[0] = PCM_CHANNEL_L; mp3_cfg->channel_mapping[1] = PCM_CHANNEL_R; + } else if (mcfg->num_channels == 4) { + mp3_cfg->channel_mapping[0] = PCM_CHANNEL_FL; + mp3_cfg->channel_mapping[1] = PCM_CHANNEL_FR; + mp3_cfg->channel_mapping[2] = PCM_CHANNEL_LS; + mp3_cfg->channel_mapping[3] = PCM_CHANNEL_RS; } break; case SND_AUDIOCODEC_AAC: @@ -1057,7 +1067,7 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph, int rc, payload_size; struct gpr_pkt *pkt; - if (num_channels > 2) { + if (num_channels > 4) { dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels); return -EINVAL; } @@ -1094,7 +1104,11 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph, } else if (num_channels == 2) { media_cfg->channel_mapping[0] = PCM_CHANNEL_L; media_cfg->channel_mapping[1] = PCM_CHANNEL_R; - + } else if (num_channels == 4) { + media_cfg->channel_mapping[0] = PCM_CHANNEL_FL; + media_cfg->channel_mapping[1] = PCM_CHANNEL_FR; + media_cfg->channel_mapping[2] = PCM_CHANNEL_LS; + media_cfg->channel_mapping[3] = PCM_CHANNEL_RS; } rc = q6apm_send_cmd_sync(graph->apm, pkt, 0); @@ -1116,7 +1130,7 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph, struct gpr_pkt *pkt; void *p; - if (num_channels > 2) { + if (num_channels > 4) { dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels); return -EINVAL; } @@ -1158,6 +1172,11 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph, else if (num_channels == 2) { cfg->channel_mapping[0] = PCM_CHANNEL_L; cfg->channel_mapping[1] = PCM_CHANNEL_R; + } else if (num_channels == 4) { + cfg->channel_mapping[0] = PCM_CHANNEL_FL; + cfg->channel_mapping[1] = PCM_CHANNEL_FR; + cfg->channel_mapping[2] = PCM_CHANNEL_LS; + cfg->channel_mapping[3] = PCM_CHANNEL_RS; } } else { rc = audioreach_set_compr_media_format(header, p, mcfg); -- 2.34.1

2 3

[PATCH RFC] ALSA: scarlett2: Add ioctls for user-space access
by Geoffrey D. Bennett 27 Nov '23

27 Nov '23

In order to support functions such as firmware upgrade from user-space, add ioctls for submitting arbitrary proprietary requests through scarlett2_usb() and requesting/releasing exclusive access. --- Hi Takashi, I recently figured how to update the firmware on Scarlett Gen 2+ devices. I think the best way to implement this is with an ioctl giving access to the scarlett2_usb() function from user-space, plus two ioctls to request/release exclusive access. Does something like this seem reasonable? What ioctl magic/command values should I use? Should lock/unlock be separate, or one ioctl takes an argument for which operation to do? Thanks, Geoffrey. MAINTAINERS | 1 + include/uapi/sound/scarlett_gen2.h | 28 +++++++++ sound/usb/mixer_scarlett_gen2.c | 94 +++++++++++++++++++++++++++++- 3 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 include/uapi/sound/scarlett_gen2.h diff --git a/MAINTAINERS b/MAINTAINERS index 4cc6bf79fdd8..25e5e40f7118 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8066,6 +8066,7 @@ M: Geoffrey D. Bennett <g(a)b4.vu> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +F: include/uapi/sound/scarlett_gen2.h F: sound/usb/mixer_scarlett_gen2.c FORCEDETH GIGABIT ETHERNET DRIVER diff --git a/include/uapi/sound/scarlett_gen2.h b/include/uapi/sound/scarlett_gen2.h new file mode 100644 index 000000000000..0b51a9754ba2 --- /dev/null +++ b/include/uapi/sound/scarlett_gen2.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Focusrite Scarlett Gen 2/3 and Clarett USB/Clarett+ Driver for ALSA + * + * Copyright (c) 2023 by Geoffrey D. Bennett <g at b4.vu> + */ +#ifndef __UAPI_SOUND_SCARLETT_GEN2_H +#define __UAPI_SOUND_SCARLETT_GEN2_H + +#include <linux/types.h> +#include <linux/ioctl.h> + +/* Send a proprietary format request to the interface */ +struct snd_scarlett_gen2_usb_cmd { + u32 cmd; + void *req_data; + u16 req_size; + void *resp_data; + u16 resp_size; +}; + +#define SCARLETT2_IOCTL_USB_CMD _IOWR('S', 0x60, struct snd_scarlett_gen2_usb_cmd) + +/* Request/release exclusive access */ +#define SCARLETT2_IOCTL_LOCK _IO('S', 0x61) +#define SCARLETT2_IOCTL_UNLOCK _IO('S', 0x62) + +#endif /* __UAPI_SOUND_SCARLETT_GEN2_H */ diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index ffd398f26d2c..f1ef87b54813 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -144,6 +144,9 @@ #include <sound/control.h> #include <sound/tlv.h> +#include <sound/hwdep.h> + +#include <uapi/sound/scarlett_gen2.h> #include "usbaudio.h" #include "mixer.h" @@ -4262,10 +4265,84 @@ static int snd_scarlett_gen2_controls_create( return 0; } +static int scarlett_gen2_ioctl_usb_cmd(struct snd_hwdep *hw, unsigned long arg) +{ + struct scarlett2_data *private = hw->private_data; + struct snd_scarlett_gen2_usb_cmd usb_cmd; + int err; + void *req_data = NULL; + void *resp_data = NULL; + + // get cmd & req/resp buffers + if (copy_from_user(&usb_cmd, (void __user *)arg, sizeof(usb_cmd))) + return -EFAULT; + + // allocate request buffer, copy data from user + if (usb_cmd.req_size > 0) { + req_data = kmalloc(usb_cmd.req_size, GFP_KERNEL); + if (!req_data) { + err = -ENOMEM; + goto exit; + } + if (copy_from_user(req_data, usb_cmd.req_data, + usb_cmd.req_size)) { + err = -EFAULT; + goto exit; + } + } + + // allocate response buffer + if (usb_cmd.resp_size > 0) { + resp_data = kmalloc(usb_cmd.resp_size, GFP_KERNEL); + if (!resp_data) { + err = -ENOMEM; + goto exit; + } + } + + // send request, get response + err = scarlett2_usb(private->mixer, usb_cmd.cmd, + req_data, usb_cmd.req_size, + resp_data, usb_cmd.resp_size); + if (err < 0) + goto exit; + + // copy response to user + if (usb_cmd.resp_size > 0) + if (copy_to_user(usb_cmd.resp_data, resp_data, + usb_cmd.resp_size)) + err = -EFAULT; + +exit: + kfree(req_data); + kfree(resp_data); + + return err; +} + +static int scarlett_gen2_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, + unsigned int cmd, unsigned long arg) +{ + switch (cmd) { + + case SCARLETT2_IOCTL_USB_CMD: + return scarlett_gen2_ioctl_usb_cmd(hw, arg); + + // TODO + case SCARLETT2_IOCTL_LOCK: + case SCARLETT2_IOCTL_UNLOCK: + return -EINVAL; + + default: + return -ENOIOCTLCMD; + } +} + int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer) { struct snd_usb_audio *chip = mixer->chip; const struct scarlett2_device_entry *entry; + struct snd_hwdep *hw; int err; /* only use UAC_VERSION_2 */ @@ -4302,11 +4379,24 @@ int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer) USB_ID_PRODUCT(chip->usb_id)); err = snd_scarlett_gen2_controls_create(mixer, entry); - if (err < 0) + if (err < 0) { usb_audio_err(mixer->chip, "Error initialising %s Mixer Driver: %d", entry->series_name, err); + return err; + } + + err = snd_hwdep_new(mixer->chip->card, "Focusrite Control", 0, &hw); + if (err < 0) { + usb_audio_err(mixer->chip, + "Error creating hwdep device: %d", + err); + return err; + } - return err; + hw->private_data = mixer->private_data; + hw->ops.ioctl = scarlett_gen2_hwdep_ioctl; + + return 0; } -- 2.41.0

3 8

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

[PATCH v6 00/11] Introduce STM32 Firewall framework
by Gatien Chevallier 27 Nov '23

27 Nov '23

Introduce STM32 Firewall framework for STM32MP1x and STM32MP2x platforms. STM32MP1x(ETZPC) and STM32MP2x(RIFSC) Firewall controllers register to the framework to offer firewall services such as access granting. This series of patches is a new approach on the previous STM32 system bus, history is available here: https://lore.kernel.org/lkml/20230127164040.1047583/ The need for such framework arises from the fact that there are now multiple hardware firewalls implemented across multiple products. Drivers are shared between different products, using the same code. When it comes to firewalls, the purpose mostly stays the same: Protect hardware resources. But the implementation differs, and there are multiple types of firewalls: peripheral, memory, ... Some hardware firewall controllers such as the RIFSC implemented on STM32MP2x platforms may require to take ownership of a resource before being able to use it, hence the requirement for firewall services to take/release the ownership of such resources. On the other hand, hardware firewall configurations are becoming more and more complex. These mecanisms prevent platform crashes or other firewall-related incoveniences by denying access to some resources. The stm32 firewall framework offers an API that is defined in firewall controllers drivers to best fit the specificity of each firewall. For every peripherals protected by either the ETZPC or the RIFSC, the firewall framework checks the firewall controlelr registers to see if the peripheral's access is granted to the Linux kernel. If not, the peripheral is configured as secure, the node is marked populated, so that the driver is not probed for that device. The firewall framework relies on the access-controller device tree binding. It is used by peripherals to reference a domain access controller. In this case a firewall controller. The bus uses the ID referenced by the access-controller property to know where to look in the firewall to get the security configuration for the peripheral. This allows a device tree description rather than a hardcoded peripheral table in the bus driver. The STM32 ETZPC device is responsible for filtering accesses based on security level, or co-processor isolation for any resource connected to it. The RIFSC is responsible for filtering accesses based on Compartment ID / security level / privilege level for any resource connected to it. STM32MP13/15/25 SoC device tree files are updated in this series to implement this mecanism. Changes in V6: - Rename access-controller to access-controllers - Remove access-controller-provider - Update device trees and other bindings accordingly - Rework ETZPC/RIFSC bindings to define what access-controllers cells contain inside #access-controller-cells - Some other minor fixes Changes in V5: - Integrate and rework the "feature-domains" binding patch in this patchset. The binding is renamed to "access-controller" - Rename every feature-domain* reference to access-control* ones - Correct loop bug and missing select STM32_FIREWALL in 32-bit platform Kconfig Changes in V4: - Fix typo in commit message and YAML check errors in "dt-bindings: Document common device controller bindings" Note: This patch should be ignored as stated in the cover letter. I've done this to avoid errors on this series of patch - Correct code syntax/style issues reported by Simon Horman - Added Jonathan's tag for IIO on the treewide patch Changes in V3: Change incorrect ordering for bindings commits leading to an error while running "make DT_CHECKER_FLAGS=-m dt_binding_check" Changes in V2: generic: - Add fw_devlink dependency for "feature-domains" property. bindings: - Corrected YAMLS errors highlighted by Rob's robot - Firewall controllers YAMLs no longer define the maxItems for the "feature-domains" property - Renamed st,stm32-rifsc.yaml to st,stm32mp25-rifsc.yaml - Fix examples in YAML files - Change feature-domains maxItems to 2 in firewall consumer files as there should not be more than 2 entries for now - Declare "feature-domain-names" as an optional property for firewall controllers child nodes. - Add missing "feature-domains" property declaration in bosch,m_can.yaml and st,stm32-cryp.yaml files firewall framework: - Support multiple entries for "feature-domains" property - Better handle the device-tree parsing using phandle+args APIs - Remove "resource firewall" type - Add a field for the name of the firewall entry - Fix licenses RIFSC: - Add controller name - Driver is now a module_platform_driver - Fix license ETZPC: - Add controller name - Driver is now a module_platform_driver - Fix license Device trees: - Fix rifsc node name - Move the "ranges" property under the "feature-domains" one Gatien Chevallier (10): dt-bindings: treewide: add access-controllers description dt-bindings: bus: document RIFSC dt-bindings: bus: document ETZPC firewall: introduce stm32_firewall framework of: property: fw_devlink: Add support for "access-controller" bus: rifsc: introduce RIFSC firewall controller driver arm64: dts: st: add RIFSC as an access controller for STM32MP25x boards bus: etzpc: introduce ETZPC firewall controller driver ARM: dts: stm32: add ETZPC as a system bus for STM32MP15x boards ARM: dts: stm32: add ETZPC as a system bus for STM32MP13x boards Oleksii Moisieiev (1): dt-bindings: document generic access controllers .../access-controllers.yaml | 84 + .../bindings/bus/st,stm32-etzpc.yaml | 87 + .../bindings/bus/st,stm32mp25-rifsc.yaml | 96 + .../bindings/crypto/st,stm32-cryp.yaml | 4 + .../bindings/crypto/st,stm32-hash.yaml | 4 + .../devicetree/bindings/dma/st,stm32-dma.yaml | 4 + .../bindings/dma/st,stm32-dmamux.yaml | 4 + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 4 + .../bindings/iio/adc/st,stm32-adc.yaml | 4 + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 + .../bindings/iio/dac/st,stm32-dac.yaml | 4 + .../bindings/media/cec/st,stm32-cec.yaml | 4 + .../bindings/media/st,stm32-dcmi.yaml | 4 + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 4 + .../bindings/mfd/st,stm32-lptimer.yaml | 4 + .../bindings/mfd/st,stm32-timers.yaml | 4 + .../devicetree/bindings/mmc/arm,pl18x.yaml | 4 + .../bindings/net/can/bosch,m_can.yaml | 4 + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 + .../bindings/phy/phy-stm32-usbphyc.yaml | 4 + .../bindings/regulator/st,stm32-vrefbuf.yaml | 4 + .../devicetree/bindings/rng/st,stm32-rng.yaml | 4 + .../bindings/serial/st,stm32-uart.yaml | 4 + .../bindings/sound/st,stm32-i2s.yaml | 4 + .../bindings/sound/st,stm32-sai.yaml | 4 + .../bindings/sound/st,stm32-spdifrx.yaml | 4 + .../bindings/spi/st,stm32-qspi.yaml | 4 + .../devicetree/bindings/spi/st,stm32-spi.yaml | 4 + .../devicetree/bindings/usb/dwc2.yaml | 4 + MAINTAINERS | 7 + arch/arm/boot/dts/st/stm32mp131.dtsi | 1025 +++--- arch/arm/boot/dts/st/stm32mp133.dtsi | 51 +- arch/arm/boot/dts/st/stm32mp13xc.dtsi | 19 +- arch/arm/boot/dts/st/stm32mp13xf.dtsi | 19 +- arch/arm/boot/dts/st/stm32mp151.dtsi | 2756 +++++++++-------- arch/arm/boot/dts/st/stm32mp153.dtsi | 52 +- arch/arm/boot/dts/st/stm32mp15xc.dtsi | 19 +- arch/arm/mach-stm32/Kconfig | 1 + arch/arm64/Kconfig.platforms | 1 + arch/arm64/boot/dts/st/stm32mp251.dtsi | 6 +- drivers/bus/Kconfig | 9 + drivers/bus/Makefile | 1 + drivers/bus/stm32_etzpc.c | 141 + drivers/bus/stm32_firewall.c | 294 ++ drivers/bus/stm32_firewall.h | 83 + drivers/bus/stm32_rifsc.c | 252 ++ drivers/of/property.c | 2 + include/linux/bus/stm32_firewall_device.h | 141 + 48 files changed, 3331 insertions(+), 1919 deletions(-) create mode 100644 Documentation/devicetree/bindings/access-controllers/access-controllers.yaml create mode 100644 Documentation/devicetree/bindings/bus/st,stm32-etzpc.yaml create mode 100644 Documentation/devicetree/bindings/bus/st,stm32mp25-rifsc.yaml create mode 100644 drivers/bus/stm32_etzpc.c create mode 100644 drivers/bus/stm32_firewall.c create mode 100644 drivers/bus/stm32_firewall.h create mode 100644 drivers/bus/stm32_rifsc.c create mode 100644 include/linux/bus/stm32_firewall_device.h -- 2.35.3

2 18

[RFC PATCH 0/2] ASoC: soc-dai: add flag to mute and unmute stream during trigger.
by Srinivas Kandagatla 27 Nov '23

27 Nov '23

Click/Pop Noise was a long pending issue with WSA Codecs which are prone to accumlate DC when ports are active but without any data streams. There are multiple places in the current setup, where this could happen in both startup as well as shutdown path. This patchset adds a new flag mute_unmute_on_trigger to dai_ops to let generic code do the mute/unmute on trigger. This patches help fix those issues by making sure the PA is Muted/Unmuted inline with the stream start/stop events. Srinivas Kandagatla (2): ASoC: soc-dai: add flag to mute and unmute stream during trigger ASoC: codecs: wsa883x: make use of new mute_unmute_on_trigger flag include/sound/soc-dai.h | 1 + sound/soc/codecs/wsa883x.c | 7 +------ sound/soc/soc-dai.c | 7 +++++++ sound/soc/soc-pcm.c | 12 ++++++++---- 4 files changed, 17 insertions(+), 10 deletions(-) -- 2.21.0

5 13

[PATCH v2 0/1] ASoC: soc-pcm.c: Make sure DAI parameters cleared if the DAI becomes inactive
by Chancel Liu 27 Nov '23

27 Nov '23

It's reasonable that DAI parameters should be cleared if current DAI becomes inactive. Only check DAI active status in soc_pcm_hw_free() is not enough since there's the risk that DAI parameters never be cleared if there're more than one stream [see A]. Only check DAI active status in soc_pcm_close() is also not enough since it will cause the cleanup just happening in soc_pcm_close() [see B]. [A] For example, we have stream1 and stream2 for DAI about to stop. stream2 executes soc_pcm_hw_free() before stream1 executes soc_pcm_close(). At the moment, stream2 should clear current DAI parameters because stream1 passed the cleanup stage in soc_pcm_hw_free() and stream2 in fact is the only active stream which has a chance to do clean up. Since DAI active status is not yet updated by stream1 in soc_pcm_close(), stream2 doesn't know itself should clear DAI parameters. In result both stream1 and stream2 don't clear the parameters. [B] Suppose a case: aplay -Dhw:0 44100.wav 48000.wav In this case, we call soc_pcm_open()->soc_pcm_hw_params()->soc_pcm_hw_free() ->soc_pcm_hw_params()->soc_pcm_hw_free()->soc_pcm_close() in order. The DAI parameters would be remained in the system even if the playback of 44100.wav is finished. In conclusion, it's better to check DAI active status in both soc_pcm_hw_free() and soc_pcm_close() which makes sure DAI parameters cleared if the DAI becomes inactive. changes in v2: - Patch v1 link: https://lore.kernel.org/all/20230112065834.580192-1-chancel.liu@nxp.com/ Patch v1 tries to introduce a usage count called hw_params_count to fix issue on DAI parameters cleanup. However it's not a good fix because not considering hw_params() and hw_free() are not symmetrical and hw_params() might be called multilpe times by user. - Both check DAI active status in soc_pcm_hw_free() and soc_pcm_close() which makes sure DAI parameters cleared if the DAI becomes inactive. Chancel Liu (1): ASoC: soc-pcm.c: Make sure DAI parameters cleared if the DAI becomes inactive sound/soc/soc-pcm.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.25.1

3 4

[RFC PATCH 0/2] soundwire: introduce controller ID
by Pierre-Louis Bossart 24 Nov '23

24 Nov '23

This patchset is an alternate proposal to the solution suggested in [1], which breaks Intel machine drivers. The only difference is to use a known controller ID instead of an IDA, which wouldn't work with the hard-coded device name. This patchset was tested on Intel and AMD platforms, testing on Qualcomm platforms is required - hence the RFC status. [1] https://lore.kernel.org/alsa-devel/20231004130243.493617-1-krzysztof.kozlow… Krzysztof Kozlowski (1): soundwire: fix initializing sysfs for same devices on different buses Pierre-Louis Bossart (1): soundwire: bus: introduce controller_id drivers/soundwire/amd_manager.c | 8 ++++++++ drivers/soundwire/bus.c | 4 ++++ drivers/soundwire/debugfs.c | 2 +- drivers/soundwire/intel_auxdevice.c | 3 +++ drivers/soundwire/master.c | 2 +- drivers/soundwire/qcom.c | 3 +++ drivers/soundwire/slave.c | 12 ++++++------ include/linux/soundwire/sdw.h | 4 +++- sound/soc/intel/boards/sof_sdw.c | 4 ++-- 9 files changed, 31 insertions(+), 11 deletions(-) -- 2.39.2

5 8

[PATCH v7] dt-bindings: arm: mediatek: convert audsys and mt2701-afe-pcm to yaml
by Eugen Hristev 23 Nov '23

23 Nov '23

Convert the mediatek,audsys binding to YAML, together with the associated binding bindings/sound/mt2701-afe-pcm.yaml . Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> Reviewed-by: Rob Herring <robh(a)kernel.org> --- Changes in v7: - correctly renamed mt2701-audio.yaml to mediatek,mt2701-audio.yaml Changes in v6: - renamed mt2701-audio.yaml to mediatek,mt2701-audio.yaml - add Rb Rob Herring Changes in v5: - removed example for mt2701-audio - renamed mt2701-afe-pcm to mt2701-audio - added clock cells as required, removed reg from required, in audsys binding - removed reference comment in mt2701-audio - removed assigned clocks from mt2701-audio Changes in v4: - fix error reported by Rob's bot : ./Documentation/devicetree/bindings/sound/mt2701-afe-pcm.yaml:11:4: [error] missing starting space in comment (comments) Changes in v3: - not added Rb Conor Dooley since the patch was changed in a big essence - As per review by Krzysztof, also convert the mt2701-afe-pcm and reference the correct schema in the audsys binding. Changes in v2: - remove comment reference to inexistent binding .../bindings/arm/mediatek/mediatek,audsys.txt | 39 ----- .../arm/mediatek/mediatek,audsys.yaml | 153 ++++++++++++++++++ .../bindings/sound/mediatek,mt2701-audio.yaml | 117 ++++++++++++++ .../bindings/sound/mt2701-afe-pcm.txt | 146 ----------------- 4 files changed, 270 insertions(+), 185 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt2701-audio.yaml delete mode 100644 Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt deleted file mode 100644 index 699776be1dd3..000000000000 --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +++ /dev/null @@ -1,39 +0,0 @@ -MediaTek AUDSYS controller -============================ - -The MediaTek AUDSYS controller provides various clocks to the system. - -Required Properties: - -- compatible: Should be one of: - - "mediatek,mt2701-audsys", "syscon" - - "mediatek,mt6765-audsys", "syscon" - - "mediatek,mt6779-audio", "syscon" - - "mediatek,mt7622-audsys", "syscon" - - "mediatek,mt7623-audsys", "mediatek,mt2701-audsys", "syscon" - - "mediatek,mt8167-audiosys", "syscon" - - "mediatek,mt8183-audiosys", "syscon" - - "mediatek,mt8192-audsys", "syscon" - - "mediatek,mt8516-audsys", "syscon" -- #clock-cells: Must be 1 - -The AUDSYS controller uses the common clk binding from -Documentation/devicetree/bindings/clock/clock-bindings.txt -The available clocks are defined in dt-bindings/clock/mt*-clk.h. - -Required sub-nodes: -------- -For common binding part and usage, refer to -../sonud/mt2701-afe-pcm.txt. - -Example: - - audsys: clock-controller@11220000 { - compatible = "mediatek,mt7622-audsys", "syscon"; - reg = <0 0x11220000 0 0x2000>; - #clock-cells = <1>; - - afe: audio-controller { - ... - }; - }; diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml new file mode 100644 index 000000000000..45d4a6620041 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml @@ -0,0 +1,153 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/mediatek/mediatek,audsys.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek AUDSYS controller + +maintainers: + - Eugen Hristev <eugen.hristev(a)collabora.com> + +description: + The MediaTek AUDSYS controller provides various clocks to the system. + +properties: + compatible: + oneOf: + - items: + - enum: + - mediatek,mt2701-audsys + - mediatek,mt6765-audsys + - mediatek,mt6779-audsys + - mediatek,mt7622-audsys + - mediatek,mt8167-audsys + - mediatek,mt8173-audsys + - mediatek,mt8183-audsys + - mediatek,mt8186-audsys + - mediatek,mt8192-audsys + - mediatek,mt8516-audsys + - const: syscon + - items: + # Special case for mt7623 for backward compatibility + - const: mediatek,mt7623-audsys + - const: mediatek,mt2701-audsys + - const: syscon + + reg: + maxItems: 1 + + '#clock-cells': + const: 1 + + audio-controller: + $ref: /schemas/sound/mediatek,mt2701-audio.yaml# + type: object + +required: + - compatible + - '#clock-cells' + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/power/mt2701-power.h> + #include <dt-bindings/clock/mt2701-clk.h> + soc { + #address-cells = <2>; + #size-cells = <2>; + audsys: clock-controller@11220000 { + compatible = "mediatek,mt7622-audsys", "syscon"; + reg = <0 0x11220000 0 0x2000>; + #clock-cells = <1>; + + afe: audio-controller { + compatible = "mediatek,mt2701-audio"; + interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "afe", "asys"; + power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>; + + clocks = <&infracfg CLK_INFRA_AUDIO>, + <&topckgen CLK_TOP_AUD_MUX1_SEL>, + <&topckgen CLK_TOP_AUD_MUX2_SEL>, + <&topckgen CLK_TOP_AUD_48K_TIMING>, + <&topckgen CLK_TOP_AUD_44K_TIMING>, + <&topckgen CLK_TOP_AUD_K1_SRC_SEL>, + <&topckgen CLK_TOP_AUD_K2_SRC_SEL>, + <&topckgen CLK_TOP_AUD_K3_SRC_SEL>, + <&topckgen CLK_TOP_AUD_K4_SRC_SEL>, + <&topckgen CLK_TOP_AUD_K1_SRC_DIV>, + <&topckgen CLK_TOP_AUD_K2_SRC_DIV>, + <&topckgen CLK_TOP_AUD_K3_SRC_DIV>, + <&topckgen CLK_TOP_AUD_K4_SRC_DIV>, + <&topckgen CLK_TOP_AUD_I2S1_MCLK>, + <&topckgen CLK_TOP_AUD_I2S2_MCLK>, + <&topckgen CLK_TOP_AUD_I2S3_MCLK>, + <&topckgen CLK_TOP_AUD_I2S4_MCLK>, + <&audsys CLK_AUD_I2SO1>, + <&audsys CLK_AUD_I2SO2>, + <&audsys CLK_AUD_I2SO3>, + <&audsys CLK_AUD_I2SO4>, + <&audsys CLK_AUD_I2SIN1>, + <&audsys CLK_AUD_I2SIN2>, + <&audsys CLK_AUD_I2SIN3>, + <&audsys CLK_AUD_I2SIN4>, + <&audsys CLK_AUD_ASRCO1>, + <&audsys CLK_AUD_ASRCO2>, + <&audsys CLK_AUD_ASRCO3>, + <&audsys CLK_AUD_ASRCO4>, + <&audsys CLK_AUD_AFE>, + <&audsys CLK_AUD_AFE_CONN>, + <&audsys CLK_AUD_A1SYS>, + <&audsys CLK_AUD_A2SYS>, + <&audsys CLK_AUD_AFE_MRGIF>; + + clock-names = "infra_sys_audio_clk", + "top_audio_mux1_sel", + "top_audio_mux2_sel", + "top_audio_a1sys_hp", + "top_audio_a2sys_hp", + "i2s0_src_sel", + "i2s1_src_sel", + "i2s2_src_sel", + "i2s3_src_sel", + "i2s0_src_div", + "i2s1_src_div", + "i2s2_src_div", + "i2s3_src_div", + "i2s0_mclk_en", + "i2s1_mclk_en", + "i2s2_mclk_en", + "i2s3_mclk_en", + "i2so0_hop_ck", + "i2so1_hop_ck", + "i2so2_hop_ck", + "i2so3_hop_ck", + "i2si0_hop_ck", + "i2si1_hop_ck", + "i2si2_hop_ck", + "i2si3_hop_ck", + "asrc0_out_ck", + "asrc1_out_ck", + "asrc2_out_ck", + "asrc3_out_ck", + "audio_afe_pd", + "audio_afe_conn_pd", + "audio_a1sys_pd", + "audio_a2sys_pd", + "audio_mrgif_pd"; + + assigned-clocks = <&topckgen CLK_TOP_AUD_MUX1_SEL>, + <&topckgen CLK_TOP_AUD_MUX2_SEL>, + <&topckgen CLK_TOP_AUD_MUX1_DIV>, + <&topckgen CLK_TOP_AUD_MUX2_DIV>; + assigned-clock-parents = <&topckgen CLK_TOP_AUD1PLL_98M>, + <&topckgen CLK_TOP_AUD2PLL_90M>; + assigned-clock-rates = <0>, <0>, <49152000>, <45158400>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/sound/mediatek,mt2701-audio.yaml b/Documentation/devicetree/bindings/sound/mediatek,mt2701-audio.yaml new file mode 100644 index 000000000000..83fd7bb9cadb --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mediatek,mt2701-audio.yaml @@ -0,0 +1,117 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/mediatek,mt2701-audio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek Audio Front End (AFE) PCM controller for mt2701 + +description: + The AFE PCM node must be a subnode of the MediaTek audsys device tree node. + +maintainers: + - Eugen Hristev <eugen.hristev(a)collabora.com> + +properties: + compatible: + enum: + - mediatek,mt2701-audio + - mediatek,mt7622-audio + + interrupts: + items: + - description: AFE interrupt + - description: ASYS interrupt + + interrupt-names: + items: + - const: afe + - const: asys + + power-domains: + maxItems: 1 + + clocks: + items: + - description: audio infra sys clock + - description: top audio mux 1 + - description: top audio mux 2 + - description: top audio sys a1 clock + - description: top audio sys a2 clock + - description: i2s0 source selection + - description: i2s1 source selection + - description: i2s2 source selection + - description: i2s3 source selection + - description: i2s0 source divider + - description: i2s1 source divider + - description: i2s2 source divider + - description: i2s3 source divider + - description: i2s0 master clock + - description: i2s1 master clock + - description: i2s2 master clock + - description: i2s3 master clock + - description: i2so0 hopping clock + - description: i2so1 hopping clock + - description: i2so2 hopping clock + - description: i2so3 hopping clock + - description: i2si0 hopping clock + - description: i2si1 hopping clock + - description: i2si2 hopping clock + - description: i2si3 hopping clock + - description: asrc0 output clock + - description: asrc1 output clock + - description: asrc2 output clock + - description: asrc3 output clock + - description: audio front end pd clock + - description: audio front end conn pd clock + - description: top audio a1 sys pd + - description: top audio a2 sys pd + - description: audio merge interface pd + + clock-names: + items: + - const: infra_sys_audio_clk + - const: top_audio_mux1_sel + - const: top_audio_mux2_sel + - const: top_audio_a1sys_hp + - const: top_audio_a2sys_hp + - const: i2s0_src_sel + - const: i2s1_src_sel + - const: i2s2_src_sel + - const: i2s3_src_sel + - const: i2s0_src_div + - const: i2s1_src_div + - const: i2s2_src_div + - const: i2s3_src_div + - const: i2s0_mclk_en + - const: i2s1_mclk_en + - const: i2s2_mclk_en + - const: i2s3_mclk_en + - const: i2so0_hop_ck + - const: i2so1_hop_ck + - const: i2so2_hop_ck + - const: i2so3_hop_ck + - const: i2si0_hop_ck + - const: i2si1_hop_ck + - const: i2si2_hop_ck + - const: i2si3_hop_ck + - const: asrc0_out_ck + - const: asrc1_out_ck + - const: asrc2_out_ck + - const: asrc3_out_ck + - const: audio_afe_pd + - const: audio_afe_conn_pd + - const: audio_a1sys_pd + - const: audio_a2sys_pd + - const: audio_mrgif_pd + +required: + - compatible + - interrupts + - interrupt-names + - power-domains + - clocks + - clock-names + +additionalProperties: false + diff --git a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt deleted file mode 100644 index f548e6a58240..000000000000 --- a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt +++ /dev/null @@ -1,146 +0,0 @@ -Mediatek AFE PCM controller for mt2701 - -Required properties: -- compatible: should be one of the following. - - "mediatek,mt2701-audio" - - "mediatek,mt7622-audio" -- interrupts: should contain AFE and ASYS interrupts -- interrupt-names: should be "afe" and "asys" -- power-domains: should define the power domain -- clocks: Must contain an entry for each entry in clock-names - See ../clocks/clock-bindings.txt for details -- clock-names: should have these clock names: - "infra_sys_audio_clk", - "top_audio_mux1_sel", - "top_audio_mux2_sel", - "top_audio_a1sys_hp", - "top_audio_a2sys_hp", - "i2s0_src_sel", - "i2s1_src_sel", - "i2s2_src_sel", - "i2s3_src_sel", - "i2s0_src_div", - "i2s1_src_div", - "i2s2_src_div", - "i2s3_src_div", - "i2s0_mclk_en", - "i2s1_mclk_en", - "i2s2_mclk_en", - "i2s3_mclk_en", - "i2so0_hop_ck", - "i2so1_hop_ck", - "i2so2_hop_ck", - "i2so3_hop_ck", - "i2si0_hop_ck", - "i2si1_hop_ck", - "i2si2_hop_ck", - "i2si3_hop_ck", - "asrc0_out_ck", - "asrc1_out_ck", - "asrc2_out_ck", - "asrc3_out_ck", - "audio_afe_pd", - "audio_afe_conn_pd", - "audio_a1sys_pd", - "audio_a2sys_pd", - "audio_mrgif_pd"; -- assigned-clocks: list of input clocks and dividers for the audio system. - See ../clocks/clock-bindings.txt for details. -- assigned-clocks-parents: parent of input clocks of assigned clocks. -- assigned-clock-rates: list of clock frequencies of assigned clocks. - -Must be a subnode of MediaTek audsys device tree node. -See ../arm/mediatek/mediatek,audsys.txt for details about the parent node. - -Example: - - audsys: audio-subsystem@11220000 { - compatible = "mediatek,mt2701-audsys", "syscon"; - ... - - afe: audio-controller { - compatible = "mediatek,mt2701-audio"; - interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>, - <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>; - interrupt-names = "afe", "asys"; - power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>; - - clocks = <&infracfg CLK_INFRA_AUDIO>, - <&topckgen CLK_TOP_AUD_MUX1_SEL>, - <&topckgen CLK_TOP_AUD_MUX2_SEL>, - <&topckgen CLK_TOP_AUD_48K_TIMING>, - <&topckgen CLK_TOP_AUD_44K_TIMING>, - <&topckgen CLK_TOP_AUD_K1_SRC_SEL>, - <&topckgen CLK_TOP_AUD_K2_SRC_SEL>, - <&topckgen CLK_TOP_AUD_K3_SRC_SEL>, - <&topckgen CLK_TOP_AUD_K4_SRC_SEL>, - <&topckgen CLK_TOP_AUD_K1_SRC_DIV>, - <&topckgen CLK_TOP_AUD_K2_SRC_DIV>, - <&topckgen CLK_TOP_AUD_K3_SRC_DIV>, - <&topckgen CLK_TOP_AUD_K4_SRC_DIV>, - <&topckgen CLK_TOP_AUD_I2S1_MCLK>, - <&topckgen CLK_TOP_AUD_I2S2_MCLK>, - <&topckgen CLK_TOP_AUD_I2S3_MCLK>, - <&topckgen CLK_TOP_AUD_I2S4_MCLK>, - <&audsys CLK_AUD_I2SO1>, - <&audsys CLK_AUD_I2SO2>, - <&audsys CLK_AUD_I2SO3>, - <&audsys CLK_AUD_I2SO4>, - <&audsys CLK_AUD_I2SIN1>, - <&audsys CLK_AUD_I2SIN2>, - <&audsys CLK_AUD_I2SIN3>, - <&audsys CLK_AUD_I2SIN4>, - <&audsys CLK_AUD_ASRCO1>, - <&audsys CLK_AUD_ASRCO2>, - <&audsys CLK_AUD_ASRCO3>, - <&audsys CLK_AUD_ASRCO4>, - <&audsys CLK_AUD_AFE>, - <&audsys CLK_AUD_AFE_CONN>, - <&audsys CLK_AUD_A1SYS>, - <&audsys CLK_AUD_A2SYS>, - <&audsys CLK_AUD_AFE_MRGIF>; - - clock-names = "infra_sys_audio_clk", - "top_audio_mux1_sel", - "top_audio_mux2_sel", - "top_audio_a1sys_hp", - "top_audio_a2sys_hp", - "i2s0_src_sel", - "i2s1_src_sel", - "i2s2_src_sel", - "i2s3_src_sel", - "i2s0_src_div", - "i2s1_src_div", - "i2s2_src_div", - "i2s3_src_div", - "i2s0_mclk_en", - "i2s1_mclk_en", - "i2s2_mclk_en", - "i2s3_mclk_en", - "i2so0_hop_ck", - "i2so1_hop_ck", - "i2so2_hop_ck", - "i2so3_hop_ck", - "i2si0_hop_ck", - "i2si1_hop_ck", - "i2si2_hop_ck", - "i2si3_hop_ck", - "asrc0_out_ck", - "asrc1_out_ck", - "asrc2_out_ck", - "asrc3_out_ck", - "audio_afe_pd", - "audio_afe_conn_pd", - "audio_a1sys_pd", - "audio_a2sys_pd", - "audio_mrgif_pd"; - - assigned-clocks = <&topckgen CLK_TOP_AUD_MUX1_SEL>, - <&topckgen CLK_TOP_AUD_MUX2_SEL>, - <&topckgen CLK_TOP_AUD_MUX1_DIV>, - <&topckgen CLK_TOP_AUD_MUX2_DIV>; - assigned-clock-parents = <&topckgen CLK_TOP_AUD1PLL_98M>, - <&topckgen CLK_TOP_AUD2PLL_90M>; - assigned-clock-rates = <0>, <0>, <49152000>, <45158400>; - }; - }; -- 2.34.1

2 1