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

[ PATCH v2 0/3] Add Loongson I2S controller support
by YingKun Meng 13 Jun '23

13 Jun '23

Hi all, This patchset adds support for Loongson I2S controller, and introduce a ASoC machine driver for loongson platform. The Loongson I2S controller is available on Loongson 7a2000/2k2000 chips, works as a PCI device. It has two private DMA controllers used to playback and capture. Each DMA controller has one channel. The ASoC machine driver adds support for audio device which using loongson I2S controller to tranfser the audio data. The audio device uses "PRP0001" as its ACPI device ID, which provides a means to use the existing DT-compatible device identification in ACPI. Thanks. --- v2: * Use ACPI bindings to reference I2S and codec nodes. * Add 'required' restriction for sound-dai property in dt-bindings. * Fix build errors from lkp(a)intel.com. * Replace pci_xxx() APIs with pcim_xxx() APIs. * mirror changes in log printing. v1: * Add support for Loongson I2S controller. Yingkun Meng (3): ASoC: Add support for Loongson I2S controller ASoC: loongson: Add Loongson ASoC Sound Card Support ASoC: dt-bindings: Add support for Loongson audio card .../sound/loongson,ls-audio-card.yaml | 70 +++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/loongson/Kconfig | 26 + sound/soc/loongson/Makefile | 8 + sound/soc/loongson/loongson_card.c | 237 +++++++++ sound/soc/loongson/loongson_i2s.c | 213 ++++++++ sound/soc/loongson/loongson_i2s.h | 70 +++ sound/soc/loongson/loongson_i2s_pci.c | 500 ++++++++++++++++++ 9 files changed, 1126 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/loongson,ls-audio-card.yaml create mode 100644 sound/soc/loongson/Kconfig create mode 100644 sound/soc/loongson/Makefile create mode 100644 sound/soc/loongson/loongson_card.c create mode 100644 sound/soc/loongson/loongson_i2s.c create mode 100644 sound/soc/loongson/loongson_i2s.h create mode 100644 sound/soc/loongson/loongson_i2s_pci.c base-commit: 62a97bea5cce5317d6d7630f7bcf0cdf5333e269 -- 2.33.0

2 2

Alsa working, but spits out messages each time
by GitHub issues - opened 13 Jun '23

13 Jun '23

alsa-project/alsa-lib issue #327 was opened from melihbudak99: I am using Armbian system on Orange pi and I am printing my voice commands to the screen. When I used the same system and packages a few months ago on the Armbian system, I used to get these messages once, but now it prints these messages every time I speak; `ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.front ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.rear ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.center_lfe ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.side ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.surround21 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.surround21 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.surround40 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.surround41 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.surround50 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.surround51 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.surround71 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.iec958 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.iec958 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.iec958 ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.hdmi ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.hdmi ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.modem ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.modem ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.phoneline ALSA lib pcm.c:2642:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.phoneline` Issue URL : https://github.com/alsa-project/alsa-lib/issues/327 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH] regmap: maple: Don't sync read-only registers
by Takashi Iwai 13 Jun '23

13 Jun '23

regcache_maple_sync() tries to sync all cached values no matter whether it's writable or not. OTOH, regache_sync_val() does care the wrtability and returns -EIO for a read-only register. This results in an error message like: snd_hda_codec_realtek hdaudioC0D0: Unable to sync register 0x2f0009. -5 and the sync loop is aborted incompletely. This patch adds the writable register check in the loop for addressing the bug. Fixes: f033c26de5a5 ("regmap: Add maple tree based register cache") Link: https://lore.kernel.org/r/877cs7g6f1.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- drivers/base/regmap/regcache-maple.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/base/regmap/regcache-maple.c b/drivers/base/regmap/regcache-maple.c index c2e3a0f6c218..d2dad32dd399 100644 --- a/drivers/base/regmap/regcache-maple.c +++ b/drivers/base/regmap/regcache-maple.c @@ -203,6 +203,8 @@ static int regcache_maple_sync(struct regmap *map, unsigned int min, mas_for_each(&mas, entry, max) { for (r = max(mas.index, lmin); r <= min(mas.last, lmax); r++) { + if (!regmap_writeable(map, r)) + continue; mas_pause(&mas); rcu_read_unlock(); ret = regcache_sync_val(map, r, entry[r - mas.index]); -- 2.35.3

2 4

[PATCH V2 1/2] ASoC: dt-bindings: max98388: add amplifier driver
by “Ryan 13 Jun '23

13 Jun '23

