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

[PATCH 0/6] ASoC: rt-sdw: fix locking and improve error logs
by Pierre-Louis Bossart 29 Mar '24

29 Mar '24

Fix a set of problematic locking sequences and update error messages, tested on SOF/SoundWire platforms. Pierre-Louis Bossart (6): ASoC: rt5682-sdw: fix locking sequence ASoC: rt711-sdca: fix locking sequence ASoC: rt711-sdw: fix locking sequence ASoC: rt712-sdca-sdw: fix locking sequence ASoC: rt722-sdca-sdw: fix locking sequence ASoC: rt-sdw*: add __func__ to all error logs sound/soc/codecs/rt1316-sdw.c | 8 +++--- sound/soc/codecs/rt1318-sdw.c | 8 +++--- sound/soc/codecs/rt5682-sdw.c | 16 +++++------ sound/soc/codecs/rt700.c | 16 +++++------ sound/soc/codecs/rt711-sdca-sdw.c | 6 ++-- sound/soc/codecs/rt711-sdca.c | 18 ++++++------ sound/soc/codecs/rt711-sdw.c | 8 +++--- sound/soc/codecs/rt711.c | 16 +++++------ sound/soc/codecs/rt712-sdca-dmic.c | 24 +++++++++------- sound/soc/codecs/rt712-sdca-sdw.c | 7 +++-- sound/soc/codecs/rt712-sdca.c | 20 ++++++------- sound/soc/codecs/rt715-sdca-sdw.c | 2 +- sound/soc/codecs/rt715-sdca.c | 46 +++++++++++++++--------------- sound/soc/codecs/rt715-sdw.c | 4 +-- sound/soc/codecs/rt715.c | 24 ++++++++-------- sound/soc/codecs/rt722-sdca-sdw.c | 4 +-- sound/soc/codecs/rt722-sdca.c | 21 +++++++------- 17 files changed, 126 insertions(+), 122 deletions(-) -- 2.40.1

2 8

[PATCH v5 0/2] ASoC: nau8325: Modify driver code and dtschema.
by Seven Lee 29 Mar '24

29 Mar '24

Revise properties description and use standard units in dtschema. The unit conversion driver based on the attribute must also be changed accordingly. Change: V1 -> V2: - Revise the driver description part for the C++ comment. - In the nau8325_clkdet_put function, modify the max variable to hard code. - Removed "Clock Detection" switch control. - modify the "ALC Enable" switch name. - Revise the dtschema for "nuvoton,dac-vref". V2 -> V3: - Properties use standard unit suffixes. - Modify the enum definition. - Driver code should be used dev_dbg(). V3 -> V4: - Properties use standard unit suffixes. - Modify the enum definition. V4->V5: - Properties use standard unit suffixes for vref-impedance and dac-vref. - Revise the enum definition. - Modify the code related to properties usage in the NAU8325 codec driver. - Re-arrange header files in alphabetical order. Seven Lee (2): ASoC: dt-bindings: Added schema for "nuvoton,nau8325" ASoC: nau8325: new driver .../bindings/sound/nuvoton,nau8325.yaml | 80 ++ sound/soc/codecs/nau8325.c | 893 ++++++++++++++++++ sound/soc/codecs/nau8325.h | 391 ++++++++ 3 files changed, 1364 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8325.yaml create mode 100644 sound/soc/codecs/nau8325.c create mode 100644 sound/soc/codecs/nau8325.h -- 2.25.1

4 6

[PATCH 00/18] ASoC: drop driver owner assignment
by Krzysztof Kozlowski 29 Mar '24

29 Mar '24

Core for several drivers already sets the driver.owner, so driver does not need to. Simplify the drivers. Patches are independent, no dependencies. Best regards, Krzysztof --- Krzysztof Kozlowski (18): ASoC: loongson: i2s/pci: drop driver owner assignment ASoC: tlv320aic32x4-spi: drop driver owner assignment ASoC: tlv320aic3x-spi: drop driver owner assignment ASoC: max98373-sdw: drop driver owner assignment ASoC: rt1017-sdca-sdw: drop driver owner assignment ASoC: rt1308-sdw: drop driver owner assignment ASoC: rt1316-sdw: drop driver owner assignment ASoC: rt1318-sdw: drop driver owner assignment ASoC: rt5682-sdw: drop driver owner assignment ASoC: rt700-sdw: drop driver owner assignment ASoC: rt711-sdca-sdw: drop driver owner assignment ASoC: rt711-sdw: drop driver owner assignment ASoC: rt712-sdca-dmic: drop driver owner assignment ASoC: rt712-sdca-sdw: drop driver owner assignment ASoC: rt715-sdca-sdw: drop driver owner assignment ASoC: rt715-sdw: drop driver owner assignment ASoC: rt722-sdca-sdw: drop driver owner assignment ASoC: sdw-mockup: drop driver owner assignment sound/soc/codecs/max98373-sdw.c | 1 - sound/soc/codecs/rt1017-sdca-sdw.c | 1 - sound/soc/codecs/rt1308-sdw.c | 1 - sound/soc/codecs/rt1316-sdw.c | 1 - sound/soc/codecs/rt1318-sdw.c | 1 - sound/soc/codecs/rt5682-sdw.c | 1 - sound/soc/codecs/rt700-sdw.c | 1 - sound/soc/codecs/rt711-sdca-sdw.c | 1 - sound/soc/codecs/rt711-sdw.c | 1 - sound/soc/codecs/rt712-sdca-dmic.c | 1 - sound/soc/codecs/rt712-sdca-sdw.c | 1 - sound/soc/codecs/rt715-sdca-sdw.c | 1 - sound/soc/codecs/rt715-sdw.c | 1 - sound/soc/codecs/rt722-sdca-sdw.c | 1 - sound/soc/codecs/sdw-mockup.c | 1 - sound/soc/codecs/tlv320aic32x4-spi.c | 1 - sound/soc/codecs/tlv320aic3x-spi.c | 1 - sound/soc/loongson/loongson_i2s_pci.c | 1 - 18 files changed, 18 deletions(-) --- base-commit: 1cadb9c1269d4e90ec23f3dc3e5373ee405462d1 change-id: 20240327-module-owner-var-2744d140fcdf Best regards, -- Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>

