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

[PATCH RFC] ASoC: codecs: aw88261: Remove non-existing reset gpio
by Luca Weiss 29 Sep '23

29 Sep '23

According to the AW88261 datasheet (V1.1) and device schematics I have access to, there is no reset gpio present on the AW88261. Remove it. Signed-off-by: Luca Weiss <luca.weiss(a)fairphone.com> --- In case this looks okay, also to the driver author at Awinic, the binding doc also needs to be updated to include this change and not require (or even allow) the reset-gpios anymore. Therefore this is marked RFC for now. --- sound/soc/codecs/aw88261.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c index 45eaf931a69c..e7683f70c2ef 100644 --- a/sound/soc/codecs/aw88261.c +++ b/sound/soc/codecs/aw88261.c @@ -10,7 +10,6 @@ #include <linux/i2c.h> #include <linux/firmware.h> -#include <linux/of_gpio.h> #include <linux/regmap.h> #include <sound/soc.h> #include "aw88261.h" @@ -1175,14 +1174,6 @@ static const struct snd_soc_component_driver soc_codec_dev_aw88261 = { .remove = aw88261_codec_remove, }; -static void aw88261_hw_reset(struct aw88261 *aw88261) -{ - gpiod_set_value_cansleep(aw88261->reset_gpio, 0); - usleep_range(AW88261_1000_US, AW88261_1000_US + 10); - gpiod_set_value_cansleep(aw88261->reset_gpio, 1); - usleep_range(AW88261_1000_US, AW88261_1000_US + 10); -} - static void aw88261_parse_channel_dt(struct aw88261 *aw88261) { struct aw_device *aw_dev = aw88261->aw_pa; @@ -1254,12 +1245,6 @@ static int aw88261_i2c_probe(struct i2c_client *i2c) i2c_set_clientdata(i2c, aw88261); - aw88261->reset_gpio = devm_gpiod_get_optional(&i2c->dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(aw88261->reset_gpio)) - dev_info(&i2c->dev, "reset gpio not defined\n"); - else - aw88261_hw_reset(aw88261); - aw88261->regmap = devm_regmap_init_i2c(i2c, &aw88261_remap_config); if (IS_ERR(aw88261->regmap)) { ret = PTR_ERR(aw88261->regmap); --- base-commit: b216fb8946f819cf1b63dc12c7867cc501bda57e change-id: 20230929-aw88261-reset-7e00d9e25952 Best regards, -- Luca Weiss <luca.weiss(a)fairphone.com>

2 3

[PATCH] ASoC: dt-bindings: Simplify referencing dai-params.yaml
by Rob Herring 29 Sep '23

29 Sep '23

