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

[PATCH 00/34] ASoC: Intel: boards: updates for 6.10 - part2
by Pierre-Louis Bossart 27 Mar '24

27 Mar '24

This second part provides SoundWire-related cleanups and extensions required by Realtek RT722 and Cirrus Logic codecs. Also included is a cleanup of the RT715-sdca DAI naming and new tables for ACPI-based board detections. Balamurugan C (1): ASoC: Intel: soc-acpi-intel-arl-match: Add rt711 sdca codec support Bard Liao (7): ASoC: Intel: sof_sdw: use generic rtd_init function for Realtek SDW DMICs ASoC: Intel: sof_sdw: remove unused rt dmic rtd_init ASoC: Intel: sof_sdw_rt722_sdca: set rtd_init in codec_info_list[] ASoC: Intel: sof_sdw_rt722_sdca: use rt_dmic_rtd_init ASoC: rt715-sdca: rename dai name with rt715-sdca prefix ASoC: Intel: sof_sdw: change rt715-sdca dai name ASoC: Intel: change cs35l56 name_prefix Charles Keepax (26): ASoC: intel: sof_sdw: Make find_codec_info_part() return a pointer ASoC: intel: sof_sdw: Make find_codec_info_acpi() return a pointer ASoC: intel: sof_sdw: Make find_codec_info_dai() return a pointer ASoC: intel: sof_sdw: Only pass codec_conf pointer around ASoC: intel: sof_sdw: Set channel map directly from endpoints ASoC: Intel: sof_sdw: Move get_codec_dai_by_name() into sof_sdw itself ASoC: Intel: sof_sdw: Move flags to private struct ASoC: Intel: sof_sdw: Only pass dai_link pointer around ASoC: Intel: sof_sdw: Use for_each_set_bit ASoC: Intel: sof_sdw: Factor out SSP DAI creation ASoC: Intel: sof_sdw: Factor out DMIC DAI creation. ASoC: Intel: sof_sdw: Factor out HDMI DAI creation ASoC: Intel: sof_sdw: Factor out BlueTooth DAI creation ASoC: Intel: sof_sdw: Factor out codec name generation ASoC: Intel: sof_sdw: Remove no longer supported quirk ASoC: intel: soc-acpi: Add missing cs42l43 endpoints ASoC: Intel: sof-sdw: Add new code for parsing the snd_soc_acpi structs ASoC: Intel: sof_sdw: Move counting and codec_conf to new parsing ASoC: Intel: sof_sdw: Move ignore_pch_dmic to new parsing ASoC: Intel: sof_sdw: Move append_dai_type to new parsing ASoC: Intel: sof_sdw: Move generation of DAI links to new parsing ASoC: intel: sof_sdw: Factor out SoundWire DAI creation ASoC: Intel: sof_sdw: Don't pass acpi_link_adr to init functions ASoC: Intel: sof_sdw: Remove redundant initialisations ASoC: Intel: sof_sdw: Add quirk for optional codec speakers ASoC: Intel: sof_sdw: Add support for cs42l43 optional speaker output sound/soc/codecs/rt715-sdca.c | 4 +- sound/soc/intel/boards/Kconfig | 1 - sound/soc/intel/boards/Makefile | 4 +- sound/soc/intel/boards/sof_board_helpers.c | 18 - sound/soc/intel/boards/sof_board_helpers.h | 3 - sound/soc/intel/boards/sof_sdw.c | 1118 ++++++++--------- sound/soc/intel/boards/sof_sdw_common.h | 42 +- sound/soc/intel/boards/sof_sdw_cs42l42.c | 1 - sound/soc/intel/boards/sof_sdw_cs42l43.c | 50 + sound/soc/intel/boards/sof_sdw_cs_amp.c | 1 - sound/soc/intel/boards/sof_sdw_maxim.c | 1 - sound/soc/intel/boards/sof_sdw_rt5682.c | 1 - sound/soc/intel/boards/sof_sdw_rt700.c | 1 - sound/soc/intel/boards/sof_sdw_rt711.c | 2 - sound/soc/intel/boards/sof_sdw_rt712_sdca.c | 25 - sound/soc/intel/boards/sof_sdw_rt715.c | 26 - sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 26 - sound/soc/intel/boards/sof_sdw_rt722_sdca.c | 38 +- sound/soc/intel/boards/sof_sdw_rt_amp.c | 1 - sound/soc/intel/boards/sof_sdw_rt_dmic.c | 54 + .../boards/sof_sdw_rt_sdca_jack_common.c | 4 +- sound/soc/intel/boards/sof_ssp_common.h | 7 - .../intel/common/soc-acpi-intel-arl-match.c | 24 + .../intel/common/soc-acpi-intel-mtl-match.c | 35 +- .../intel/common/soc-acpi-intel-tgl-match.c | 35 +- 25 files changed, 753 insertions(+), 769 deletions(-) delete mode 100644 sound/soc/intel/boards/sof_sdw_rt715.c delete mode 100644 sound/soc/intel/boards/sof_sdw_rt715_sdca.c create mode 100644 sound/soc/intel/boards/sof_sdw_rt_dmic.c -- 2.40.1