3 20

[PATCH 00/18] ASoC: Intel: boards: updates for 6.10 - part3
by Pierre-Louis Bossart 29 Mar '24

29 Mar '24

This last part is the continuation of Brent Lu's cleanups. Multiple quirks have been removed to use "default" configurations and ACPI-based detection of codecs and selection of topology files. This cleanup has been done in multiple steps/phases since Fall 2023, thanks Brent for this contribution! Brent Lu (18): ASoC: Intel: ssp-common: relocate source file ASoC: Intel: ssp-common: relocate header file ASoC: Intel: ssp-common: naming convention change ASoC: Intel: ssp-common: module name change ASoC: Intel: ssp-common: delete module ASoC: Intel: ssp-common: get codec tplg suffix function ASoC: SOF: Intel: support tplg suffix detection ASoC: Intel: sof_nau8825: mach cleanup for adl boards ASoC: Intel: sof_nau8825: mach cleanup for rpl boards ASoC: Intel: sof_nau8825: add mtl_nau8825_def for mtl boards ASoC: Intel: sof_rt5682: mach cleanup for tgl boards ASoC: Intel: sof_rt5682: mach cleanup for adl boards ASoC: Intel: sof_rt5682: mach cleanup for rpl boards ASoC: Intel: sof_rt5682: mach cleanup for mtl boards ASoC: Intel: sof_cs42l42: board id cleanup for adl boards ASoC: Intel: sof_cs42l42: mach cleanup for adl boards ASoC: Intel: sof_cs42l42: add rpl_cs42l42_def for rpl boards ASoC: Intel: sof_cs42l42: add mtl_cs42l42_def for mtl boards .../sound/soc-acpi-intel-ssp-common.h | 22 ++- include/sound/soc-acpi.h | 12 ++ sound/soc/intel/boards/Kconfig | 13 +- sound/soc/intel/boards/Makefile | 3 - sound/soc/intel/boards/sof_board_helpers.c | 15 +- sound/soc/intel/boards/sof_board_helpers.h | 6 +- sound/soc/intel/boards/sof_cirrus_common.h | 2 +- sound/soc/intel/boards/sof_cs42l42.c | 17 +- sound/soc/intel/boards/sof_maxim_common.h | 2 +- sound/soc/intel/boards/sof_nau8825.c | 7 + sound/soc/intel/boards/sof_nuvoton_common.h | 2 +- sound/soc/intel/boards/sof_realtek_common.h | 2 +- sound/soc/intel/boards/sof_ssp_common.c | 122 -------------- sound/soc/intel/common/Makefile | 2 + .../intel/common/soc-acpi-intel-adl-match.c | 139 ++++----------- .../intel/common/soc-acpi-intel-mtl-match.c | 52 +++--- .../intel/common/soc-acpi-intel-rpl-match.c | 90 ++++------ .../intel/common/soc-acpi-intel-ssp-common.c | 159 ++++++++++++++++++ .../intel/common/soc-acpi-intel-tgl-match.c | 50 ++---- sound/soc/sof/intel/hda.c | 82 +++++++++ 20 files changed, 423 insertions(+), 376 deletions(-) rename sound/soc/intel/boards/sof_ssp_common.h => include/sound/soc-acpi-intel-ssp-common.h (66%) delete mode 100644 sound/soc/intel/boards/sof_ssp_common.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-ssp-common.c -- 2.40.1

2 19

[PATCH] ASoC: tas2781: mark dvc_tlv with __maybe_unused
by Gergo Koteles 29 Mar '24

29 Mar '24

Since we put dvc_tlv static variable to a header file it's copied to each module that includes the header. But not all of them are actually used it. Fix this W=1 build warning: include/sound/tas2781-tlv.h:18:35: warning: 'dvc_tlv' defined but not used [-Wunused-const-variable=] Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202403290354.v0StnRpc-lkp@intel.com/ Fixes: ae065d0ce9e3 ("ALSA: hda/tas2781: remove digital gain kcontrol") Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- include/sound/tas2781-tlv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/tas2781-tlv.h b/include/sound/tas2781-tlv.h index 4038dd421150..1dc59005d241 100644 --- a/include/sound/tas2781-tlv.h +++ b/include/sound/tas2781-tlv.h @@ -15,7 +15,7 @@ #ifndef __TAS2781_TLV_H__ #define __TAS2781_TLV_H__ -static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); +static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); #endif base-commit: 2d0401ee38d43ab0e4cdd02dfc9d402befb2b5c8 -- 2.44.0

2 1

[PATCH] dt-bindings: ti,pcm1681: Convert to dtschema
by Animesh Agarwal 29 Mar '24

29 Mar '24

