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

Re: [PATCH 2/4] soundwire: intel: Use auxiliary_device driver data helpers
by Andy Shevchenko 22 Dec '21

22 Dec '21

On Tue, Dec 21, 2021 at 03:58:50PM -0800, David E. Box wrote: > Use auxiliary_get_drvdata and auxiliary_set_drvdata helpers. Reviewed-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> > Signed-off-by: David E. Box <david.e.box(a)linux.intel.com> > --- > drivers/soundwire/intel.c | 8 ++++---- > drivers/soundwire/intel_init.c | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c > index 78037ffdb09b..d082d18e41a9 100644 > --- a/drivers/soundwire/intel.c > +++ b/drivers/soundwire/intel.c > @@ -1293,7 +1293,7 @@ static int intel_link_probe(struct auxiliary_device *auxdev, > bus->ops = &sdw_intel_ops; > > /* set driver data, accessed by snd_soc_dai_get_drvdata() */ > - dev_set_drvdata(dev, cdns); > + auxiliary_set_drvdata(auxdev, cdns); > > /* use generic bandwidth allocation algorithm */ > sdw->cdns.bus.compute_params = sdw_compute_params; > @@ -1321,7 +1321,7 @@ int intel_link_startup(struct auxiliary_device *auxdev) > { > struct sdw_cdns_stream_config config; > struct device *dev = &auxdev->dev; > - struct sdw_cdns *cdns = dev_get_drvdata(dev); > + struct sdw_cdns *cdns = auxiliary_get_drvdata(auxdev); > struct sdw_intel *sdw = cdns_to_intel(cdns); > struct sdw_bus *bus = &cdns->bus; > int link_flags; > @@ -1463,7 +1463,7 @@ int intel_link_startup(struct auxiliary_device *auxdev) > static void intel_link_remove(struct auxiliary_device *auxdev) > { > struct device *dev = &auxdev->dev; > - struct sdw_cdns *cdns = dev_get_drvdata(dev); > + struct sdw_cdns *cdns = auxiliary_get_drvdata(auxdev); > struct sdw_intel *sdw = cdns_to_intel(cdns); > struct sdw_bus *bus = &cdns->bus; > > @@ -1488,7 +1488,7 @@ int intel_link_process_wakeen_event(struct auxiliary_device *auxdev) > void __iomem *shim; > u16 wake_sts; > > - sdw = dev_get_drvdata(dev); > + sdw = auxiliary_get_drvdata(auxdev); > bus = &sdw->cdns.bus; > > if (bus->prop.hw_disabled || !sdw->startup_done) { > diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c > index e329022e1669..d99807765dfe 100644 > --- a/drivers/soundwire/intel_init.c > +++ b/drivers/soundwire/intel_init.c > @@ -244,7 +244,7 @@ static struct sdw_intel_ctx > goto err; > > link = &ldev->link_res; > - link->cdns = dev_get_drvdata(&ldev->auxdev.dev); > + link->cdns = auxiliary_get_drvdata(&ldev->auxdev); > > if (!link->cdns) { > dev_err(&adev->dev, "failed to get link->cdns\n"); > -- > 2.25.1 > -- With Best Regards, Andy Shevchenko

1 0

compile error: undefined reference to `snd_ctl_elem_id_compare_set'
by GitHub issues - opened 22 Dec '21

22 Dec '21

alsa-project/alsa-utils issue #130 was opened from steeley: Building on raspberry pi buster (Linux 5.10.76-v7l. 32 bit) using theses commands: `cd alsa-utils/ git checkout v1.2.6 autoreconf -i ./configure --prefix=/usr/local make -j4` I get this error: `gcc -D_GNU_SOURCE -D__USE_GNU -DSYS_ASOUNDRC=\"/var/lib/alsa/asound.state\" -DSYS_LOCKFILE=\"/var/lock/asound.state.lock\" -DSYS_PIDFILE=\"/var/run/alsactl.pid\" -g -O2 -o alsactl alsactl-alsactl.o alsactl-state.o alsactl-lock.o alsactl-utils.o alsactl-init_parse.o alsactl-init_ucm.o alsactl-daemon.o alsactl-monitor.o alsactl-clean.o -lasound -lm -ldl -lpthread /usr/bin/ld: alsactl-clean.o: in function `clean_one_control': /home/pi/alsa-utils/alsactl/clean.c:55: undefined reference to `snd_ctl_elem_id_compare_set' collect2: error: ld returned 1 exit status make[2]: *** [Makefile:528: alsactl] Error 1 make[2]: Leaving directory '/home/pi/alsa-utils/alsactl' make[1]: *** [Makefile:827: all-recursive] Error 1 make[1]: Leaving directory '/home/pi/alsa-utils/alsactl' make: *** [Makefile:429: all-recursive] Error 1` Issue URL : https://github.com/alsa-project/alsa-utils/issues/130 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH v3 1/1] pinctrl: Propagate firmware node from a parent device
by Andy Shevchenko 22 Dec '21

22 Dec '21

When creating MFD platform devices the firmware node is left unset. This, in particular, prevents GPIO library to use it for different purposes. Propagate firmware node from the parent device and let GPIO library do the right thing. While at it, slightly modify the headers to reflect the usage of APIs. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- v2: fixed more compilation errors brought by header reshuffling (LKP) drivers/pinctrl/cirrus/pinctrl-madera-core.c | 5 ++++- drivers/pinctrl/pinctrl-as3722.c | 13 +++++++------ drivers/pinctrl/pinctrl-da9062.c | 6 +++--- drivers/pinctrl/pinctrl-max77620.c | 11 +++++++---- drivers/pinctrl/pinctrl-rk805.c | 12 ++++++------ 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/drivers/pinctrl/cirrus/pinctrl-madera-core.c b/drivers/pinctrl/cirrus/pinctrl-madera-core.c index dce2626384a9..e1cfbee3643a 100644 --- a/drivers/pinctrl/cirrus/pinctrl-madera-core.c +++ b/drivers/pinctrl/cirrus/pinctrl-madera-core.c @@ -8,8 +8,10 @@ #include <linux/err.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/slab.h> + #include <linux/pinctrl/machine.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinmux.h> @@ -1004,13 +1006,14 @@ static int madera_pin_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "%s\n", __func__); + device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent)); + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; priv->dev = &pdev->dev; priv->madera = madera; - pdev->dev.of_node = madera->dev->of_node; switch (madera->type) { case CS47L15: diff --git a/drivers/pinctrl/pinctrl-as3722.c b/drivers/pinctrl/pinctrl-as3722.c index 13c193156363..4313756b52e6 100644 --- a/drivers/pinctrl/pinctrl-as3722.c +++ b/drivers/pinctrl/pinctrl-as3722.c @@ -23,19 +23,20 @@ #include <linux/delay.h> #include <linux/gpio/driver.h> #include <linux/kernel.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/mfd/as3722.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> +#include <linux/pm.h> +#include <linux/property.h> +#include <linux/slab.h> + #include <linux/pinctrl/consumer.h> #include <linux/pinctrl/machine.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinmux.h> -#include <linux/pm.h> -#include <linux/slab.h> #include "core.h" #include "pinconf.h" @@ -551,12 +552,13 @@ static int as3722_pinctrl_probe(struct platform_device *pdev) struct as3722_pctrl_info *as_pci; int ret; + device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent)); + as_pci = devm_kzalloc(&pdev->dev, sizeof(*as_pci), GFP_KERNEL); if (!as_pci) return -ENOMEM; as_pci->dev = &pdev->dev; - as_pci->dev->of_node = pdev->dev.parent->of_node; as_pci->as3722 = dev_get_drvdata(pdev->dev.parent); platform_set_drvdata(pdev, as_pci); @@ -578,7 +580,6 @@ static int as3722_pinctrl_probe(struct platform_device *pdev) as_pci->gpio_chip = as3722_gpio_chip; as_pci->gpio_chip.parent = &pdev->dev; - as_pci->gpio_chip.of_node = pdev->dev.parent->of_node; ret = gpiochip_add_data(&as_pci->gpio_chip, as_pci); if (ret < 0) { dev_err(&pdev->dev, "Couldn't register gpiochip, %d\n", ret); diff --git a/drivers/pinctrl/pinctrl-da9062.c b/drivers/pinctrl/pinctrl-da9062.c index 1c08579f0198..0e0ac3f3ffef 100644 --- a/drivers/pinctrl/pinctrl-da9062.c +++ b/drivers/pinctrl/pinctrl-da9062.c @@ -14,6 +14,7 @@ #include <linux/bits.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/gpio/driver.h> @@ -256,6 +257,8 @@ static int da9062_pctl_probe(struct platform_device *pdev) struct da9062_pctl *pctl; int i; + device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent)); + pctl = devm_kzalloc(&pdev->dev, sizeof(*pctl), GFP_KERNEL); if (!pctl) return -ENOMEM; @@ -277,9 +280,6 @@ static int da9062_pctl_probe(struct platform_device *pdev) pctl->gc = reference_gc; pctl->gc.label = dev_name(&pdev->dev); pctl->gc.parent = &pdev->dev; -#ifdef CONFIG_OF_GPIO - pctl->gc.of_node = parent->of_node; -#endif platform_set_drvdata(pdev, pctl); diff --git a/drivers/pinctrl/pinctrl-max77620.c b/drivers/pinctrl/pinctrl-max77620.c index c643ed43ebbf..1ee94574f0af 100644 --- a/drivers/pinctrl/pinctrl-max77620.c +++ b/drivers/pinctrl/pinctrl-max77620.c @@ -10,14 +10,16 @@ */ #include <linux/mfd/max77620.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/property.h> +#include <linux/regmap.h> + #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinmux.h> -#include <linux/platform_device.h> -#include <linux/regmap.h> #include "core.h" #include "pinconf.h" @@ -551,12 +553,13 @@ static int max77620_pinctrl_probe(struct platform_device *pdev) struct max77620_pctrl_info *mpci; int i; + device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent)); + mpci = devm_kzalloc(&pdev->dev, sizeof(*mpci), GFP_KERNEL); if (!mpci) return -ENOMEM; mpci->dev = &pdev->dev; - mpci->dev->of_node = pdev->dev.parent->of_node; mpci->rmap = max77620->rmap; mpci->pins = max77620_pins_desc; diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c index c6f4229eb106..7c1f7408fb9a 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -13,17 +13,17 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/mfd/rk808.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> +#include <linux/pm.h> +#include <linux/property.h> +#include <linux/slab.h> + #include <linux/pinctrl/consumer.h> #include <linux/pinctrl/machine.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinmux.h> -#include <linux/pm.h> -#include <linux/slab.h> #include "core.h" #include "pinconf.h" @@ -420,18 +420,18 @@ static int rk805_pinctrl_probe(struct platform_device *pdev) struct rk805_pctrl_info *pci; int ret; + device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent)); + pci = devm_kzalloc(&pdev->dev, sizeof(*pci), GFP_KERNEL); if (!pci) return -ENOMEM; pci->dev = &pdev->dev; - pci->dev->of_node = pdev->dev.parent->of_node; pci->rk808 = dev_get_drvdata(pdev->dev.parent); pci->pinctrl_desc = rk805_pinctrl_desc; pci->gpio_chip = rk805_gpio_chip; pci->gpio_chip.parent = &pdev->dev; - pci->gpio_chip.of_node = pdev->dev.parent->of_node; platform_set_drvdata(pdev, pci); -- 2.34.1

4 3

Re: [PATCH 0/4] driver_core: Auxiliary drvdata helper cleanup
by Jason Gunthorpe 22 Dec '21

22 Dec '21

On Tue, Dec 21, 2021 at 03:58:48PM -0800, David E. Box wrote: > Depends on "driver core: auxiliary bus: Add driver data helpers" patch [1]. > Applies the helpers to all auxiliary device drivers using > dev_(get/set)_drvdata. Drivers were found using the following search: > > grep -lr "struct auxiliary_device" $(grep -lr "drvdata" .) > > Changes were build tested using the following configs: > > vdpa/mlx5: CONFIG_MLX5_VDPA_NET > net/mlx53: CONFIG_MLX5_CORE_EN > soundwire/intel: CONFIG_SOUNDWIRE_INTEL > RDAM/irdma: CONFIG_INFINIBAND_IRDMA > CONFIG_MLX5_INFINIBAND > > [1] https://www.spinics.net/lists/platform-driver-x86/msg29940.html I have to say I don't really find this to be a big readability improvement. Also, what use is 'to_auxiliary_dev()' ? I didn't see any users added.. Jason

1 0

[WIP][RFC] Nhlt plugin and simple plugin interface
by GitHub pull_request - opened 21 Dec '21

21 Dec '21

alsa-project/alsa-utils pull request #129 was opened from juimonen: Initial something... I need to figure out: - where to specify which plugins to load/run (nhlt now hard coded) - where to install the plugins - how to get the to-be-loaded plugin names and where - is the "hidden-visibility" gcc flag ok to hide other than .so entrypoint Request URL : https://github.com/alsa-project/alsa-utils/pull/129 Patch URL : https://github.com/alsa-project/alsa-utils/pull/129.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH v2 1/3] ASoC: SOF: AMD: simplify return status handling
by Ajit Kumar Pandey 21 Dec '21

21 Dec '21

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> cppcheck warning: sound/soc/sof/amd/acp.c:222:9: warning: Identical condition and return expression 'ret', return value is always 0 [identicalConditionAfterEarlyExit] return ret; ^ sound/soc/sof/amd/acp.c:213:6: note: If condition 'ret' is true, the function will return/exit if (ret) ^ sound/soc/sof/amd/acp.c:222:9: note: Returning identical expression 'ret' return ret; ^ Just return 0; on success. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey(a)amd.com> --- sound/soc/sof/amd/acp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 4c5550e8d364..fe9b7dc5bc86 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -219,7 +219,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return -EINVAL; } - return ret; + return 0; } int acp_dma_status(struct acp_dev_data *adata, unsigned char ch) -- 2.25.1

2 3

[PATCH v2 1/2] ASoC: dt-bindings: codecs: Add bindings for ak4375
by Vincent Knecht 21 Dec '21

21 Dec '21

AK4375 is an audio DAC with headphones amplifier controlled via I2C. Add simple device tree bindings that describe how to set it up. Reviewed-by: Rob Herring <robh(a)kernel.org> Signed-off-by: Vincent Knecht <vincent.knecht(a)mailoo.org> --- Changed in v2: - Changed avdd-supply to be required - Picked up Rob's Reviewed-by Sorry if it was not appropriate following the avdd change... --- .../devicetree/bindings/sound/ak4375.yaml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ak4375.yaml diff --git a/Documentation/devicetree/bindings/sound/ak4375.yaml b/Documentation/devicetree/bindings/sound/ak4375.yaml new file mode 100644 index 000000000000..f1d5074a024d --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ak4375.yaml @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ak4375.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AK4375 DAC and headphones amplifier Device Tree Bindings + +maintainers: + - Vincent Knecht <vincent.knecht(a)mailoo.org> + +properties: + compatible: + const: asahi-kasei,ak4375 + + reg: + maxItems: 1 + + '#sound-dai-cells': + const: 0 + + avdd-supply: + description: regulator phandle for the AVDD power supply. + + tvdd-supply: + description: regulator phandle for the TVDD power supply. + + pdn-gpios: + description: optional GPIO to set the PDN pin. + +required: + - compatible + - reg + - '#sound-dai-cells' + - avdd-supply + - tvdd-supply + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + + headphones: audio-codec@10 { + compatible = "asahi-kasei,ak4375"; + reg = <0x10>; + avdd-supply = <&reg_headphones_avdd>; + tvdd-supply = <&pm8916_l6>; + pdn-gpios = <&msmgpio 114 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&headphones_pdn_default>; + #sound-dai-cells = <0>; + }; + }; -- 2.31.1

2 3

[PATCH v2 0/2] sound/soc: Use platform_get_irq() to fetch IRQ's
by Lad Prabhakar 21 Dec '21

21 Dec '21

Hi All, This patch series aims to drop using platform_get_resource() for IRQ types in preparation for removal of static setup of IRQ resource from DT core code. Dropping usage of platform_get_resource() was agreed based on the discussion [0]. [0] https://patchwork.kernel.org/project/linux-renesas-soc/ patch/20211209001056.29774-1-prabhakar.mahadev-lad.rj(a)bp.renesas.com/ Cheers, Prabhakar Lad Prabhakar (2): ASoC: xlnx: Use platform_get_irq() to get the interrupt ASoC: bcm: Use platform_get_irq() to get the interrupt sound/soc/bcm/bcm63xx-i2s.h | 1 - sound/soc/bcm/bcm63xx-pcm-whistler.c | 13 ++++++------- sound/soc/xilinx/xlnx_spdif.c | 10 +++------- 3 files changed, 9 insertions(+), 15 deletions(-) -- 2.17.1

2 3

[PATCH] ASoC: amd: acp: Remove duplicate dependency in Kconfig
by Ajit Kumar Pandey 21 Dec '21

21 Dec '21

Remove duplicate depends on statement in Kconfig file. Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey(a)amd.com> --- sound/soc/amd/acp/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index 52a1371f9e61..154be5e70821 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -46,7 +46,6 @@ config SND_SOC_AMD_LEGACY_MACH tristate "AMD Legacy Machine Driver Support" depends on X86 && PCI && I2C select SND_SOC_AMD_MACH_COMMON - depends on X86 && PCI && I2C help This option enables legacy sound card support for ACP audio. @@ -54,7 +53,6 @@ config SND_SOC_AMD_SOF_MACH tristate "AMD SOF Machine Driver Support" depends on X86 && PCI && I2C select SND_SOC_AMD_MACH_COMMON - depends on X86 && PCI && I2C help This option enables SOF sound card support for ACP audio. -- 2.25.1

2 1

[PATCH 0/2] sound/soc: Use platform_get_irq() to fetch IRQ's
by Lad Prabhakar 21 Dec '21

21 Dec '21

Hi All, This patch series aims to drop using platform_get_resource() for IRQ types in preparation for removal of static setup of IRQ resource from DT core code. Dropping usage of platform_get_resource() was agreed based on the discussion [0]. [0] https://patchwork.kernel.org/project/linux-renesas-soc/ patch/20211209001056.29774-1-prabhakar.mahadev-lad.rj(a)bp.renesas.com/ Note: I have just build tested the patches. Cheers, Prabhakar Lad Prabhakar (2): ASoC: xlnx: Use platform_get_irq() to get the interrupt ASoC: bcm: Use platform_get_irq() to get the interrupt sound/soc/bcm/bcm63xx-i2s.h | 1 - sound/soc/bcm/bcm63xx-pcm-whistler.c | 12 +++++------- sound/soc/xilinx/xlnx_spdif.c | 10 +++------- 3 files changed, 8 insertions(+), 15 deletions(-) -- 2.17.1

3 5