2 35

[PATCH 00/25] Introduce support of audio for Amlogic A1 SoC family
by Jan Dakinevich 27 Mar '24

27 Mar '24

This series includes the following: - new audio clock and reset controller data and adaptation for it of existing code (patches 0001..0004); - adaptation of existing audio components for A1 Soc (patches 0005..0021); - handy cosmetics for dai-link naming (patches 0022..0023); - integration of audio devices into common trees (patch 0024); - audio support bring up on Amlogic ad402 reference board (patch 0025). This patch is not actually checked on real hardware (because all ad402 that we had were burned out). This patch is based on ad402's schematics and on experience with our own hardware (which is very close to reference board); Dmitry Rokosov (2): ASoC: dt-bindings: meson: introduce link-name optional property ASoC: meson: implement link-name optional property in meson card utils Jan Dakinevich (23): clk: meson: a1: restrict an amount of 'hifi_pll' params clk: meson: axg: move reset controller's code to separate module dt-bindings: clock: meson: add A1 audio clock and reset controller bindings clk: meson: a1: add the audio clock controller driver ASoC: meson: codec-glue: add support for capture stream ASoC: meson: g12a-toacodec: fix "Lane Select" width ASoC: meson: g12a-toacodec: rework the definition of bits ASoC: dt-bindings: meson: g12a-toacodec: add support for A1 SoC family ASoC: meson: g12a-toacodec: add support for A1 SoC family ASoC: meson: t9015: prepare to adding new platforms ASoC: dt-bindings: meson: t9015: add support for A1 SoC family ASoC: meson: t9015: add support for A1 SoC family ASoC: dt-bindings: meson: axg-pdm: document 'sysrate' property ASoC: meson: axg-pdm: introduce 'sysrate' property pinctrl/meson: fix typo in PDM's pin name ASoC: dt-bindings: meson: meson-axg-audio-arb: claim support of A1 SoC family ASoC: dt-bindings: meson: axg-fifo: claim support of A1 SoC family ASoC: dt-bindings: meson: axg-pdm: claim support of A1 SoC family ASoC: dt-bindings: meson: axg-sound-card: claim support of A1 SoC family ASoC: dt-bindings: meson: axg-tdm-formatters: claim support of A1 SoC family ASoC: dt-bindings: meson: axg-tdm-iface: claim support of A1 SoC family arm64: dts: meson: a1: add audio devices arm64: dts: ad402: enable audio .../bindings/clock/amlogic,a1-audio-clkc.yaml | 83 +++ .../reset/amlogic,meson-axg-audio-arb.yaml | 10 +- .../bindings/sound/amlogic,axg-fifo.yaml | 8 + .../bindings/sound/amlogic,axg-pdm.yaml | 5 + .../sound/amlogic,axg-sound-card.yaml | 12 +- .../sound/amlogic,axg-tdm-formatters.yaml | 22 +- .../bindings/sound/amlogic,axg-tdm-iface.yaml | 6 +- .../bindings/sound/amlogic,g12a-toacodec.yaml | 1 + .../bindings/sound/amlogic,gx-sound-card.yaml | 6 + .../bindings/sound/amlogic,t9015.yaml | 4 +- .../arm64/boot/dts/amlogic/meson-a1-ad402.dts | 126 ++++ arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 471 +++++++++++++++ drivers/clk/meson/Kconfig | 18 + drivers/clk/meson/Makefile | 2 + drivers/clk/meson/a1-audio.c | 556 ++++++++++++++++++ drivers/clk/meson/a1-audio.h | 58 ++ drivers/clk/meson/a1-pll.c | 8 +- drivers/clk/meson/axg-audio.c | 95 +-- drivers/clk/meson/meson-audio-rstc.c | 109 ++++ drivers/clk/meson/meson-audio-rstc.h | 12 + drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +- .../dt-bindings/clock/amlogic,a1-audio-clkc.h | 122 ++++ .../reset/amlogic,meson-a1-audio-reset.h | 29 + .../dt-bindings/sound/meson-g12a-toacodec.h | 5 + sound/soc/meson/axg-pdm.c | 10 +- sound/soc/meson/g12a-toacodec.c | 298 ++++++++-- sound/soc/meson/meson-card-utils.c | 12 +- sound/soc/meson/meson-codec-glue.c | 174 ++++-- sound/soc/meson/meson-codec-glue.h | 23 + sound/soc/meson/t9015.c | 326 +++++++++- 30 files changed, 2394 insertions(+), 223 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/amlogic,a1-audio-clkc.yaml create mode 100644 drivers/clk/meson/a1-audio.c create mode 100644 drivers/clk/meson/a1-audio.h create mode 100644 drivers/clk/meson/meson-audio-rstc.c create mode 100644 drivers/clk/meson/meson-audio-rstc.h create mode 100644 include/dt-bindings/clock/amlogic,a1-audio-clkc.h create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h -- 2.34.1