Convert the Texas Instruments PCM1681 bindings to DT schema. Signed-off-by: Animesh Agarwal <animeshagarwal28(a)gmail.com> --- .../devicetree/bindings/sound/ti,pcm1681.txt | 15 -------- .../devicetree/bindings/sound/ti,pcm1681.yaml | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 15 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.yaml diff --git a/Documentation/devicetree/bindings/sound/ti,pcm1681.txt b/Documentation/devicetree/bindings/sound/ti,pcm1681.txt deleted file mode 100644 index 4df17185ab80..000000000000 --- a/Documentation/devicetree/bindings/sound/ti,pcm1681.txt +++ /dev/null @@ -1,15 +0,0 @@ -Texas Instruments PCM1681 8-channel PWM Processor - -Required properties: - - - compatible: Should contain "ti,pcm1681". - - reg: The i2c address. Should contain <0x4c>. - -Examples: - - i2c_bus { - pcm1681@4c { - compatible = "ti,pcm1681"; - reg = <0x4c>; - }; - }; diff --git a/Documentation/devicetree/bindings/sound/ti,pcm1681.yaml b/Documentation/devicetree/bindings/sound/ti,pcm1681.yaml new file mode 100644 index 000000000000..4093d0ff654d --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ti,pcm1681.yaml @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,pcm1681.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments PCM1681 8-channel PWM Processor + +maintainers: + - Animesh Agarwal <animeshagarwal28(a)gmail.com> + +properties: + compatible: + const: ti,pcm1681 + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + pcm1681@4c { + compatible = "ti,pcm1681"; + reg = <0x4c>; + }; + }; -- 2.44.0

2 2

[PATCH] ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
by Stephen Lee 29 Mar '24

29 Mar '24

In snd_soc_info_volsw(), mask is generated by figuring out the index of the most significant bit set in max and converting the index to a bitmask through bit shift 1. Unintended wraparound occurs when max is an integer value with msb bit set. Since the bit shift value 1 is treated as an integer type, the left shift operation will wraparound and set mask to 0 instead of all 1's. In order to fix this, we type cast 1 as `1ULL` to prevent the wraparound. Fixes: 7077148fb50a ("ASoC: core: Split ops out of soc-core.c") Signed-off-by: Stephen Lee <slee08177(a)gmail.com> --- This seems to show up in quite a few places in the alsa subsystem, should they be addressed altogether? --- sound/soc/soc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 2d25748ca706..b27e89ff6a16 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -263,7 +263,7 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, int max = mc->max; int min = mc->min; int sign_bit = mc->sign_bit; - unsigned int mask = (1 << fls(max)) - 1; + unsigned int mask = (1ULL << fls(max)) - 1; unsigned int invert = mc->invert; int val; int ret; -- 2.43.2

2 2

[PATCH 1/2] ASoC: amd: acp: fix for acp_init function error handling
by Vijendar Mukunda 28 Mar '24

28 Mar '24