There's generally no need to use definitions to reference from individual properties. All the property names are the same, and all the defined properties are used by all the users. Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../bindings/sound/audio-graph-port.yaml | 20 ++++++------------- .../bindings/sound/audio-graph.yaml | 9 +++------ .../devicetree/bindings/sound/dai-params.yaml | 11 ++++------ 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index fa9f9a853365..60b5e3fd1115 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -13,19 +13,17 @@ select: false definitions: port-base: - $ref: /schemas/graph.yaml#/$defs/port-base + allOf: + - $ref: /schemas/graph.yaml#/$defs/port-base + - $ref: /schemas/sound/dai-params.yaml# properties: - convert-rate: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate - convert-channels: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels - convert-sample-format: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format mclk-fs: $ref: simple-card.yaml#/definitions/mclk-fs endpoint-base: - $ref: /schemas/graph.yaml#/$defs/endpoint-base + allOf: + - $ref: /schemas/graph.yaml#/$defs/endpoint-base + - $ref: /schemas/sound/dai-params.yaml# properties: mclk-fs: $ref: simple-card.yaml#/definitions/mclk-fs @@ -68,12 +66,6 @@ definitions: - pdm - msb - lsb - convert-rate: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate - convert-channels: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels - convert-sample-format: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format dai-tdm-slot-num: description: Number of slots in use. diff --git a/Documentation/devicetree/bindings/sound/audio-graph.yaml b/Documentation/devicetree/bindings/sound/audio-graph.yaml index ed31e04ff6a6..71f52f7e55f6 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph.yaml @@ -9,6 +9,9 @@ title: Audio Graph maintainers: - Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> +allOf: + - $ref: /schemas/sound/dai-params.yaml# + properties: dais: $ref: /schemas/types.yaml#/definitions/phandle-array @@ -30,12 +33,6 @@ properties: widget ("Microphone", "Line", "Headphone", "Speaker"), the second being the machine specific name for the widget. $ref: /schemas/types.yaml#/definitions/non-unique-string-array - convert-rate: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate - convert-channels: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels - convert-sample-format: - $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format pa-gpios: maxItems: 1 diff --git a/Documentation/devicetree/bindings/sound/dai-params.yaml b/Documentation/devicetree/bindings/sound/dai-params.yaml index f5fb71f9b603..cd8508175564 100644 --- a/Documentation/devicetree/bindings/sound/dai-params.yaml +++ b/Documentation/devicetree/bindings/sound/dai-params.yaml @@ -11,15 +11,14 @@ maintainers: select: false -$defs: - - dai-channels: +properties: + convert-channels: description: Number of audio channels used by DAI $ref: /schemas/types.yaml#/definitions/uint32 minimum: 1 maximum: 32 - dai-sample-format: + convert-sample-format: description: Audio sample format used by DAI $ref: /schemas/types.yaml#/definitions/string enum: @@ -29,12 +28,10 @@ $defs: - s24_3le - s32_le - dai-sample-rate: + convert-rate: description: Audio sample rate used by DAI $ref: /schemas/types.yaml#/definitions/uint32 minimum: 8000 maximum: 192000 -properties: {} - additionalProperties: true -- 2.40.1

3 2

[PATCH] ASoC: dt-bindings: rt5616: Convert to dtschema
by Bragatheswaran Manickavel 29 Sep '23

29 Sep '23