8 84

[PATCH v2 0/4] ALSA: hda/tas2781: fixes for 6.9-rc1
by Gergo Koteles 27 Mar '24

27 Mar '24

Hi, This series removes the no longer needed digital gain kcontrol, which caused problems in tas2563, because the register does not exists there. This series also adds locking and debug statements to the other kcontrols. They sometimes ran in parallel with tasdev_fw_ready, and caused weird sound problems. https://github.com/tomsom/yoga-linux/issues/58 Regards, Gergo Changes in v2: - Do not remove dvc_tlv scale from tas2781-tlv.h as it is also used by sound/soc/codecs/tas2781-i2c.c - Add kcontrol name to debug statements - Add a new patch to remove a useless debug statement. [1]: https://lore.kernel.org/all/cover.1711401621.git.soyer@irl.hu/ Gergo Koteles (4): ALSA: hda/tas2781: remove digital gain kcontrol ALSA: hda/tas2781: add locks to kcontrols ALSA: hda/tas2781: add debug statements to kcontrols ALSA: hda/tas2781: remove useless dev_dbg from playback_hook sound/pci/hda/tas2781_hda_i2c.c | 118 +++++++++++++++++++++----------- 1 file changed, 77 insertions(+), 41 deletions(-) base-commit: 4cece764965020c22cff7665b18a012006359095 -- 2.44.0

2 5

How to add jack GPIOs to audio-graph-cards?
by John Watts 27 Mar '24

27 Mar '24

Hi there, audio-graph-card's device tree schema indicates it supports the following: - pa-gpios - hp-det-gpio - mic-det-gpio But only implements pa-gpios. audio-graph-card2 doesn't implement any of these but will still attempts to grab pa-gpios but never use it (possibly a bug?) When using audio graph cards, how are you intended to add detection GPIOs? Are there future plans to add a jacks { } section of some sort for this? John.

2 1

Writing documentation for simple device tree ASoC cards
by John Watts 27 Mar '24

27 Mar '24