If acp_init() fails, acp pci driver probe should return error. Add acp_init() function return value check logic. Fixes: e61b415515d3 ("ASoC: amd: acp: refactor the acp init and de-init sequence") Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/acp/acp-pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c index 8c8b1dcac628..c1d4140f0746 100644 --- a/sound/soc/amd/acp/acp-pci.c +++ b/sound/soc/amd/acp/acp-pci.c @@ -115,7 +115,10 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id goto unregister_dmic_dev; } - acp_init(chip); + ret = acp_init(chip); + if (ret) + return ret; + res = devm_kcalloc(&pci->dev, num_res, sizeof(struct resource), GFP_KERNEL); if (!res) { ret = -ENOMEM; -- 2.34.1

3 4

[PATCH] ASoC: hdac_hda: improve error logs
by Pierre-Louis Bossart 28 Mar '24

28 Mar '24

We have a couple of duplicate logs and missing information, add __func__ consistently and make sure useful error codes are logged. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/codecs/hdac_hda.c | 44 ++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c index 6aa3223985be..29c88de5508b 100644 --- a/sound/soc/codecs/hdac_hda.c +++ b/sound/soc/codecs/hdac_hda.c @@ -230,7 +230,8 @@ static int hdac_hda_dai_hw_params(struct snd_pcm_substream *substream, format_val = snd_hdac_stream_format(params_channels(params), bits, params_rate(params)); if (!format_val) { dev_err(dai->dev, - "invalid format_val, rate=%d, ch=%d, format=%d, maxbps=%d\n", + "%s: invalid format_val, rate=%d, ch=%d, format=%d, maxbps=%d\n", + __func__, params_rate(params), params_channels(params), params_format(params), maxbps); @@ -266,14 +267,12 @@ static int hdac_hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_component *component = dai->component; struct hda_pcm_stream *hda_stream; struct hdac_hda_priv *hda_pvt; - struct hdac_device *hdev; unsigned int format_val; struct hda_pcm *pcm; unsigned int stream; int ret = 0; hda_pvt = snd_soc_component_get_drvdata(component); - hdev = &hda_pvt->codec->core; pcm = snd_soc_find_pcm_from_dai(hda_pvt, dai); if (!pcm) return -EINVAL; @@ -286,7 +285,7 @@ static int hdac_hda_dai_prepare(struct snd_pcm_substream *substream, ret = snd_hda_codec_prepare(hda_pvt->codec, hda_stream, stream, format_val, substream); if (ret < 0) - dev_err(&hdev->dev, "codec prepare failed %d\n", ret); + dev_err(dai->dev, "%s: failed %d\n", __func__, ret); return ret; } @@ -298,6 +297,7 @@ static int hdac_hda_dai_open(struct snd_pcm_substream *substream, struct hdac_hda_priv *hda_pvt; struct hda_pcm_stream *hda_stream; struct hda_pcm *pcm; + int ret; hda_pvt = snd_soc_component_get_drvdata(component); pcm = snd_soc_find_pcm_from_dai(hda_pvt, dai); @@ -308,7 +308,11 @@ static int hdac_hda_dai_open(struct snd_pcm_substream *substream, hda_stream = &pcm->stream[substream->stream]; - return hda_stream->ops.open(hda_stream, hda_pvt->codec, substream); + ret = hda_stream->ops.open(hda_stream, hda_pvt->codec, substream); + if (ret < 0) + dev_err(dai->dev, "%s: failed %d\n", __func__, ret); + + return ret; } static void hdac_hda_dai_close(struct snd_pcm_substream *substream, @@ -367,7 +371,7 @@ static struct hda_pcm *snd_soc_find_pcm_from_dai(struct hdac_hda_priv *hda_pvt, pcm_name = "HDMI 3"; break; default: - dev_err(&hcodec->core.dev, "invalid dai id %d\n", dai->id); + dev_err(dai->dev, "%s: invalid dai id %d\n", __func__, dai->id); return NULL; } @@ -381,7 +385,7 @@ static struct hda_pcm *snd_soc_find_pcm_from_dai(struct hdac_hda_priv *hda_pvt, } } - dev_err(&hcodec->core.dev, "didn't find PCM for DAI %s\n", dai->name); + dev_err(dai->dev, "%s: didn't find PCM for DAI %s\n", __func__, dai->name); return NULL; } @@ -411,7 +415,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); if (!hlink) { - dev_err(&hdev->dev, "hdac link not found\n"); + dev_err(&hdev->dev, "%s: hdac link not found\n", __func__); return -EIO; } @@ -429,7 +433,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ret = snd_hda_codec_device_new(hcodec->bus, component->card->snd_card, hdev->addr, hcodec, true); if (ret < 0) { - dev_err(&hdev->dev, "failed to create hda codec %d\n", ret); + dev_err(&hdev->dev, "%s: failed to create hda codec %d\n", __func__, ret); goto error_no_pm; } @@ -446,7 +450,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) if (fw) { ret = snd_hda_load_patch(hcodec->bus, fw->size, fw->data); if (ret < 0) { - dev_err(&hdev->dev, "failed to load hda patch %d\n", ret); + dev_err(&hdev->dev, "%s: failed to load hda patch %d\n", __func__, ret); goto error_no_pm; } release_firmware(fw); @@ -470,13 +474,13 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ret = snd_hda_codec_set_name(hcodec, hcodec->preset->name); if (ret < 0) { - dev_err(&hdev->dev, "name failed %s\n", hcodec->preset->name); + dev_err(&hdev->dev, "%s: name failed %s\n", __func__, hcodec->preset->name); goto error_pm; } ret = snd_hdac_regmap_init(&hcodec->core); if (ret < 0) { - dev_err(&hdev->dev, "regmap init failed\n"); + dev_err(&hdev->dev, "%s: regmap init failed\n", __func__); goto error_pm; } @@ -484,16 +488,16 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) if (patch) { ret = patch(hcodec); if (ret < 0) { - dev_err(&hdev->dev, "patch failed %d\n", ret); + dev_err(&hdev->dev, "%s: patch failed %d\n", __func__, ret); goto error_regmap; } } else { - dev_dbg(&hdev->dev, "no patch file found\n"); + dev_dbg(&hdev->dev, "%s: no patch file found\n", __func__); } ret = snd_hda_codec_parse_pcms(hcodec); if (ret < 0) { - dev_err(&hdev->dev, "unable to map pcms to dai %d\n", ret); + dev_err(&hdev->dev, "%s: unable to map pcms to dai %d\n", __func__, ret); goto error_patch; } @@ -501,8 +505,8 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) if (!is_hdmi_codec(hcodec)) { ret = snd_hda_codec_build_controls(hcodec); if (ret < 0) { - dev_err(&hdev->dev, "unable to create controls %d\n", - ret); + dev_err(&hdev->dev, "%s: unable to create controls %d\n", + __func__, ret); goto error_patch; } } @@ -548,7 +552,7 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component) hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); if (!hlink) { - dev_err(&hdev->dev, "hdac link not found\n"); + dev_err(&hdev->dev, "%s: hdac link not found\n", __func__); return; } @@ -624,7 +628,7 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev) /* hold the ref while we probe */ hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); if (!hlink) { - dev_err(&hdev->dev, "hdac link not found\n"); + dev_err(&hdev->dev, "%s: hdac link not found\n", __func__); return -EIO; } snd_hdac_ext_bus_link_get(hdev->bus, hlink); @@ -640,7 +644,7 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev) ARRAY_SIZE(hdac_hda_dais)); if (ret < 0) { - dev_err(&hdev->dev, "failed to register HDA codec %d\n", ret); + dev_err(&hdev->dev, "%s: failed to register HDA codec %d\n", __func__, ret); return ret; } -- 2.40.1

2 2

[tiwai-sound:for-linus 12/17] include/sound/tas2781-tlv.h:18:35: warning: 'dvc_tlv' defined but not used
by kernel test robot 28 Mar '24