Convert the rt5616 audio CODEC bindings to DT schema No error/warning seen when running make dt_binding_check Signed-off-by: Bragatheswaran Manickavel <bragathemanick0908(a)gmail.com> --- .../bindings/sound/realtek,rt5616.yaml | 53 +++++++++++++++++++ .../devicetree/bindings/sound/rt5616.txt | 32 ----------- 2 files changed, 53 insertions(+), 32 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5616.yaml delete mode 100644 Documentation/devicetree/bindings/sound/rt5616.txt diff --git a/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml b/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml new file mode 100644 index 000000000000..00ff9b4e3c7e --- /dev/null +++ b/Documentation/devicetree/bindings/sound/realtek,rt5616.yaml @@ -0,0 +1,53 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/realtek,rt5616.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Realtek rt5616 ALSA SoC audio codec driver + +description: | + Pins on the device (for linking into audio routes) for RT5616: + + * IN1P + * IN2P + * IN2N + * LOUTL + * LOUTR + * HPOL + * HPOR + +maintainers: + - Bard Liao <bardliao(a)realtek.com> + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + const: realtek,rt5616 + + reg: + maxItems: 1 + + "#sound-dai-cells": + const: 0 + +required: + - compatible + - reg + - '#sound-dai-cells' + +unevaluatedProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + codec@1b { + compatible = "realtek,rt5616"; + reg = <0x1b>; + #sound-dai-cells = <0>; + }; + }; diff --git a/Documentation/devicetree/bindings/sound/rt5616.txt b/Documentation/devicetree/bindings/sound/rt5616.txt deleted file mode 100644 index 540a4bf252e4..000000000000 --- a/Documentation/devicetree/bindings/sound/rt5616.txt +++ /dev/null @@ -1,32 +0,0 @@ -RT5616 audio CODEC - -This device supports I2C only. - -Required properties: - -- compatible : "realtek,rt5616". - -- reg : The I2C address of the device. - -Optional properties: - -- clocks: The phandle of the master clock to the CODEC. - -- clock-names: Should be "mclk". - -Pins on the device (for linking into audio routes) for RT5616: - - * IN1P - * IN2P - * IN2N - * LOUTL - * LOUTR - * HPOL - * HPOR - -Example: - -rt5616: codec@1b { - compatible = "realtek,rt5616"; - reg = <0x1b>; -}; -- 2.34.1

2 2

[PATCH 0/5] Add the pci_get_base_class() helper and use it
by Sui Jingfeng 29 Sep '23

29 Sep '23

From: Sui Jingfeng <suijingfeng(a)loongson.cn> There is no function that can be used to get all PCI(e) devices in a system by matching against its the PCI base class code only, while keep the sub-class code and the programming interface ignored. Therefore, add the pci_get_base_class() function to suit the need. For example, if an application want to process all PCI(e) display devices in a system, it can achieve such goal by writing the code as following: pdev = NULL; do { pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev); if (!pdev) break; do_something_for_pci_display_device(pdev); } while (1); Sui Jingfeng (5): PCI: Add the pci_get_base_class() helper ALSA: hda/intel: Use pci_get_base_class() to reduce duplicated code drm/nouveau: Use pci_get_base_class() to reduce duplicated code drm/amdgpu: Use pci_get_base_class() to reduce duplicated code drm/radeon: Use pci_get_base_class() to reduce duplicated code drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 +++------ drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 20 ++++----------- drivers/gpu/drm/nouveau/nouveau_acpi.c | 11 +++------ drivers/gpu/drm/radeon/radeon_bios.c | 20 ++++----------- drivers/pci/search.c | 31 ++++++++++++++++++++++++ include/linux/pci.h | 5 ++++ sound/pci/hda/hda_intel.c | 16 ++++-------- 7 files changed, 59 insertions(+), 55 deletions(-) -- 2.34.1

5 9

[PATCH] ASoC: doc: Update codec to codec examples
by Amadeusz Sławiński 28 Sep '23

28 Sep '23

There are examples in documentation for codec to codec connection. However they show method before recent series of patches which renamed the fields. Update documentation accordingly. Fixes: 7ddc7f91beb2 ("ASoC: soc.h: clarify Codec2Codec params") Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- Documentation/sound/soc/codec-to-codec.rst | 8 +++++--- Documentation/sound/soc/dpcm.rst | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/sound/soc/codec-to-codec.rst b/Documentation/sound/soc/codec-to-codec.rst index 4eaa9a0c41fc..0418521b6e03 100644 --- a/Documentation/sound/soc/codec-to-codec.rst +++ b/Documentation/sound/soc/codec-to-codec.rst @@ -70,7 +70,8 @@ file: .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, .ignore_suspend = 1, - .params = &dsp_codec_params, + .c2c_params = &dsp_codec_params, + .num_c2c_params = 1, }, { .name = "DSP-CODEC", @@ -81,12 +82,13 @@ file: .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, .ignore_suspend = 1, - .params = &dsp_codec_params, + .c2c_params = &dsp_codec_params, + .num_c2c_params = 1, }, Above code snippet is motivated from sound/soc/samsung/speyside.c. -Note the "params" callback which lets the dapm know that this +Note the "c2c_params" callback which lets the dapm know that this dai_link is a codec to codec connection. In dapm core a route is created between cpu_dai playback widget diff --git a/Documentation/sound/soc/dpcm.rst b/Documentation/sound/soc/dpcm.rst index 77f67ded53de..2d7ad1d91504 100644 --- a/Documentation/sound/soc/dpcm.rst +++ b/Documentation/sound/soc/dpcm.rst @@ -368,7 +368,8 @@ The machine driver sets some additional parameters to the DAI link i.e. .codec_name = "modem", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, - .params = &dai_params, + .c2c_params = &dai_params, + .num_c2c_params = 1, } < ... more DAI links here ... > -- 2.34.1