Hello! I've spent way too much time digging through emails, documentation and kernel source code to form a mental model that lets me understand and use simple-sound-card, audio-graph-card and audio-graph-card2. There's really no introductory documentation geared towards people who are writing device trees intending to glue together multiple audio components in to a single sound card. I'm deciding I'll try and take up this task to provide some basic documentation for this. Before starting I would like to quickly go over some notes in case I'm actually just incredibly wrong. I'd rather find that out now than later. As a general ASoC refresher: - ALSA provides PCM interfaces and controls to a sound card - ASoC introduces the concept of components - Components are what you instantiate with the device tree - Components can be asked to set a clock or create a PCM stream - Components have one or more DAIs - DAIs represent capabilities of a stream - Components have DAPM widgets for power management - These can be related to physical pins on the board or DAI streams - CPU components are ones that ALSA can use directly to process data - Codec components provide information about DAIs or drive streams Most of this is already explained in the documentation. The generic sound cards you can create using simple-sound-card and audio-graph-card are machine drivers. Their jobs are to ensure that when using a DAI all the related components, clocking and power management is set up and ready for use. This is done by: - Linking multiple DAIs together - Connecting DAPM widgets together to power on components - Calculate and setting the shared clock (usually mclk) - Setting DAI properties (like TDM slots and width) - Adding widgets for jack detection DAI linking isn't explained in the documentation but was a core part of my confusion when trying to use these cards: I didn't understand if it represented some relationship between physical pins, PCM channels, etc. My fuzzy model of a DAI link is that it exists to group DAIs (and thus components) necessary to acheive a desired data flow, where that flow is left up to the components themselves to implement. There's a lot of examples for actually using the simple family of cards but I imagine documenting the above would help people troubleshoot or describe their problems better. Other minor notes: - sound-name-prefix is very useful and fits in somewhere here - audio-graph-cards don't support GPIO jacks from what I can see I also have noticed that with audio-graph-card you can't use a DAI multiple times in different cards. This makes sense but is this due to the way graphs and endpoints work or due to the underlying sound system? This problem and jacks seem to point towards maybe allowing specification of DAPM widgets in the device tree, and maybe kcontrols for selecting which codec to use? I'm not sure. It would also be useful to understand the scope of these simple cards. Complex audio needs like mine seem to be outside the scope at the moment and require writing a custom card driver. Perhaps it's worth taking that as an opportunity to write a driver using the simple card framework as an example? John.

1 0

[PATCH 0/3] ALSA: hda/tas2781: fixes for 6.9-rc1
by Gergo Koteles 27 Mar '24

27 Mar '24

Hi, This series removes the no longer needed digital gain kcontrol, which caused problems in tas2563, because the register does not exists there. This series also adds locking and debug statements to the other kcontrols. They sometimes ran in parallel with tasdev_fw_ready, and caused weird sound problems. https://github.com/tomsom/yoga-linux/issues/58 Regards, Gergo Gergo Koteles (3): ALSA: hda/tas2781: remove digital gain kcontrol ALSA: hda/tas2781: add locks to kcontrols ALSA: hda/tas2781: add debug statements to kcontrols include/sound/tas2781-tlv.h | 1 - sound/pci/hda/tas2781_hda_i2c.c | 103 +++++++++++++++++++++----------- 2 files changed, 68 insertions(+), 36 deletions(-) base-commit: 4cece764965020c22cff7665b18a012006359095 -- 2.44.0

5 9

[PATCH] ASoC: sti: uniperif: fix the undefined bitwise shift behavior problem
by Su Hui 27 Mar '24

27 Mar '24