28 Mar '24

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus head: 2d0401ee38d43ab0e4cdd02dfc9d402befb2b5c8 commit: ae065d0ce9e36ca4efdfb9b96ce3395bd1c19372 [12/17] ALSA: hda/tas2781: remove digital gain kcontrol config: i386-allmodconfig (https://download.01.org/0day-ci/archive/20240329/202403290354.v0StnRpc-lkp@…) compiler: gcc-12 (Ubuntu 12.3.0-9ubuntu2) 12.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240329/202403290354.v0StnRpc-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202403290354.v0StnRpc-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from include/sound/tlv.h:10, from sound/pci/hda/tas2781_hda_i2c.c:22: >> include/sound/tas2781-tlv.h:18:35: warning: 'dvc_tlv' defined but not used [-Wunused-const-variable=] 18 | static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); | ^~~~~~~ include/uapi/sound/tlv.h:53:22: note: in definition of macro 'SNDRV_CTL_TLVD_DECLARE_DB_SCALE' 53 | unsigned int name[] = { \ | ^~~~ include/sound/tas2781-tlv.h:18:14: note: in expansion of macro 'DECLARE_TLV_DB_SCALE' 18 | static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); | ^~~~~~~~~~~~~~~~~~~~ vim +/dvc_tlv +18 include/sound/tas2781-tlv.h 678f38eba1f2fe Shenghao Ding 2023-06-18 17 678f38eba1f2fe Shenghao Ding 2023-06-18 @18 static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); 678f38eba1f2fe Shenghao Ding 2023-06-18 19 static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); 678f38eba1f2fe Shenghao Ding 2023-06-18 20 :::::: The code at line 18 was first introduced by commit :::::: 678f38eba1f2fe33ff700e85390ac98393e609ef ASoC: tas2781: Add Header file for tas2781 driver :::::: TO: Shenghao Ding <13916275206(a)139.com> :::::: CC: Mark Brown <broonie(a)kernel.org> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH] soundwire: qcom: Convert to platform remove callback returning void
by Uwe Kleine-König 28 Mar '24

28 Mar '24

The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- drivers/soundwire/qcom.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 3c4d6debab1f..fb70afe64fcc 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1636,14 +1636,12 @@ static int qcom_swrm_probe(struct platform_device *pdev) return ret; } -static int qcom_swrm_remove(struct platform_device *pdev) +static void qcom_swrm_remove(struct platform_device *pdev) { struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(&pdev->dev); sdw_bus_master_delete(&ctrl->bus); clk_disable_unprepare(ctrl->hclk); - - return 0; } static int __maybe_unused swrm_runtime_resume(struct device *dev) @@ -1769,7 +1767,7 @@ MODULE_DEVICE_TABLE(of, qcom_swrm_of_match); static struct platform_driver qcom_swrm_driver = { .probe = &qcom_swrm_probe, - .remove = &qcom_swrm_remove, + .remove_new = qcom_swrm_remove, .driver = { .name = "qcom-soundwire", .of_match_table = qcom_swrm_of_match, base-commit: 11afac187274a6177a7ac82997f8691c0f469e41 -- 2.43.0

2 1

[PATCH 0/7] Soundwire: clean up sysfs group creation
by Greg Kroah-Hartman 28 Mar '24

28 Mar '24

Note, this is a redone version of a very old series I wrote back in 2022: https://lore.kernel.org/r/20220824135951.3604059-1-gregkh@linuxfoundation.o… but everyone has forgotten about it now, and I've reworked it, so I'm considering it a "new" version, and not v2. Here's a series that adds the functionality to the driver core to hide entire attribute groups, in a much saner way than we have attempted in the past (i.e. dynamically figuring it out.) Many thanks to Dan for this patch. I'll also be taking this into my driver-core branch and creating a stable tag for anyone else to pull from to get it into their trees, as I think it will want to be in many for this development cycle. After the driver core change, there's cleanups to the soundwire core for how the attribute groups are created, to remove the "manual" creation of them, and allow the driver core to create them correctly, as needed, when needed, which makes things much smaller for the soundwire code to manage. Comments appreciated! thanks, greg k-h Dan Williams (1): sysfs: Introduce a mechanism to hide static attribute_groups Greg Kroah-Hartman (5): soundwire: sysfs: move sdw_slave_dev_attr_group into the existing list of groups soundwire: sysfs: cleanup the logic for creating the dp0 sysfs attributes soundwire: sysfs: have the driver core handle the creation of the device groups soundwire: sysfs: remove sdw_slave_sysfs_init() soundwire: sysfs: remove unneeded ATTRIBUTE_GROUPS() comments drivers/soundwire/bus_type.c | 5 ++- drivers/soundwire/sysfs_local.h | 4 +- drivers/soundwire/sysfs_slave.c | 64 ++++++++++++++--------------- drivers/soundwire/sysfs_slave_dpn.c | 3 ++ fs/sysfs/group.c | 45 ++++++++++++++++---- include/linux/sysfs.h | 63 ++++++++++++++++++++++------ 6 files changed, 126 insertions(+), 58 deletions(-) -- 2.43.0

5 22

[PATCH 1/2] soundwire: amd: use inline function for register update
by Vijendar Mukunda 28 Mar '24

28 Mar '24

Define common inline function for register update. Use this inline function for updating SoundWire Pad registers and enable/disable SoundWire interrupt control registers. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- drivers/soundwire/amd_init.c | 36 +++++++++++++++------------------ drivers/soundwire/amd_init.h | 8 ++++++++ drivers/soundwire/amd_manager.c | 13 ++++++------ 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c index e45dc8261ab1..4cd26f3a21f5 100644 --- a/drivers/soundwire/amd_init.c +++ b/drivers/soundwire/amd_init.c @@ -17,42 +17,38 @@ #define ACP_PAD_PULLDOWN_CTRL 0x0001448 #define ACP_SW_PAD_KEEPER_EN 0x0001454 -#define AMD_SDW_PAD_PULLDOWN_CTRL_ENABLE_MASK 0x7f9a -#define AMD_SDW0_PAD_PULLDOWN_CTRL_ENABLE_MASK 0x7f9f -#define AMD_SDW1_PAD_PULLDOWN_CTRL_ENABLE_MASK 0x7ffa -#define AMD_SDW0_PAD_EN_MASK 1 -#define AMD_SDW1_PAD_EN_MASK 0x10 -#define AMD_SDW_PAD_EN_MASK (AMD_SDW0_PAD_EN_MASK | AMD_SDW1_PAD_EN_MASK) +#define AMD_SDW0_PAD_CTRL_MASK 0x60 +#define AMD_SDW1_PAD_CTRL_MASK 5 +#define AMD_SDW_PAD_CTRL_MASK (AMD_SDW0_PAD_CTRL_MASK | AMD_SDW1_PAD_CTRL_MASK) +#define AMD_SDW0_PAD_EN 1 +#define AMD_SDW1_PAD_EN 0x10 +#define AMD_SDW_PAD_EN (AMD_SDW0_PAD_EN | AMD_SDW1_PAD_EN) static int amd_enable_sdw_pads(void __iomem *mmio, u32 link_mask, struct device *dev) { - u32 val; - u32 pad_keeper_en_mask, pad_pulldown_ctrl_mask; + u32 pad_keeper_en, pad_pulldown_ctrl_mask; switch (link_mask) { case 1: - pad_keeper_en_mask = AMD_SDW0_PAD_EN_MASK; - pad_pulldown_ctrl_mask = AMD_SDW0_PAD_PULLDOWN_CTRL_ENABLE_MASK; + pad_keeper_en = AMD_SDW0_PAD_EN; + pad_pulldown_ctrl_mask = AMD_SDW0_PAD_CTRL_MASK; break; case 2: - pad_keeper_en_mask = AMD_SDW1_PAD_EN_MASK; - pad_pulldown_ctrl_mask = AMD_SDW1_PAD_PULLDOWN_CTRL_ENABLE_MASK; + pad_keeper_en = AMD_SDW1_PAD_EN; + pad_pulldown_ctrl_mask = AMD_SDW1_PAD_CTRL_MASK; break; case 3: - pad_keeper_en_mask = AMD_SDW_PAD_EN_MASK; - pad_pulldown_ctrl_mask = AMD_SDW_PAD_PULLDOWN_CTRL_ENABLE_MASK; + pad_keeper_en = AMD_SDW_PAD_EN; + pad_pulldown_ctrl_mask = AMD_SDW_PAD_CTRL_MASK; break; default: dev_err(dev, "No SDW Links are enabled\n"); return -ENODEV; } - val = readl(mmio + ACP_SW_PAD_KEEPER_EN); - val |= pad_keeper_en_mask; - writel(val, mmio + ACP_SW_PAD_KEEPER_EN); - val = readl(mmio + ACP_PAD_PULLDOWN_CTRL); - val &= pad_pulldown_ctrl_mask; - writel(val, mmio + ACP_PAD_PULLDOWN_CTRL); + amd_updatel(mmio, ACP_SW_PAD_KEEPER_EN, pad_keeper_en, pad_keeper_en); + amd_updatel(mmio, ACP_PAD_PULLDOWN_CTRL, pad_pulldown_ctrl_mask, 0); + return 0; } diff --git a/drivers/soundwire/amd_init.h b/drivers/soundwire/amd_init.h index 928b0c707162..5e7b43836a37 100644 --- a/drivers/soundwire/amd_init.h +++ b/drivers/soundwire/amd_init.h @@ -10,4 +10,12 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager); +static inline void amd_updatel(void __iomem *mmio, int offset, u32 mask, u32 val) +{ + u32 tmp; + + tmp = readl(mmio + offset); + tmp = (tmp & ~mask) | val; + writel(tmp, mmio + offset); +} #endif diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 7cd24bd8e224..1066d87aa011 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -89,9 +89,8 @@ static void amd_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager) u32 val; mutex_lock(amd_manager->acp_sdw_lock); - val = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(amd_manager->instance)); - val |= sdw_manager_reg_mask_array[amd_manager->instance]; - writel(val, amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(amd_manager->instance)); + val = sdw_manager_reg_mask_array[amd_manager->instance]; + amd_updatel(amd_manager->acp_mmio, ACP_EXTERNAL_INTR_CNTL(amd_manager->instance), val, val); mutex_unlock(amd_manager->acp_sdw_lock); writel(AMD_SDW_IRQ_MASK_0TO7, amd_manager->mmio + @@ -103,12 +102,12 @@ static void amd_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager) static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager) { - u32 val; + u32 irq_mask; mutex_lock(amd_manager->acp_sdw_lock); - val = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(amd_manager->instance)); - val &= ~sdw_manager_reg_mask_array[amd_manager->instance]; - writel(val, amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(amd_manager->instance)); + irq_mask = sdw_manager_reg_mask_array[amd_manager->instance]; + amd_updatel(amd_manager->acp_mmio, ACP_EXTERNAL_INTR_CNTL(amd_manager->instance), + irq_mask, 0); mutex_unlock(amd_manager->acp_sdw_lock); writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7); -- 2.34.1

2 3

[PATCH] ALSA: hda: cs35l56: Add ACPI device match tables
by Simon Trimmer 28 Mar '24

28 Mar '24

Adding the ACPI HIDs to the match table triggers the cs35l56-hda modules to be loaded on boot so that Serial Multi Instantiate can add the devices to the bus and begin the driver init sequence. Signed-off-by: Simon Trimmer <simont(a)opensource.cirrus.com> Fixes: 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier") --- sound/pci/hda/cs35l56_hda_i2c.c | 13 +++++++++++-- sound/pci/hda/cs35l56_hda_spi.c | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/cs35l56_hda_i2c.c b/sound/pci/hda/cs35l56_hda_i2c.c index 13beee807308..40f2f97944d5 100644 --- a/sound/pci/hda/cs35l56_hda_i2c.c +++ b/sound/pci/hda/cs35l56_hda_i2c.c @@ -56,10 +56,19 @@ static const struct i2c_device_id cs35l56_hda_i2c_id[] = { {} }; +static const struct acpi_device_id cs35l56_acpi_hda_match[] = { + { "CSC3554", 0 }, + { "CSC3556", 0 }, + { "CSC3557", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, cs35l56_acpi_hda_match); + static struct i2c_driver cs35l56_hda_i2c_driver = { .driver = { - .name = "cs35l56-hda", - .pm = &cs35l56_hda_pm_ops, + .name = "cs35l56-hda", + .acpi_match_table = cs35l56_acpi_hda_match, + .pm = &cs35l56_hda_pm_ops, }, .id_table = cs35l56_hda_i2c_id, .probe = cs35l56_hda_i2c_probe, diff --git a/sound/pci/hda/cs35l56_hda_spi.c b/sound/pci/hda/cs35l56_hda_spi.c index a3b2fa76663d..7f02155fe61e 100644 --- a/sound/pci/hda/cs35l56_hda_spi.c +++ b/sound/pci/hda/cs35l56_hda_spi.c @@ -56,10 +56,19 @@ static const struct spi_device_id cs35l56_hda_spi_id[] = { {} }; +static const struct acpi_device_id cs35l56_acpi_hda_match[] = { + { "CSC3554", 0 }, + { "CSC3556", 0 }, + { "CSC3557", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, cs35l56_acpi_hda_match); + static struct spi_driver cs35l56_hda_spi_driver = { .driver = { - .name = "cs35l56-hda", - .pm = &cs35l56_hda_pm_ops, + .name = "cs35l56-hda", + .acpi_match_table = cs35l56_acpi_hda_match, + .pm = &cs35l56_hda_pm_ops, }, .id_table = cs35l56_hda_spi_id, .probe = cs35l56_hda_spi_probe, -- 2.34.1

2 1

[PATCH 0/3] ASoC: Use snd_ctl_find_id_mixer() instead of open-coding
by Richard Fitzgerald 28 Mar '24

28 Mar '24

The first two patches change snd_soc_card_get_kcontrol() to use the core snd_ctl_find_id_mixer() functionality instead of open-coding its own list walk. The last patch adds a KUnit test for this, which was tested on the original and modified code. Richard Fitzgerald (3): ALSA: control: Introduce snd_ctl_find_id_mixer_locked() ASoC: soc-card: Use snd_ctl_find_id_mixer() instead of open-coding ASoC: soc-card: Add KUnit test case for snd_soc_card_get_kcontrol include/sound/control.h | 23 +++++ sound/soc/Kconfig | 8 ++ sound/soc/Makefile | 4 + sound/soc/soc-card-test.c | 191 ++++++++++++++++++++++++++++++++++++++ sound/soc/soc-card.c | 21 +---- 5 files changed, 230 insertions(+), 17 deletions(-) create mode 100644 sound/soc/soc-card-test.c -- 2.39.2

2 4

Dummy output with ES8326 codec
by GitHub issues - opened 28 Mar '24

28 Mar '24

alsa-project/alsa-ucm-conf issue #407 was opened from Henrythek: ## Description During the process of using the ES8326 codec, I encountered a dummy output issue. killall pulseaudio do not work, even after masking and then unmasking the pulseaudio service and attempting to restart it, the issue persists. The dummy output occurs intermittently when plugging in or unplugging headphones, and rebooting can temporarily resolve the issue. I am using the following configuration: - Operating System: Debian GNU/Linux 12 - Kernel Version: 6.7.0 ## Error Messages E: [pulseaudio] module-alsa-card.c: Failed to find a working profile. E: [pulseaudio] module.c: Failed to load module "module-alsa-card" (argument: "device_id="0" name="pci-0000_00_1f.3-platform-sof-essx8336" card_name="alsa_card.pci-0000_00_1f.3-platform-sof-essx8336" namereg_fail=false tsched=yes fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes avoid_resampling=no card_properties="module-udev-detect.discovered=1""): initialization failed. I: [pulseaudio] module-udev-detect.c: Card /devices/pci0000:00/0000:00:1f.3/sof-essx8336/sound/card0 (alsa_card.pci-0000_00_1f.3-platform-sof-essx8336) failed to load module. ## Additional Information The UCM (Use Case Manager) configuration used is from the following repository: [alsa-ucm-conf/ucm2/Intel/sof-essx8336](https://github.com/alsa-project/alsa… ## Steps to Reproduce 1. Use the ES8326 codec on a Debian GNU/Linux 12 system with Kernel 6.7.0. 2. Attempt to use the audio functionality. 3. Plug in or unplug headphones. 4. Observe the dummy output issue and the error messages mentioned above. ## Additional Context [alsa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/14782974… [aplay.txt](https://github.com/alsa-project/alsa-ucm-conf/files/14782975/apl… [pulseaudio_v.txt](https://github.com/alsa-project/alsa-ucm-conf/files/14782… ![Screenshot from 2024-03-27 21-44-34](https://github.com/alsa-project/alsa-ucm-conf/assets/68213530/925… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/407 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 00/15] ASoC: replace dpcm_playback/capture to playback/capture_only
by Kuninori Morimoto 28 Mar '24

28 Mar '24

Hi Mark When we use DPCM, we need to set dpcm_playback/capture flag. If these flag are set, soc_get_playback_capture() will check its availability, but non DPCM case is checked without special flags. OTOH, it cares playback/capture_only flag. It is needed. This patch remove DPCM special flag, and replace it playback/capture_only flag if needed. Kuninori Morimoto (15): ASoC: soc-pcm.c: cleanup soc_get_playback_capture() ASoC: amd: replace dpcm_playback/capture to playback/capture_only ASoC: fsl: replace dpcm_playback/capture to playback/capture_only ASoC: sof: replace dpcm_playback/capture to playback/capture_only ASoC: meson: replace dpcm_playback/capture to playback/capture_only ASoC: Intel: replace dpcm_playback/capture to playback/capture_only ASoC: samsung: replace dpcm_playback/capture to playback/capture_only ASoC: mediatek: replace dpcm_playback/capture to playback/capture_only ASoC: Intel/avs: replace dpcm_playback/capture to playback/capture_only ASoC: soc-core.c: replace dpcm_playback/capture to playback/capture_only ASoC: soc-topology.c: replace dpcm_playback/capture to playback/capture_only ASoC: soc-compress.c: replace dpcm_playback/capture to playback/capture_only ASoC: remove snd_soc_dai_link_set_capabilities() ASoC: soc-pcm.c: remove dpcm_playback/capture ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings include/sound/soc-dai.h | 1 - include/sound/soc.h | 4 - sound/soc/amd/acp-da7219-max98357a.c | 20 ++--- sound/soc/amd/acp-es8336.c | 2 - sound/soc/amd/acp/acp-mach-common.c | 24 ++--- sound/soc/amd/acp3x-rt5682-max9836.c | 6 +- sound/soc/amd/vangogh/acp5x-mach.c | 6 -- sound/soc/fsl/fsl-asoc-card.c | 16 ++-- sound/soc/fsl/imx-audmix.c | 6 +- sound/soc/fsl/imx-card.c | 7 +- sound/soc/generic/audio-graph-card.c | 2 - sound/soc/generic/audio-graph-card2.c | 2 - sound/soc/generic/simple-card.c | 2 - sound/soc/intel/avs/boards/da7219.c | 2 - sound/soc/intel/avs/boards/dmic.c | 4 +- sound/soc/intel/avs/boards/es8336.c | 2 - sound/soc/intel/avs/boards/hdaudio.c | 4 - sound/soc/intel/avs/boards/i2s_test.c | 2 - sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 - sound/soc/intel/avs/boards/max98927.c | 2 - sound/soc/intel/avs/boards/nau8825.c | 2 - sound/soc/intel/avs/boards/rt274.c | 2 - sound/soc/intel/avs/boards/rt286.c | 2 - sound/soc/intel/avs/boards/rt298.c | 2 - sound/soc/intel/avs/boards/rt5514.c | 2 +- sound/soc/intel/avs/boards/rt5663.c | 2 - sound/soc/intel/avs/boards/rt5682.c | 2 - sound/soc/intel/avs/boards/ssm4567.c | 2 - sound/soc/intel/boards/bdw-rt5650.c | 4 - sound/soc/intel/boards/bdw-rt5677.c | 4 - sound/soc/intel/boards/bdw_rt286.c | 10 +-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 32 ++++--- sound/soc/intel/boards/bxt_rt298.c | 26 +++--- sound/soc/intel/boards/bytcht_cx2072x.c | 6 +- sound/soc/intel/boards/bytcht_da7213.c | 6 +- sound/soc/intel/boards/bytcht_es8316.c | 6 +- sound/soc/intel/boards/bytcht_nocodec.c | 6 +- sound/soc/intel/boards/bytcr_rt5640.c | 6 +- sound/soc/intel/boards/bytcr_rt5651.c | 6 +- sound/soc/intel/boards/bytcr_wm5102.c | 6 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 6 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 6 +- sound/soc/intel/boards/cml_rt1011_rt5682.c | 14 ++- sound/soc/intel/boards/ehl_rt5660.c | 14 ++- sound/soc/intel/boards/glk_rt5682_max98357a.c | 30 +++---- sound/soc/intel/boards/hsw_rt5640.c | 10 +-- sound/soc/intel/boards/kbl_da7219_max98357a.c | 26 +++--- sound/soc/intel/boards/kbl_da7219_max98927.c | 54 +++++------- sound/soc/intel/boards/kbl_rt5660.c | 18 ++-- sound/soc/intel/boards/kbl_rt5663_max98927.c | 44 +++++----- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 22 ++--- sound/soc/intel/boards/skl_hda_dsp_common.c | 14 ++- .../soc/intel/boards/skl_nau88l25_max98357a.c | 26 +++--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 26 +++--- sound/soc/intel/boards/skl_rt286.c | 26 +++--- sound/soc/intel/boards/sof_board_helpers.c | 12 +-- sound/soc/intel/boards/sof_da7219.c | 33 +++---- sound/soc/intel/boards/sof_es8336.c | 8 +- sound/soc/intel/boards/sof_pcm512x.c | 8 +- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_wm8804.c | 2 - sound/soc/mediatek/mt2701/mt2701-cs42448.c | 20 ++--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 24 ++--- sound/soc/mediatek/mt7986/mt7986-wm8960.c | 6 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +-- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +-- .../mediatek/mt8183/mt8183-da7219-max98357.c | 34 +++---- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 34 +++---- .../mt8186/mt8186-mt6366-da7219-max98357.c | 86 +++++++----------- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 86 +++++++----------- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 58 ++++++------ .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++++-------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 ++++++------- sound/soc/meson/axg-card.c | 9 +- sound/soc/meson/gx-card.c | 1 - sound/soc/meson/meson-card-utils.c | 4 +- sound/soc/qcom/common.c | 1 - sound/soc/samsung/odroid.c | 11 ++- sound/soc/soc-compress.c | 10 ++- sound/soc/soc-core.c | 20 +---- sound/soc/soc-dai.c | 38 -------- sound/soc/soc-pcm.c | 88 ++++++++----------- sound/soc/soc-topology-test.c | 2 - sound/soc/soc-topology.c | 4 +- sound/soc/sof/nocodec.c | 4 - 91 files changed, 507 insertions(+), 876 deletions(-) -- 2.25.1

4 25

[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