2 1

[PATCH V6 00/10] ASoC: codecs: Add aw87390 amplifier driver
by wangweidong.a＠awinic.com 28 Sep '23

28 Sep '23

From: Weidong Wang <wangweidong.a(a)awinic.com> The awinic aw87390 is a new high efficiency, low noise, constant large volume, 6th Smart K audio amplifier. Add a DT schema for describing awinic aw87390 audio amplifiers. They are controlled using I2C. Modify some code for aw88261 and aw88395 v5 -> v6: Adjust the order and context of the patch Use "len-1" as a loop judgment modifier Use return 0 instead of return ret at the end of a function Use dev_dbg instead of dev_info Use struct_size to calculate the structure size Remove the space before the exclamation mark Weidong Wang (10): ASoC: dt-bindings: awinic,aw88395: Add properties for multiple PA support ASoC: dt-bindings: Add schema for "awinic,aw87390" ASoC: codecs: Remove the "fade-enable property" ASoC: codecs: Rename "sound-channel" to "awinic,audio-channel" ASoC: codecs: Modify the transmission method of parameters ASoC: codecs: Modify i2c driver name ASoC: codecs: Add code for bin parsing compatible with aw87390 ASoC: codecs: Rename "sync-flag" to "awinic,sync-flag" ASoC: codecs: Modify the transmission mode of function parameters ASoC: codecs: Add aw87390 amplifier driver .../bindings/sound/awinic,aw87390.yaml | 58 +++ .../bindings/sound/awinic,aw88395.yaml | 16 + sound/soc/codecs/Kconfig | 15 +- sound/soc/codecs/Makefile | 2 + sound/soc/codecs/aw87390.c | 463 ++++++++++++++++++ sound/soc/codecs/aw87390.h | 85 ++++ sound/soc/codecs/aw88261.c | 27 +- sound/soc/codecs/aw88261.h | 4 +- sound/soc/codecs/aw88395/aw88395.c | 9 +- sound/soc/codecs/aw88395/aw88395.h | 2 +- sound/soc/codecs/aw88395/aw88395_device.c | 47 +- sound/soc/codecs/aw88395/aw88395_device.h | 6 +- sound/soc/codecs/aw88395/aw88395_lib.c | 25 +- sound/soc/codecs/aw88395/aw88395_reg.h | 1 + 14 files changed, 686 insertions(+), 74 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw87390.yaml create mode 100644 sound/soc/codecs/aw87390.c create mode 100644 sound/soc/codecs/aw87390.h base-commit: 633b47cb009d09dc8f4ba9cdb3a0ca138809c7c7 -- 2.41.0

2 11

[PATCH] ASoC: cs42l43: Remove useless else
by Jiapeng Chong 28 Sep '23

28 Sep '23