Clang static checker(scan-build): sound/soc/sti/uniperif_player.c:1115:12: warning: The result of the left shift is undefined because the right operand is negative [core.UndefinedBinaryOperatorResult] When UNIPERIF_CONFIG_BACK_STALL_REQ_SHIFT(ip) equals to -1, the result of SET_UNIPERIF_CONFIG_BACK_STALL_REQ_DISABLE(ip) is undefined. Here are some results of using different compilers. 1UL >> -1 1UL << -1 gcc 10.2.1 0x2 0 gcc 11.4.0 0 0x8000000000000000 clang 14.0.0 0x64b8a45d72a0 0x64b8a45d72a0 clang 17.0.0 0x556c43b0f2a0 0x556c43b0f2a0 Add some macros to ensure that when right opreand is negative or other invalid values, the results of bitwise shift is zero. Fixes: e1ecace6a685 ("ASoC: sti: Add uniperipheral header file") Signed-off-by: Su Hui <suhui(a)nfschina.com> --- sound/soc/sti/uniperif.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sound/soc/sti/uniperif.h b/sound/soc/sti/uniperif.h index 2a5de328501c..1cbff01fbff0 100644 --- a/sound/soc/sti/uniperif.h +++ b/sound/soc/sti/uniperif.h @@ -12,17 +12,28 @@ #include <sound/dmaengine_pcm.h> +#define SR_SHIFT(a, b) ({unsigned long __a = (a); \ + unsigned int __b = (b); \ + __b < BITS_PER_LONG ? \ + __a >> __b : 0; }) + +#define SL_SHIFT(a, b) ({unsigned long __a = (a); \ + unsigned int __b = (b); \ + __b < BITS_PER_LONG ? \ + __a << __b : 0; }) + /* * Register access macros */ #define GET_UNIPERIF_REG(ip, offset, shift, mask) \ - ((readl_relaxed(ip->base + offset) >> shift) & mask) + (SR_SHIFT(readl_relaxed(ip->base + offset), shift) & mask) #define SET_UNIPERIF_REG(ip, offset, shift, mask, value) \ writel_relaxed(((readl_relaxed(ip->base + offset) & \ - ~(mask << shift)) | (((value) & mask) << shift)), ip->base + offset) + ~SL_SHIFT(mask, shift)) | SL_SHIFT(((value) & mask), shift)),\ + ip->base + offset) #define SET_UNIPERIF_BIT_REG(ip, offset, shift, mask, value) \ - writel_relaxed((((value) & mask) << shift), ip->base + offset) + writel_relaxed(SL_SHIFT(((value) & mask), shift), ip->base + offset) /* * UNIPERIF_SOFT_RST reg -- 2.30.2

2 3

[PATCH v4 0/7] Add support for the internal RK3308 audio codec
by Luca Ceresoli 26 Mar '24

26 Mar '24

This series adds a driver for the internal audio codec of the Rockchip RK3308 SoC, along with some related patches. This codec is internally connected to the I2S peripherals on the same chip, and it has some peculiarities arising from that interconnection. For proper bidirectional operation with the internal codec at any possible combination of sampling rates, the I2S peripheral needs two clock sources (tx and rx), while connection with an external codec commonly needs only one. Since v5.16 there is a driver for the I2S in sound/soc/rockchip/rockchip_i2s_tdm.c, but in some cases it does not configure correctly the clocks, resulting in an unnecessarily inaccurate rate. Patch 1 fixes this. Patches 2-4 add the codec driver along with the bindings and a new helper macro. Patches 5-7 add to the SoC DT file two I2S controllers (those which are internally connected to the internal codec) and the codec itself and enable the driver in the ARM64 defconfig. Luca Signed-off-by: Luca Ceresoli <luca.ceresoli(a)bootlin.com> --- Changes in v4: - several cleanups in the codec probe function - Link to v3: https://lore.kernel.org/r/20240221-rk3308-audio-codec-v3-0-dfa34abfcef6@boo… Changes in v3: - Add the I2S clock fix patch and remove a previous fix which is now superseded - Codec driver: fix silent playback until a given amplitude of sigital value, seen at >= 96 kHz rate - various other changes, listed per-patch - Link to v2: https://lore.kernel.org/r/20231219-rk3308-audio-codec-v2-0-c70d06021946@boo… Changes in v2: - largely rewrote the codec driver to use DAPM and lots of improvements and cleanups - removed the RK3308 audio card and related patches - various other changes, listed per-patch - Link to v1: https://lore.kernel.org/all/20220907142124.2532620-1-luca.ceresoli@bootlin.… --- Luca Ceresoli (7): ASoC: rockchip: i2s-tdm: Fix inaccurate sampling rates ASoC: dt-bindings: Add Rockchip RK3308 internal audio codec ASoC: core: add SOC_DOUBLE_RANGE_TLV() helper macro ASoC: codecs: Add RK3308 internal audio codec driver arm64: defconfig: enable Rockchip RK3308 internal audio codec driver arm64: dts: rockchip: add i2s_8ch_2 and i2s_8ch_3 arm64: dts: rockchip: add the internal audio codec .../bindings/sound/rockchip,rk3308-codec.yaml | 98 +++ MAINTAINERS | 7 + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 56 ++ arch/arm64/configs/defconfig | 1 + include/sound/soc.h | 12 + sound/soc/codecs/Kconfig | 11 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/rk3308_codec.c | 974 +++++++++++++++++++++ sound/soc/codecs/rk3308_codec.h | 579 ++++++++++++ sound/soc/rockchip/rockchip_i2s_tdm.c | 352 +------- 10 files changed, 1746 insertions(+), 346 deletions(-) --- base-commit: dfda120c512b3edca1436f770924e91b14f93a98 change-id: 20231219-rk3308-audio-codec-a5558ba8949d Best regards, -- Luca Ceresoli <luca.ceresoli(a)bootlin.com>