From: Ryan Lee <ryans.lee(a)analog.com> Add dt-bindings information for Analog Devices MAX98388 I2S Amplifier Signed-off-by: Ryan Lee <ryans.lee(a)analog.com> --- Changes from v1: Removed unnecessary blank line and description. Modified quotes. .../bindings/sound/adi,max98388.yaml | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/adi,max98388.yaml diff --git a/Documentation/devicetree/bindings/sound/adi,max98388.yaml b/Documentation/devicetree/bindings/sound/adi,max98388.yaml new file mode 100644 index 000000000000..93ccd5905736 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/adi,max98388.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/adi,max98388.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices MAX98388 Speaker Amplifier + +maintainers: + - Ryan Lee <ryans.lee(a)analog.com> + +description: + The MAX98388 is a mono Class-D speaker amplifier with I/V feedback. + The device provides a PCM interface for audio data and a standard + I2C interface for control data communication. + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + enum: + - adi,max98388 + + reg: + maxItems: 1 + + '#sound-dai-cells': + const: 0 + + adi,vmon-slot-no: + description: slot number of the voltage feedback monitor + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 15 + default: 0 + + adi,imon-slot-no: + description: slot number of the current feedback monitor + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 15 + default: 1 + + adi,interleave-mode: + description: + For cases where a single combined channel for the I/V feedback data + is not sufficient, the device can also be configured to share + a single data output channel on alternating frames. + In this configuration, the current and voltage data will be frame + interleaved on a single output channel. + type: boolean + + reset-gpios: + maxItems: 1 + +required: + - compatible + - reg + - '#sound-dai-cells' + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + max98388: amplifier@39 { + compatible = "adi,max98388"; + reg = <0x39>; + #sound-dai-cells = <0>; + adi,vmon-slot-no = <0>; + adi,imon-slot-no = <1>; + adi,interleave-mode; + reset-gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + }; base-commit: 53ab6975c12d1ad86c599a8927e8c698b144d669 -- 2.34.1

3 4

[PATCH 00/36] ALSA: Add MIDI 2.0 support
by Takashi Iwai 13 Jun '23

13 Jun '23

Hi, this is a (largish) patch set for adding the support of MIDI 2.0 functionality, mainly targeted for USB devices. MIDI 2.0 is a complete overhaul of the 40-years old MIDI 1.0. Unlike MIDI 1.0 byte stream, MIDI 2.0 uses packets in 32bit words for Universal MIDI Packet (UMP) protocol. It supports both MIDI 1.0 commands for compatibility and the extended MIDI 2.0 commands for higher resolutions and more functions. For supporting the UMP, the patch set extends the existing ALSA rawmidi and sequencer interfaces, and adds the USB MIDI 2.0 support to the standard USB-audio driver. The rawmidi for UMP has a different device name (/dev/snd/umpC*D*) and it reads/writes UMP packet data in 32bit CPU-native endianness. For the old MIDI 1.0 applications, the legacy rawmidi interface is provided, too. As default, USB-audio driver will take the alternate setting for MIDI 2.0 interface, and the compatibility with MIDI 1.0 is provided via the rawmidi common layer. However, user may let the driver falling back to the old MIDI 1.0 interface by a module option, too. A UMP-capable rawmidi device can create the corresponding ALSA sequencer client(s) to support the UMP Endpoint and UMP Group connections. As a nature of ALSA sequencer, arbitrary connections between clients/ports are allowed, and the ALSA sequencer core performs the automatic conversions for the connections between a new UMP sequencer client and a legacy MIDI 1.0 sequencer client. It allows the existing application to use MIDI 2.0 devices without changes. The MIDI-CI, which is another major extension in MIDI 2.0, isn't covered by this patch set. It would be implemented rather in user-space. Roughly speaking, the first half of this patch set is for extending the rawmidi and USB-audio, and the second half is for extending the ALSA sequencer interface. The patch set is based on 6.4-rc2 kernel, but all patches can be cleanly applicable on 6.2 and 6.3 kernels, too (while 6.1 and older kernels would need minor adjustment for uapi header changes). The updates for alsa-lib and alsa-utils will follow shortly later. The author thanks members of MIDI Association OS/API Working Group, especially Andrew Mee, for great helps for the initial design and debugging / testing the drivers. Takashi --- Takashi Iwai (36): ALSA: rawmidi: Pass rawmidi directly to snd_rawmidi_kernel_open() ALSA: rawmidi: Add ioctl callback to snd_rawmidi_global_ops ALSA: rawmidi: UMP support ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE ALSA: ump: Additional proc output ALSA: usb-audio: Manage number of rawmidis globally ALSA: usb-audio: Define USB MIDI 2.0 specs ALSA: usb-audio: USB MIDI 2.0 UMP support ALSA: usb-audio: Get UMP EP name string from USB interface ALSA: usb-audio: Trim superfluous "MIDI" suffix from UMP EP name ALSA: usb-audio: Create UMP blocks from USB MIDI GTBs ALSA: ump: Redirect rawmidi substream access via own helpers ALSA: ump: Add legacy raw MIDI support ALSA: usb-audio: Enable the legacy raw MIDI support ALSA: usb-audio: Inform inconsistent protocols in GTBs ALSA: seq: Clear padded bytes at expanding events ALSA: seq: Add snd_seq_expand_var_event_at() helper ALSA: seq: Treat snd_seq_client object directly in client drivers ALSA: seq: Drop dead code for the old broadcast support ALSA: seq: Check the conflicting port at port creation ALSA: seq: Check validity before creating a port object ALSA: seq: Prohibit creating ports with special numbers ALSA: seq: Introduce SNDRV_SEQ_IOCTL_USER_PVERSION ioctl ALSA: seq: Add UMP support ALSA: seq: Add port inactive flag ALSA: seq: Support MIDI 2.0 UMP Endpoint port ALSA: seq: Add port direction to snd_seq_port_info ALSA: seq: Add UMP group number to snd_seq_port_info ALSA: seq: Automatic conversion of UMP events ALSA: seq: Allow suppressing UMP conversions ALSA: seq: Bind UMP device ALSA: seq: ump: Create UMP Endpoint port for broadcast ALSA: seq: Add ioctls for client UMP info query and setup ALSA: seq: Print UMP Endpoint and Block information in proc outputs ALSA: seq: Add UMP group filter ALSA: docs: Add MIDI 2.0 documentation Documentation/sound/designs/index.rst | 1 + Documentation/sound/designs/midi-2.0.rst | 342 ++++++ include/linux/usb/midi-v2.h | 94 ++ include/sound/asequencer.h | 4 + include/sound/rawmidi.h | 16 +- include/sound/seq_device.h | 1 + include/sound/seq_kernel.h | 10 + include/sound/ump.h | 175 ++++ include/sound/ump_msg.h | 540 ++++++++++ include/uapi/sound/asequencer.h | 83 +- include/uapi/sound/asound.h | 58 +- sound/core/Kconfig | 13 + sound/core/Makefile | 3 + sound/core/rawmidi.c | 233 +++-- sound/core/rawmidi_compat.c | 4 + sound/core/seq/Kconfig | 14 + sound/core/seq/Makefile | 3 + sound/core/seq/seq_clientmgr.c | 577 +++++++---- sound/core/seq/seq_clientmgr.h | 27 +- sound/core/seq/seq_compat.c | 3 + sound/core/seq/seq_dummy.c | 9 + sound/core/seq/seq_memory.c | 98 +- sound/core/seq/seq_memory.h | 19 +- sound/core/seq/seq_midi.c | 12 +- sound/core/seq/seq_ports.c | 46 +- sound/core/seq/seq_ports.h | 23 +- sound/core/seq/seq_ump_client.c | 464 +++++++++ sound/core/seq/seq_ump_convert.c | 1203 ++++++++++++++++++++++ sound/core/seq/seq_ump_convert.h | 22 + sound/core/seq/seq_virmidi.c | 1 + sound/core/ump.c | 677 ++++++++++++ sound/core/ump_convert.c | 520 ++++++++++ sound/core/ump_convert.h | 43 + sound/usb/Kconfig | 11 + sound/usb/Makefile | 1 + sound/usb/card.c | 12 +- sound/usb/midi.c | 7 +- sound/usb/midi.h | 5 +- sound/usb/midi2.c | 1189 +++++++++++++++++++++ sound/usb/midi2.h | 33 + sound/usb/quirks.c | 8 +- sound/usb/usbaudio.h | 2 + 42 files changed, 6274 insertions(+), 332 deletions(-) create mode 100644 Documentation/sound/designs/midi-2.0.rst create mode 100644 include/linux/usb/midi-v2.h create mode 100644 include/sound/ump.h create mode 100644 include/sound/ump_msg.h create mode 100644 sound/core/seq/seq_ump_client.c create mode 100644 sound/core/seq/seq_ump_convert.c create mode 100644 sound/core/seq/seq_ump_convert.h create mode 100644 sound/core/ump.c create mode 100644 sound/core/ump_convert.c create mode 100644 sound/core/ump_convert.h create mode 100644 sound/usb/midi2.c create mode 100644 sound/usb/midi2.h -- 2.35.3

4 85

[PATCH 0/9] ALSA: emu10k1: improvements related to the switchable word clock of E-MU cards
by Oswald Buddenhagen 13 Jun '23

13 Jun '23

Oswald Buddenhagen (9): ALSA: emu10k1: split off E-MU fallback clock from clock source ALSA: emu10k1: make available E-MU clock sources card-specific ALSA: emu10k1: query rate of external clock sources on E-MU cards ALSA: emu10k1: fix sample rates for E-MU cards at 44.1 kHz word clock ALSA: emu10k1: fix synthesizer pitch for E-MU cards at 44.1 kHz ALSA: timer: minimize open-coded access to hw.resolution ALSA: emu10k1: fix timer for E-MU cards at 44.1 kHz word clock ALSA: emu10k1: add support for 12 kHz capture on Audigy ALSA: emu10k1: actually show some S/PDIF status in /proc for E-MU cards include/sound/emu10k1.h | 11 +- include/sound/emux_synth.h | 2 +- sound/core/timer.c | 18 +- sound/pci/emu10k1/emu10k1_callback.c | 10 ++ sound/pci/emu10k1/emu10k1_main.c | 7 +- sound/pci/emu10k1/emu10k1_synth.c | 1 - sound/pci/emu10k1/emumixer.c | 242 ++++++++++++++++----------- sound/pci/emu10k1/emupcm.c | 125 +++++++------- sound/pci/emu10k1/emuproc.c | 51 +++--- sound/pci/emu10k1/io.c | 72 ++++++++ sound/pci/emu10k1/timer.c | 20 ++- sound/synth/emux/emux_synth.c | 3 +- 12 files changed, 374 insertions(+), 188 deletions(-) -- 2.40.0.152.g15d061e6df

2 10

[PATCH v5 4/4] ASoC: dt-bindings: Add tas2781 amplifier
by Shenghao Ding 13 Jun '23

13 Jun '23

Create tas2781.yaml for tas2781 driver. Signed-off-by: Shenghao Ding <13916275206(a)139.com> --- Changes in v5: - remove ti,broadcast-addr - remove address-cells - remove size-cells - put compatible item first in properties - change the maxItems of reg from 4 to 8 - remove white space around <> - correct the reg format to <0x38>, <0x3a> etc - remove '\t' in the file - correct a comment in the example --- .../devicetree/bindings/sound/ti,tas2781.yaml | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ti,tas2781.yaml diff --git a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml new file mode 100644 index 000000000000..61db14a39630 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml @@ -0,0 +1,73 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 - 2023 Texas Instruments Incorporated +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,tas2781.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments TAS2781 SmartAMP + +maintainers: + - Shenghao Ding <shenghao-ding(a)ti.com> + +description: + The TAS2781 is a mono, digital input Class-D audio amplifier + optimized for efficiently driving high peak power into small + loudspeakers. Integrated an on-chip DSP supports Texas Instruments + Smart Amp speaker protection algorithm. The integrated speaker + voltage and current sense provides for real time + monitoring of loudspeaker behavior. + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + enum: + - ti,tas2781 + + reg: + description: + I2C address, in multiple tas2781s case, all the i2c address + aggreate as one Audio Device to support multiple audio slots. + maxItems: 8 + items: + minimum: 0x38 + maximum: 0x3f + + reset-gpios: + maxItems: 1 + + interrupts: + maxItems: 1 + + '#sound-dai-cells': + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + /* example with quad tas2781s, such as tablet or pad device */ + #address-cells = <1>; + #size-cells = <0>; + quad: codec@38 { + compatible = "ti,tas2781"; + reg = <0x38>, /* Audio slot 0 */ + <0x3a>, /* Audio slot 1 */ + <0x39>, /* Audio slot 2 */ + <0x3b>; /* Audio slot 3 */ + + #sound-dai-cells = <1>; + reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + interrupt-parent = <&gpio1>; + interrupts = <15>; + }; + }; +... -- 2.34.1

3 3

Alsa without support to usb headphone
by GitHub issues - opened 12 Jun '23

12 Jun '23

alsa-project/alsa-lib issue #326 was opened from wellinton-capixaba: Hello. O recently built a media player (mplayer) with alsa support. However, telling mplayer to play multimedia files with alsa, specifying the usb headphone as the output device, didn't work. However, latter I built another mplayer, this time using the system provided Also. Then I redid the test, and it worked as I originally expected. The only difference I am aware between both also as is their version. The one I built it is the 1.0.17, while the system uses a 1.0.21. Can be this the cause of the problem. Or is something else? Issue URL : https://github.com/alsa-project/alsa-lib/issues/326 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH 00/12] ASoC: Intel: avs: remove redundant dapm routes
by Brent Lu 12 Jun '23

12 Jun '23

This patch series remove redundant dapm routes declared in multiple machine drivers. These routes will be created by snd_soc_dapm_connect_dai_link_widgets() during soundcard initialization. Following is the kernel log from a KBL chromebook nocturne. dmic: [ 13.773455] avs_dmic avs_dmic: connected DAI link dmic-codec:Capture -> dmic-platform:DMIC Rx [ 13.773460] avs_dmic avs_dmic: connected DAI link dmic-codec:Capture -> dmic-platform:DMIC WoV Rx max98373: [ 14.079536] avs_max98373 avs_max98373.1: connected DAI link avs_max98373.1-platform:ssp0 Tx -> i2c-MX98373:00:Right HiFi Playback [ 14.079545] avs_max98373 avs_max98373.1: connected DAI link i2c-MX98373:00:Right HiFi Capture -> avs_max98373.1-platform:ssp0 Rx [ 14.079550] avs_max98373 avs_max98373.1: connected DAI link avs_max98373.1-platform:ssp0 Tx -> i2c-MX98373:01:Left HiFi Playback [ 14.079554] avs_max98373 avs_max98373.1: connected DAI link i2c-MX98373:01:Left HiFi Capture -> avs_max98373.1-platform:ssp0 Rx hdaudio: [ 14.094818] avs_hdaudio avs_hdaudio.2: connected DAI link hdaudioB0D2-platform:hdaudioB0D2-cpu0 Tx -> hdaudioB0D2:HDMI 0 Playback [ 14.094824] avs_hdaudio avs_hdaudio.2: connected DAI link hdaudioB0D2-platform:hdaudioB0D2-cpu1 Tx -> hdaudioB0D2:HDMI 1 Playback [ 14.094828] avs_hdaudio avs_hdaudio.2: connected DAI link hdaudioB0D2-platform:hdaudioB0D2-cpu2 Tx -> hdaudioB0D2:HDMI 2 Playback Brent Lu (12): ASoC: Intel: avs-da7219: remove redundant dapm routes ASoC: Intel: avs-dmic: remove redundant dapm routes ASoC: Intel: avs-hdaudio: remove redundant dapm routes ASoC: Intel: avs-max98357a: remove redundant dapm routes ASoC: Intel: avs-max98373: remove redundant dapm routes ASoC: Intel: avs-max98927: remove redundant dapm routes ASoC: Intel: avs-nau8825: remove redundant dapm routes ASoC: Intel: avs-rt274: remove redundant dapm routes ASoC: Intel: avs-rt286: remove redundant dapm routes ASoC: Intel: avs-rt298: remove redundant dapm routes ASoC: Intel: avs-rt5682: remove redundant dapm routes ASoC: Intel: avs-ssm4567: remove redundant dapm routes sound/soc/intel/avs/boards/da7219.c | 45 ++---------------- sound/soc/intel/avs/boards/dmic.c | 2 - sound/soc/intel/avs/boards/hdaudio.c | 65 +------------------------- sound/soc/intel/avs/boards/max98357a.c | 39 ++-------------- sound/soc/intel/avs/boards/max98373.c | 45 ++---------------- sound/soc/intel/avs/boards/max98927.c | 45 ++---------------- sound/soc/intel/avs/boards/nau8825.c | 45 ++---------------- sound/soc/intel/avs/boards/rt274.c | 45 ++---------------- sound/soc/intel/avs/boards/rt286.c | 45 ++---------------- sound/soc/intel/avs/boards/rt298.c | 45 ++---------------- sound/soc/intel/avs/boards/rt5682.c | 45 ++---------------- sound/soc/intel/avs/boards/ssm4567.c | 57 ++-------------------- 12 files changed, 31 insertions(+), 492 deletions(-) -- 2.34.1

2 13

[PATCH] ASoC: audio-graph-card2-custom-sample.dtsi: remove DT warning
by Kuninori Morimoto 12 Jun '23

12 Jun '23

Current audio-graph-card2-custom-sample.dtsi is missing address-cells / size-cells / reg. Thus it get too many DT warnings. This patch solved it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- .../audio-graph-card2-custom-sample.dtsi | 151 ++++++++++++------ 1 file changed, 101 insertions(+), 50 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi index f5e7d669da45..2ac0de3c21da 100644 --- a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi +++ b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi @@ -172,83 +172,127 @@ &c2c_m >; multi { + #address-cells = <1>; + #size-cells = <0>; + ports@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; /* [Multi-CPU] */ - mcpu0: port@0 { mcpu0_ep: endpoint { remote-endpoint = <&mcodec0_ep>; }; }; - port@1 { mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; - port@2 { mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; + mcpu0: port@0 { reg = <0>; mcpu0_ep: endpoint { remote-endpoint = <&mcodec0_ep>; }; }; + port@1 { reg = <1>; mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; + port@2 { reg = <2>; mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; }; /* [Multi-Codec] */ ports@1 { - port@0 { mcodec0_ep: endpoint { remote-endpoint = <&mcpu0_ep>; }; }; - port@1 { mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; - port@2 { mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + port@0 { reg = <0>; mcodec0_ep: endpoint { remote-endpoint = <&mcpu0_ep>; }; }; + port@1 { reg = <1>; mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; + port@2 { reg = <2>; mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; }; /* [DPCM-Multi]::BE */ ports@2 { - port@0 { mbe_ep: endpoint { remote-endpoint = <&be10_ep>; }; }; - port@1 { mbe1_ep: endpoint { remote-endpoint = <&codec4_ep>; }; }; - port@2 { mbe2_ep: endpoint { remote-endpoint = <&codec5_ep>; }; }; + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + port@0 { reg = <0>; mbe_ep: endpoint { remote-endpoint = <&be10_ep>; }; }; + port@1 { reg = <1>; mbe1_ep: endpoint { remote-endpoint = <&codec4_ep>; }; }; + port@2 { reg = <2>; mbe2_ep: endpoint { remote-endpoint = <&codec5_ep>; }; }; }; /* [Codec2Codec-Multi]::CPU */ ports@3 { - port@0 { mc2c0_ep: endpoint { remote-endpoint = <&c2cmf_ep>; }; }; - port@1 { mc2c00_ep: endpoint { remote-endpoint = <&codec8_ep>; }; }; - port@2 { mc2c01_ep: endpoint { remote-endpoint = <&codec9_ep>; }; }; + reg = <3>; + #address-cells = <1>; + #size-cells = <0>; + port@0 { reg = <0>; mc2c0_ep: endpoint { remote-endpoint = <&c2cmf_ep>; }; }; + port@1 { reg = <1>; mc2c00_ep: endpoint { remote-endpoint = <&codec8_ep>; }; }; + port@2 { reg = <2>; mc2c01_ep: endpoint { remote-endpoint = <&codec9_ep>; }; }; }; /* [Codec2Codec-Multi]::Codec */ ports@4 { - port@0 { mc2c1_ep: endpoint { remote-endpoint = <&c2cmb_ep>; }; }; - port@1 { mc2c10_ep: endpoint { remote-endpoint = <&codec10_ep>; }; }; - port@2 { mc2c11_ep: endpoint { remote-endpoint = <&codec11_ep>; }; }; + reg = <4>; + #address-cells = <1>; + #size-cells = <0>; + port@0 { reg = <0>; mc2c1_ep: endpoint { remote-endpoint = <&c2cmb_ep>; }; }; + port@1 { reg = <1>; mc2c10_ep: endpoint { remote-endpoint = <&codec10_ep>; }; }; + port@2 { reg = <2>; mc2c11_ep: endpoint { remote-endpoint = <&codec11_ep>; }; }; }; /* [Semi-Multi] */ ports@5 { - port@0 { smcodec0_ep: endpoint { remote-endpoint = <&cpu7_ep>; }; }; - port@1 { smcodec1_ep: endpoint { remote-endpoint = <&codec12_ep>; }; }; - port@2 { smcodec2_ep: endpoint { remote-endpoint = <&codec13_ep>; }; }; + reg = <5>; + #address-cells = <1>; + #size-cells = <0>; + port@0 { reg = <0>; smcodec0_ep: endpoint { remote-endpoint = <&cpu7_ep>; }; }; + port@1 { reg = <1>; smcodec1_ep: endpoint { remote-endpoint = <&codec12_ep>; }; }; + port@2 { reg = <2>; smcodec2_ep: endpoint { remote-endpoint = <&codec13_ep>; }; }; }; }; dpcm { + #address-cells = <1>; + #size-cells = <0>; + ports@0 { + reg = <0>; + + #address-cells = <1>; + #size-cells = <0>; /* [DPCM]::FE */ - fe00: port@0 { fe00_ep: endpoint { remote-endpoint = <&cpu3_ep>; }; }; - fe01: port@1 { fe01_ep: endpoint { remote-endpoint = <&cpu4_ep>; }; }; + fe00: port@0 { reg = <0>; fe00_ep: endpoint { remote-endpoint = <&cpu3_ep>; }; }; + fe01: port@1 { reg = <1>; fe01_ep: endpoint { remote-endpoint = <&cpu4_ep>; }; }; /* [DPCM-Multi]::FE */ - fe10: port@2 { fe10_ep: endpoint { remote-endpoint = <&cpu5_ep>; }; }; - fe11: port@3 { fe11_ep: endpoint { remote-endpoint = <&cpu6_ep>; }; }; + fe10: port@2 { reg = <2>; fe10_ep: endpoint { remote-endpoint = <&cpu5_ep>; }; }; + fe11: port@3 { reg = <3>; fe11_ep: endpoint { remote-endpoint = <&cpu6_ep>; }; }; }; ports@1 { + reg = <1>; + + #address-cells = <1>; + #size-cells = <0>; /* [DPCM]::BE */ - be0: port@0 { be00_ep: endpoint { remote-endpoint = <&codec3_ep>; }; }; + be0: port@0 { reg = <0>; be00_ep: endpoint { remote-endpoint = <&codec3_ep>; }; }; /* [DPCM-Multi]::BE */ - be1: port@1 { be10_ep: endpoint { remote-endpoint = <&mbe_ep>; }; }; + be1: port@1 { reg = <1>; be10_ep: endpoint { remote-endpoint = <&mbe_ep>; }; }; }; }; codec2codec { + #address-cells = <1>; + #size-cells = <0>; /* [Codec2Codec] */ ports@0 { + reg = <0>; + + #address-cells = <1>; + #size-cells = <0>; + /* use default settings */ - c2c: port@0 { c2cf_ep: endpoint { remote-endpoint = <&codec6_ep>; }; }; - port@1 { c2cb_ep: endpoint { remote-endpoint = <&codec7_ep>; }; }; + c2c: port@0 { reg = <0>; c2cf_ep: endpoint { remote-endpoint = <&codec6_ep>; }; }; + port@1 { reg = <1>; c2cb_ep: endpoint { remote-endpoint = <&codec7_ep>; }; }; }; /* [Codec2Codec-Multi] */ ports@1 { + reg = <1>; + + #address-cells = <1>; + #size-cells = <0>; + /* use original settings */ rate = <48000>; - c2c_m: port@0 { c2cmf_ep: endpoint { remote-endpoint = <&mc2c0_ep>; }; }; - port@1 { c2cmb_ep: endpoint { remote-endpoint = <&mc2c1_ep>; }; }; + c2c_m: port@0 { reg = <0>; c2cmf_ep: endpoint { remote-endpoint = <&mc2c0_ep>; }; }; + port@1 { reg = <1>; c2cmb_ep: endpoint { remote-endpoint = <&mc2c1_ep>; }; }; }; }; }; @@ -264,25 +308,28 @@ test_cpu { */ compatible = "test-cpu"; ports { + #address-cells = <1>; + #size-cells = <0>; + bitclock-master; frame-master; /* [Normal] */ - cpu0: port@0 { cpu0_ep: endpoint { remote-endpoint = <&codec0_ep>; }; }; + cpu0: port@0 { reg = <0>; cpu0_ep: endpoint { remote-endpoint = <&codec0_ep>; }; }; /* [Multi-CPU] */ - port@1 { cpu1_ep: endpoint { remote-endpoint = <&mcpu1_ep>; }; }; - port@2 { cpu2_ep: endpoint { remote-endpoint = <&mcpu2_ep>; }; }; + port@1 { reg = <1>; cpu1_ep: endpoint { remote-endpoint = <&mcpu1_ep>; }; }; + port@2 { reg = <2>; cpu2_ep: endpoint { remote-endpoint = <&mcpu2_ep>; }; }; /* [DPCM]::FE */ - port@3 { cpu3_ep: endpoint { remote-endpoint = <&fe00_ep>; }; }; - port@4 { cpu4_ep: endpoint { remote-endpoint = <&fe01_ep>; }; }; + port@3 { reg = <3>; cpu3_ep: endpoint { remote-endpoint = <&fe00_ep>; }; }; + port@4 { reg = <4>; cpu4_ep: endpoint { remote-endpoint = <&fe01_ep>; }; }; /* [DPCM-Multi]::FE */ - port@5 { cpu5_ep: endpoint { remote-endpoint = <&fe10_ep>; }; }; - port@6 { cpu6_ep: endpoint { remote-endpoint = <&fe11_ep>; }; }; + port@5 { reg = <5>; cpu5_ep: endpoint { remote-endpoint = <&fe10_ep>; }; }; + port@6 { reg = <6>; cpu6_ep: endpoint { remote-endpoint = <&fe11_ep>; }; }; /* [Semi-Multi] */ - sm0: port@7 { cpu7_ep: endpoint { remote-endpoint = <&smcodec0_ep>; }; }; + sm0: port@7 { reg = <7>; cpu7_ep: endpoint { remote-endpoint = <&smcodec0_ep>; }; }; }; }; @@ -297,6 +344,9 @@ test_codec { */ compatible = "test-codec"; ports { + #address-cells = <1>; + #size-cells = <0>; + /* * prefix can be added to *component*, * see audio-graph-card2::routing @@ -304,39 +354,40 @@ ports { prefix = "TC"; /* [Normal] */ - port@0 { codec0_ep: endpoint { remote-endpoint = <&cpu0_ep>; }; }; + port@0 { reg = <0>; codec0_ep: endpoint { remote-endpoint = <&cpu0_ep>; }; }; /* [Multi-Codec] */ - port@1 { codec1_ep: endpoint { remote-endpoint = <&mcodec1_ep>; }; }; - port@2 { codec2_ep: endpoint { remote-endpoint = <&mcodec2_ep>; }; }; + port@1 { reg = <1>; codec1_ep: endpoint { remote-endpoint = <&mcodec1_ep>; }; }; + port@2 { reg = <2>; codec2_ep: endpoint { remote-endpoint = <&mcodec2_ep>; }; }; /* [DPCM]::BE */ port@3 { convert-rate = <44100>; - codec3_ep: endpoint { remote-endpoint = <&be00_ep>; }; + reg = <3>; codec3_ep: endpoint { remote-endpoint = <&be00_ep>; }; }; /* [DPCM-Multi]::BE */ - port@4 { codec4_ep: endpoint { remote-endpoint = <&mbe1_ep>; }; }; - port@5 { codec5_ep: endpoint { remote-endpoint = <&mbe2_ep>; }; }; + port@4 { reg = <4>; codec4_ep: endpoint { remote-endpoint = <&mbe1_ep>; }; }; + port@5 { reg = <5>; codec5_ep: endpoint { remote-endpoint = <&mbe2_ep>; }; }; /* [Codec2Codec] */ port@6 { bitclock-master; frame-master; - codec6_ep: endpoint { remote-endpoint = <&c2cf_ep>; }; }; - port@7 { codec7_ep: endpoint { remote-endpoint = <&c2cb_ep>; }; }; + reg = <6>; codec6_ep: endpoint { remote-endpoint = <&c2cf_ep>; }; }; + port@7 { reg = <7>; codec7_ep: endpoint { remote-endpoint = <&c2cb_ep>; }; }; /* [Codec2Codec-Multi] */ port@8 { bitclock-master; frame-master; - codec8_ep: endpoint { remote-endpoint = <&mc2c00_ep>; }; }; - port@9 { codec9_ep: endpoint { remote-endpoint = <&mc2c01_ep>; }; }; - port@10 { codec10_ep: endpoint { remote-endpoint = <&mc2c10_ep>; }; }; - port@11 { codec11_ep: endpoint { remote-endpoint = <&mc2c11_ep>; }; }; + reg = <8>; codec8_ep: endpoint { remote-endpoint = <&mc2c00_ep>; }; }; + port@9 { reg = <9>; codec9_ep: endpoint { remote-endpoint = <&mc2c01_ep>; }; }; + port@a { reg = <10>; codec10_ep: endpoint { remote-endpoint = <&mc2c10_ep>; }; }; + port@b { reg = <11>; codec11_ep: endpoint { remote-endpoint = <&mc2c11_ep>; }; }; /* [Semi-Multi] */ - port@12 { codec12_ep: endpoint { remote-endpoint = <&smcodec1_ep>; }; }; - port@13 { codec13_ep: endpoint { remote-endpoint = <&smcodec2_ep>; }; }; + port@c { reg = <12>; codec12_ep: endpoint { remote-endpoint = <&smcodec1_ep>; }; }; + port@d { reg = <13>; codec13_ep: endpoint { remote-endpoint = <&smcodec2_ep>; }; }; + }; }; }; -- 2.25.1

2 1