The assignment of the else and if branches is the same, so the else here is redundant, so we remove it. ./sound/soc/codecs/cs42l43-sdw.c:35:1-3: WARNING: possible condition with no effect (if == else). Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6712 Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/soc/codecs/cs42l43-sdw.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/codecs/cs42l43-sdw.c b/sound/soc/codecs/cs42l43-sdw.c index 55ac5fe8c3db..388f95853b69 100644 --- a/sound/soc/codecs/cs42l43-sdw.c +++ b/sound/soc/codecs/cs42l43-sdw.c @@ -31,11 +31,7 @@ int cs42l43_sdw_add_peripheral(struct snd_pcm_substream *substream, return -EINVAL; snd_sdw_params_to_config(substream, params, &sconfig, &pconfig); - - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - pconfig.num = dai->id; - else - pconfig.num = dai->id; + pconfig.num = dai->id; ret = sdw_stream_add_slave(sdw, &sconfig, &pconfig, 1, sdw_stream); if (ret) { -- 2.20.1.7.g153144c

3 2

[PATCH 0/2] ASoC: codecs: rtq9128: Add TDM input source select
by cy_huang＠richtek.com 28 Sep '23

28 Sep '23

From: ChiYuan Huang <cy_huang(a)richtek.com> This patch series create a TDM source select property and use it to decide which TDM data source is connected. Following by the below patch disccuion https://lore.kernel.org/lkml/1695780376-32301-1-git-send-email-cy_huang@ric… It may not be a good choice to add the user controlable mixer control item. Since it follows the board design, make it as a device property. ChiYuan Huang (2): ASoC: dt-bindings: rtq9128: Add TDM input source slect property ASoC: codecs: rtq9128: Add TDM input source select .../bindings/sound/richtek,rtq9128.yaml | 7 +++++++ sound/soc/codecs/rtq9128.c | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) base-commit: 3efcb471f871cc095841d411f98c593228ecbac6 -- 2.34.1

2 3

[PATCH V4 0/7] ASoC: codecs: Add aw87390 amplifier driver
by wangweidong.a＠awinic.com 28 Sep '23

28 Sep '23

From: Weidong Wang <wangweidong.a(a)awinic.com> The awinic aw87390 is a new high efficiency, low noise, constant large volume, 6th Smart K audio amplifier. Add a DT schema for describing awinic aw87390 audio amplifiers. They are controlled using I2C. v3 -> v4: Divide the changes of aw88395 into multiple patches Weidong Wang (7): ASoC: dt-bindings: awinic,aw88395: Add properties for multiple PA support ASoC: dt-bindings: Add schema for "awinic,aw87390" ASoC: codecs: Modify the transmission method of parameters and property node ASoC: codecs: Add code for bin parsing compatible with aw87390 ASoC: codecs: Modify i2c name and parameter transmission methodls ASoC: codecs: Change the aw88261 variable name and i2c driver name ASoC: codecs: Add aw87390 amplifier driver .../bindings/sound/awinic,aw87390.yaml | 58 +++ .../bindings/sound/awinic,aw88395.yaml | 16 + sound/soc/codecs/Kconfig | 15 +- sound/soc/codecs/Makefile | 2 + sound/soc/codecs/aw87390.c | 462 ++++++++++++++++++ sound/soc/codecs/aw87390.h | 85 ++++ sound/soc/codecs/aw88261.c | 27 +- sound/soc/codecs/aw88261.h | 4 +- sound/soc/codecs/aw88395/aw88395.c | 9 +- sound/soc/codecs/aw88395/aw88395.h | 2 +- sound/soc/codecs/aw88395/aw88395_device.c | 47 +- sound/soc/codecs/aw88395/aw88395_device.h | 6 +- sound/soc/codecs/aw88395/aw88395_lib.c | 25 +- sound/soc/codecs/aw88395/aw88395_reg.h | 1 + 14 files changed, 686 insertions(+), 73 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw87390.yaml create mode 100644 sound/soc/codecs/aw87390.c create mode 100644 sound/soc/codecs/aw87390.h base-commit: 2cf0f715623872823a72e451243bbf555d10d032 -- 2.41.0

3 12

[PATCH v4 0/4] Simplify obtaining I2C match data
by Biju Das 28 Sep '23

28 Sep '23

This patch series aims to simplify obtaining I2C match data. This patch series is only compile tested. v4: * Added as a series * Updated commit header for all patches * Updated commit description for patch#1. Biju Das (4): mfd: arizona-i2c: Simplify obtaining I2C match data mfd: madera-i2c: Simplify obtaining I2C match data mfd: max77541: Simplify obtaining I2C match data mfd: max8998: Simplify obtaining I2C match data and drop max8998_i2c_get_driver_data() drivers/mfd/arizona-i2c.c | 11 ++--------- drivers/mfd/madera-i2c.c | 9 +-------- drivers/mfd/max77541.c | 6 +----- drivers/mfd/max8998.c | 12 +----------- 4 files changed, 5 insertions(+), 33 deletions(-) -- 2.25.1

2 2