4 12

[RFC PATCH v2] ASoC: meson: g12a-toacodec: rework the definition of bits
by Jan Dakinevich 26 Mar '24

26 Mar '24

There is a lot of defines, but almost all of them are not used. Lets rework them: - keep separate the definition for different platforms to make easier checking that they match documentation. - use LSB/MSB sufixes for uniformity. - don't use hard-coded values for already declared defines. Signed-off-by: Jan Dakinevich <jan.dakinevich(a)salutedevices.com> --- Links: [1] https://lore.kernel.org/lkml/20240314232201.2102178-1-jan.dakinevich@salute… Changes v1 -> v2: - Detached from v1's series (patch 7). - Fixed my wrong understanding of SOC_SINGLE's input parameters. sound/soc/meson/g12a-toacodec.c | 79 ++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 30 deletions(-) diff --git a/sound/soc/meson/g12a-toacodec.c b/sound/soc/meson/g12a-toacodec.c index 531bb8707a3e..22181f4bab72 100644 --- a/sound/soc/meson/g12a-toacodec.c +++ b/sound/soc/meson/g12a-toacodec.c @@ -20,26 +20,37 @@ #define G12A_TOACODEC_DRV_NAME "g12a-toacodec" #define TOACODEC_CTRL0 0x0 -#define CTRL0_ENABLE_SHIFT 31 -#define CTRL0_DAT_SEL_SM1_MSB 19 -#define CTRL0_DAT_SEL_SM1_LSB 18 -#define CTRL0_DAT_SEL_MSB 15 -#define CTRL0_DAT_SEL_LSB 14 -#define CTRL0_LANE_SEL_SM1 16 -#define CTRL0_LANE_SEL 12 -#define CTRL0_LRCLK_SEL_SM1_MSB 14 -#define CTRL0_LRCLK_SEL_SM1_LSB 12 -#define CTRL0_LRCLK_SEL_MSB 9 -#define CTRL0_LRCLK_SEL_LSB 8 -#define CTRL0_LRCLK_INV_SM1 BIT(10) -#define CTRL0_BLK_CAP_INV_SM1 BIT(9) -#define CTRL0_BLK_CAP_INV BIT(7) -#define CTRL0_BCLK_O_INV_SM1 BIT(8) -#define CTRL0_BCLK_O_INV BIT(6) -#define CTRL0_BCLK_SEL_SM1_MSB 6 -#define CTRL0_BCLK_SEL_MSB 5 -#define CTRL0_BCLK_SEL_LSB 4 -#define CTRL0_MCLK_SEL GENMASK(2, 0) + +/* Common bits */ +#define CTRL0_ENABLE_SHIFT 31 +#define CTRL0_MCLK_SEL GENMASK(2, 0) + +/* G12A bits */ +#define CTRL0_DAT_SEL_G12A_MSB 15 +#define CTRL0_DAT_SEL_G12A_LSB 14 +#define CTRL0_LANE_SEL_G12A_MSB 13 +#define CTRL0_LANE_SEL_G12A_LSB 12 +#define CTRL0_LANE_SEL_G12A_MAX 3 +#define CTRL0_LRCLK_SEL_G12A_MSB 9 +#define CTRL0_LRCLK_SEL_G12A_LSB 8 +#define CTRL0_BLK_CAP_INV_G12A BIT(7) +#define CTRL0_BCLK_O_INV_G12A BIT(6) +#define CTRL0_BCLK_SEL_G12A_MSB 5 +#define CTRL0_BCLK_SEL_G12A_LSB 4 + +/* SM1 bits */ +#define CTRL0_DAT_SEL_SM1_MSB 19 +#define CTRL0_DAT_SEL_SM1_LSB 18 +#define CTRL0_LANE_SEL_SM1_MSB 17 +#define CTRL0_LANE_SEL_SM1_LSB 16 +#define CTRL0_LANE_SEL_SM1_MAX 3 +#define CTRL0_LRCLK_SEL_SM1_MSB 14 +#define CTRL0_LRCLK_SEL_SM1_LSB 12 +#define CTRL0_LRCLK_INV_SM1 BIT(10) +#define CTRL0_BLK_CAP_INV_SM1 BIT(9) +#define CTRL0_BCLK_O_INV_SM1 BIT(8) +#define CTRL0_BCLK_SEL_SM1_MSB 6 +#define CTRL0_BCLK_SEL_SM1_LSB 4 #define TOACODEC_OUT_CHMAX 2 @@ -108,7 +119,7 @@ static int g12a_toacodec_mux_put_enum(struct snd_kcontrol *kcontrol, } static SOC_ENUM_SINGLE_DECL(g12a_toacodec_mux_enum, TOACODEC_CTRL0, - CTRL0_DAT_SEL_LSB, + CTRL0_DAT_SEL_G12A_LSB, g12a_toacodec_mux_texts); static SOC_ENUM_SINGLE_DECL(sm1_toacodec_mux_enum, TOACODEC_CTRL0, @@ -210,7 +221,7 @@ static int g12a_toacodec_component_probe(struct snd_soc_component *c) { /* Initialize the static clock parameters */ return snd_soc_component_write(c, TOACODEC_CTRL0, - CTRL0_BLK_CAP_INV); + CTRL0_BLK_CAP_INV_G12A); } static int sm1_toacodec_component_probe(struct snd_soc_component *c) @@ -229,11 +240,13 @@ static const struct snd_soc_dapm_route g12a_toacodec_routes[] = { }; static const struct snd_kcontrol_new g12a_toacodec_controls[] = { - SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL, 3, 0), + SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL_G12A_LSB, + CTRL0_LANE_SEL_G12A_MAX, 0), }; static const struct snd_kcontrol_new sm1_toacodec_controls[] = { - SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL_SM1, 3, 0), + SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL_SM1_LSB, + CTRL0_LANE_SEL_SM1_MAX, 0), }; static const struct snd_soc_component_driver g12a_toacodec_component_drv = { @@ -266,16 +279,22 @@ static const struct regmap_config g12a_toacodec_regmap_cfg = { static const struct g12a_toacodec_match_data g12a_toacodec_match_data = { .component_drv = &g12a_toacodec_component_drv, - .field_dat_sel = REG_FIELD(TOACODEC_CTRL0, 14, 15), - .field_lrclk_sel = REG_FIELD(TOACODEC_CTRL0, 8, 9), - .field_bclk_sel = REG_FIELD(TOACODEC_CTRL0, 4, 5), + .field_dat_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_DAT_SEL_G12A_LSB, + CTRL0_DAT_SEL_G12A_MSB), + .field_lrclk_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_LRCLK_SEL_G12A_LSB, + CTRL0_LRCLK_SEL_G12A_MSB), + .field_bclk_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_BCLK_SEL_G12A_LSB, + CTRL0_BCLK_SEL_G12A_MSB), }; static const struct g12a_toacodec_match_data sm1_toacodec_match_data = { .component_drv = &sm1_toacodec_component_drv, - .field_dat_sel = REG_FIELD(TOACODEC_CTRL0, 18, 19), - .field_lrclk_sel = REG_FIELD(TOACODEC_CTRL0, 12, 14), - .field_bclk_sel = REG_FIELD(TOACODEC_CTRL0, 4, 6), + .field_dat_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_DAT_SEL_SM1_LSB, + CTRL0_DAT_SEL_SM1_MSB), + .field_lrclk_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_LRCLK_SEL_SM1_LSB, + CTRL0_LRCLK_SEL_SM1_MSB), + .field_bclk_sel = REG_FIELD(TOACODEC_CTRL0, CTRL0_BCLK_SEL_SM1_LSB, + CTRL0_BCLK_SEL_SM1_MSB), }; static const struct of_device_id g12a_toacodec_of_match[] = { -- 2.34.1

2 2

[PATCH 00/21] ASoC: Intel: boards: updates for 6.10 - part1
by Pierre-Louis Bossart 26 Mar '24

26 Mar '24

We have quite a few machine driver patches, spread in 3 series of about 20 patches each. This first part from Brent Lu adds common helpers and board configurations to reduce the number of quirks. Brent Lu (21): ASoC: Intel: board_helpers: support DAI link ID customization ASoC: Intel: sof_ssp_amp: use common module for DAI link generation ASoC: Intel: board_helpers: change dai link helpers to static function ASoC: Intel: sof_da7219: add rpl_mx98360_da7219 board config ASoC: Intel: sof_rt5682: support ALC5650 on RPL boards ASoC: Intel: sof_cs42l42: rename BT offload quirk ASoC: Intel: board_helpers: support sof_card_private initialization ASoC: Intel: sof_cs42l42: use common module for sof_card_private initialization ASoC: Intel: sof_nau8825: use common module for sof_card_private initialization ASoC: Intel: sof_rt5682: use common module for sof_card_private initialization ASoC: Intel: sof_ssp_amp: use common module for sof_card_private initialization ASoC: Intel: sof_da7219: use common module for DAI link generation ASoC: Intel: sof_da7219: add codec exit function ASoC: Intel: sof_da7219: add SOF_DA7219_MCLK_EN quirk ASoC: Intel: sof_da7219: board id cleanup for jsl boards ASoC: Intel: sof_da7219: board id cleanup for adl boards ASoC: Intel: sof_da7219: board id cleanup for rpl boards ASoC: Intel: sof_rt5682: remove unnecessary idisp HDMI quirk ASoC: Intel: sof_ssp_amp: remove unnecessary idisp HDMI quirk ASoC: Intel: sof_nau8825: remove sof_nau8825 board id ASoC: Intel: sof_rt5682: board id cleanup for cml boards sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/sof_board_helpers.c | 146 ++++--- sound/soc/intel/boards/sof_board_helpers.h | 97 ++++- sound/soc/intel/boards/sof_cs42l42.c | 72 +-- sound/soc/intel/boards/sof_da7219.c | 410 ++++++------------ sound/soc/intel/boards/sof_nau8825.c | 92 +--- sound/soc/intel/boards/sof_rt5682.c | 222 ++++------ sound/soc/intel/boards/sof_ssp_amp.c | 264 ++++------- .../intel/common/soc-acpi-intel-adl-match.c | 4 +- .../intel/common/soc-acpi-intel-cml-match.c | 6 +- .../intel/common/soc-acpi-intel-jsl-match.c | 4 +- .../intel/common/soc-acpi-intel-rpl-match.c | 12 + 12 files changed, 518 insertions(+), 812 deletions(-) -- 2.40.1

2 22