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

Re: [alsa-devel] [PATCH v8 1/2] ASoC: rt5514: Add devicetree bindings for rt5514-spi
by Brian Norris 06 Sep '17

06 Sep '17

On Tue, Sep 05, 2017 at 12:24:59PM +0800, Jeffy Chen wrote: > Add devicetree bindings documentation file for rt5514 spi dsp codec. > > Also update rt5514 i2c dt-binding's compatible. You should probably describe *why*? > Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> > --- > > Changes in v8: None > > .../devicetree/bindings/sound/rt5514-spi.txt | 32 ++++++++++++++++++++++ > Documentation/devicetree/bindings/sound/rt5514.txt | 2 +- > 2 files changed, 33 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/sound/rt5514-spi.txt > > diff --git a/Documentation/devicetree/bindings/sound/rt5514-spi.txt b/Documentation/devicetree/bindings/sound/rt5514-spi.txt > new file mode 100644 > index 000000000000..8a63d9423dd9 > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/rt5514-spi.txt > @@ -0,0 +1,32 @@ > +RT5514 SPI audio CODEC > + > +This device supports SPI only. > + > +Required properties: > + > +- compatible : "realtek,rt5514". You list one string here, but there's 2 in the example. The point of this exercise was to document (not just in an Example) the strings you're using. > + > +- reg : The SPI address of the device. > + > +Optional properties: > + > +- interrupt-parent: Should be the phandle for the interrupt controller > +- interrupts: The interrupt number to the cpu. The interrupt specifier format > + depends on the interrupt controller. > + > +Example: > + > +codec: rt5514-spi@0 { > + compatible = "realtek,rt5514", "realtek,rt5514-spi"; > + reg = <0>; > + > + /* May run faster once verified. */ Really? That was barely useful in the rk3399-gru DTSI, but it's definitely not worth sticking in an example. Also, you switch between tabs and spaces for indentation. Please be consistent. (And as with C code, I think the right answer is tabs?) > + spi-max-frequency = <10000000>; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&mic_int>; > + > + interrupt-parent = <&gpio1>; > + interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; > + wakeup-source; > +}; > diff --git a/Documentation/devicetree/bindings/sound/rt5514.txt b/Documentation/devicetree/bindings/sound/rt5514.txt > index 929ca6756b02..12a8c93a67cc 100644 > --- a/Documentation/devicetree/bindings/sound/rt5514.txt > +++ b/Documentation/devicetree/bindings/sound/rt5514.txt > @@ -28,6 +28,6 @@ Pins on the device (for linking into audio routes) for RT5514: > Example: > > codec: rt5514@57 { > - compatible = "realtek,rt5514"; > + compatible = "realtek,rt5514", "realtek,rt5514-i2c"; Example != Documentation. Please document the string properly. Brian > reg = <0x57>; > }; > -- > 2.11.0 > >

2 1

[alsa-devel] [PATCH v9 1/2] ASoC: rt5514: Add devicetree bindings for rt5514-spi
by Jeffy Chen 06 Sep '17

06 Sep '17

Add devicetree bindings documentation file for rt5514 spi dsp codec. Also update rt5514 i2c dt-binding's compatible to distinguish it from rt5514 spi. Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> --- Changes in v9: Address comments from Brian. .../devicetree/bindings/sound/rt5514-spi.txt | 29 ++++++++++++++++++++++ Documentation/devicetree/bindings/sound/rt5514.txt | 4 +-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/rt5514-spi.txt diff --git a/Documentation/devicetree/bindings/sound/rt5514-spi.txt b/Documentation/devicetree/bindings/sound/rt5514-spi.txt new file mode 100644 index 000000000000..7911d1adbd29 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rt5514-spi.txt @@ -0,0 +1,29 @@ +RT5514 SPI audio CODEC + +This device supports SPI only. + +Required properties: + +- compatible : "realtek,rt5514" or "realtek,rt5514", "realtek,rt5514-spi". + +- reg : The SPI address of the device. + +Optional properties: + +- interrupt-parent: Should be the phandle for the interrupt controller +- interrupts: The interrupt number to the cpu. The interrupt specifier format + depends on the interrupt controller. + +Example: + +codec: rt5514-spi@0 { + compatible = "realtek,rt5514", "realtek,rt5514-spi"; + reg = <0>; + + pinctrl-names = "default"; + pinctrl-0 = <&mic_int>; + + interrupt-parent = <&gpio1>; + interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; + wakeup-source; +}; diff --git a/Documentation/devicetree/bindings/sound/rt5514.txt b/Documentation/devicetree/bindings/sound/rt5514.txt index 929ca6756b02..841a1159e234 100644 --- a/Documentation/devicetree/bindings/sound/rt5514.txt +++ b/Documentation/devicetree/bindings/sound/rt5514.txt @@ -4,7 +4,7 @@ This device supports I2C only. Required properties: -- compatible : "realtek,rt5514". +- compatible : "realtek,rt5514" or "realtek,rt5514", "realtek,rt5514-i2c". - reg : The I2C address of the device. @@ -28,6 +28,6 @@ Pins on the device (for linking into audio routes) for RT5514: Example: codec: rt5514@57 { - compatible = "realtek,rt5514"; + compatible = "realtek,rt5514", "realtek,rt5514-i2c"; reg = <0x57>; }; -- 2.11.0

1 0

[alsa-devel] alsa-utils uses incorrect format for 24 bit audio?
by Ricard Wanderlof 06 Sep '17

06 Sep '17

When attempting to use arecord to capture audio from a 24 bit source, and create a 24-bit .wav file I ran into the problem that the resulting file does not seem valid. Looking closer at the contents, it appears that arecord writes the 32-bit S24_LE samples verbatim to the file, and sets the number of bits per sample specifier to 24 in the .wav header, at the same time as it sets the 'block align' to 4 which I suppose is logical, although normally the block align corresponds to the frame size (in bytes) for the sample size specified in the bits per sample specifier. A number of utilities and applications I tried refused to play the file back properly, including Audacity, VLC, sox and kwave, so I'm guessing the format written by arecord is not valid in this case. 24 bit audio as exported from Audacity for instance in reality corresponds to the ALSA S24_3LE format, i.e. the data is sent with no padding (resulting in a .wav 'block align' specifier of 3 for a mono stream). Is this a known problem with arecord/aplay, or is it the other applications which have been less than accurate when implementing .wav file standard? /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 1

[alsa-devel] [PATCH] ASoC: improve RT5514 dependencies
by Arnd Bergmann 05 Sep '17

05 Sep '17

With SND_SOC_RT5514_SPI=m and SND_SOC_RT5514=y, we get this link error: sound/soc/codecs/rt5514.o: In function `rt5514_dsp_voice_wake_up_put': rt5514.c:(.text+0x2068): undefined reference to `rt5514_spi_burst_write' rt5514.c:(.text+0x20c8): undefined reference to `rt5514_spi_burst_write' This adds another Kconfig symbol to work around the link error, forcing the main driver to be a loadable module as well if some other driver selects the I2C side to be built-in. Fixes: 2a18483a7fb4 ("ASoC: Intel: Add Kabylake machine driver for RT5514, RT5663 and MAX98927") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- This can now lead to a configuration with SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=y and SND_SOC_RT5514=m. I don't know if that is a problem or not. An alternative approach would be to flip the dependency between rt5514_spi.ko and rt5514.ko and avoid having the rt5514_spi_burst_write symbol exported. --- sound/soc/codecs/Kconfig | 7 ++++++- sound/soc/intel/Kconfig | 2 +- sound/soc/mediatek/Kconfig | 2 +- sound/soc/rockchip/Kconfig | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 024ddc9938ed..115c6144ca2a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -117,7 +117,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_RT274 if I2C select SND_SOC_RT286 if I2C select SND_SOC_RT298 if I2C - select SND_SOC_RT5514 if I2C + select SND_SOC_RT5514_I2C if I2C select SND_SOC_RT5616 if I2C select SND_SOC_RT5631 if I2C select SND_SOC_RT5640 if I2C @@ -738,6 +738,11 @@ config SND_SOC_RT298 config SND_SOC_RT5514 tristate + default m if SND_SOC_RT5514_SPI=m + default SND_SOC_RT5514_I2C || SND_SOC_RT5514_SPI + +config SND_SOC_RT5514_I2C + tristate config SND_SOC_RT5514_SPI tristate diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index b301bfff1c09..f5ef912190ed 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -259,7 +259,7 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH select SND_SOC_INTEL_SST select SND_SOC_INTEL_SKYLAKE select SND_SOC_RT5663 - select SND_SOC_RT5514 + select SND_SOC_RT5514_I2C select SND_SOC_MAX98927 select SND_SOC_HDAC_HDMI help diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 5c68797f36c4..6ccf73ae77ca 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -67,7 +67,7 @@ config SND_SOC_MT8173_RT5650_RT5514 tristate "ASoC Audio driver for MT8173 with RT5650 RT5514 codecs" depends on SND_SOC_MT8173 && I2C select SND_SOC_RT5645 - select SND_SOC_RT5514 + select SND_SOC_RT5514_I2C help This adds ASoC driver for Mediatek MT8173 boards with the RT5650 and RT5514 codecs. diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index c84487805876..c1139aecdfbe 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -65,7 +65,6 @@ config SND_SOC_RK3399_GRU_SOUND depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP && SPI select SND_SOC_ROCKCHIP_I2S select SND_SOC_MAX98357A - select SND_SOC_RT5514 select SND_SOC_DA7219 select SND_SOC_RT5514_SPI help -- 2.9.0

3 4

[alsa-devel] [PATCH v6 00/12] AC97 device/driver model revamp
by Robert Jarzmik 05 Sep '17

05 Sep '17

Hi Lars, Mark, Charles, Lee, This is a revision for Lee, only targetted at wm97xx-core changes suggested by Lee. I hope I have every concern covered Lee, just le me know if it suits you. For easier spotting, I included in [1] the diff from the last serie. I kept Charles ack for patch 6/12 following Lee's review, if you don't agree Charles, I'll remove it. Cheers. -- Robert Robert Jarzmik (12): ALSA: ac97: split out the generic ac97 registers ALSA: ac97: add an ac97 bus ASoC: add new ac97 bus support ASoC: arm: make pxa2xx-ac97-lib ac97 codec agnostic Input: wm97xx: split out touchscreen registering mfd: wm97xx-core: core support for wm97xx Codec Input: wm97xx: add new AC97 bus support ASoC: wm9713: add ac97 new bus support ASoC: wm9712: add ac97 new bus support ASoC: wm9705: add private structure ASoC: wm9705: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/wm97xx-core.c | 252 ++++++++++----- drivers/mfd/Kconfig | 14 + drivers/mfd/Makefile | 1 + drivers/mfd/wm97xx-core.c | 379 ++++++++++++++++++++++ include/linux/mfd/wm97xx.h | 25 ++ include/sound/ac97/codec.h | 118 +++++++ include/sound/ac97/compat.h | 20 ++ include/sound/ac97/controller.h | 85 +++++ include/sound/ac97/regs.h | 262 ++++++++++++++++ include/sound/ac97_codec.h | 239 +------------- include/sound/pxa2xx-lib.h | 15 +- sound/Kconfig | 2 + sound/Makefile | 1 + sound/ac97/Kconfig | 19 ++ sound/ac97/Makefile | 8 + sound/ac97/ac97_core.h | 16 + sound/ac97/bus.c | 539 ++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 + sound/ac97/snd_ac97_compat.c | 108 +++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 37 ++- sound/arm/pxa2xx-ac97.c | 35 ++- sound/soc/codecs/Kconfig | 9 +- sound/soc/codecs/wm9705.c | 61 ++-- sound/soc/codecs/wm9712.c | 39 ++- sound/soc/codecs/wm9713.c | 39 ++- sound/soc/pxa/Kconfig | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 46 ++- 29 files changed, 1978 insertions(+), 414 deletions(-) create mode 100644 drivers/mfd/wm97xx-core.c create mode 100644 include/linux/mfd/wm97xx.h create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 include/sound/ac97/regs.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.11.0 [1] Diff from the previous serie ---8>--- diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 5ffe4f4dfa10..6d175698a49a 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1635,7 +1635,6 @@ config MFD_WM97xx select AC97_BUS_COMPAT depends on AC97_BUS_NEW help - The WM9705, WM9712 and WM9713 is a highly integrated hi-fi CODEC designed for smartphone applications. As well as audio functionality it has on board GPIO and a touchscreen functionality which is diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c index 473bbf9510e5..66e477fffd43 100644 --- a/drivers/mfd/wm97xx-core.c +++ b/drivers/mfd/wm97xx-core.c @@ -1,7 +1,7 @@ /* * Wolfson WM97xx -- Core device * - * Copyright (C) 2016 Robert Jarzmik + * Copyright (C) 2017 Robert Jarzmik * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,14 +14,13 @@ * - a GPIO block */ -#include <linux/module.h> - #include <linux/device.h> #include <linux/mfd/core.h> #include <linux/mfd/wm97xx.h> -#include <linux/wm97xx.h> +#include <linux/module.h> #include <linux/regmap.h> #include <linux/slab.h> +#include <linux/wm97xx.h> #include <sound/ac97/codec.h> #include <sound/ac97/compat.h> @@ -34,6 +33,7 @@ struct wm97xx_priv { struct regmap *regmap; struct snd_ac97 *ac97; struct device *dev; + struct wm97xx_platform_data codec_pdata; }; static bool wm97xx_readable_reg(struct device *dev, unsigned int reg) @@ -108,33 +108,14 @@ static const struct regmap_config wm9705_regmap_config = { .writeable_reg = wm97xx_writeable_reg, }; -static int wm9705_register(struct wm97xx_priv *wm97xx, - struct wm97xx_pdata *pdata) -{ - static struct wm97xx_platform_data codec_pdata; - static const struct mfd_cell cells[] = { - { - .name = "wm9705-codec", - .platform_data = &codec_pdata, - .pdata_size = sizeof(codec_pdata), - }, - { - .name = "wm97xx-ts", - .platform_data = &codec_pdata, - .pdata_size = sizeof(codec_pdata), - }, - }; - - codec_pdata.ac97 = wm97xx->ac97; - codec_pdata.regmap = devm_regmap_init_ac97(wm97xx->ac97, - &wm9705_regmap_config); - codec_pdata.batt_pdata = pdata->batt_pdata; - if (IS_ERR(codec_pdata.regmap)) - return PTR_ERR(codec_pdata.regmap); - - return devm_mfd_add_devices(wm97xx->dev, PLATFORM_DEVID_NONE, cells, - ARRAY_SIZE(cells), NULL, 0, NULL); -} +static struct mfd_cell wm9705_cells[] = { + { + .name = "wm9705-codec", + }, + { + .name = "wm97xx-ts", + }, +}; static bool wm9712_volatile_reg(struct device *dev, unsigned int reg) { @@ -199,33 +180,14 @@ static const struct regmap_config wm9712_regmap_config = { .writeable_reg = wm97xx_writeable_reg, }; -static int wm9712_register(struct wm97xx_priv *wm97xx, - struct wm97xx_pdata *pdata) -{ - static struct wm97xx_platform_data codec_pdata; - static const struct mfd_cell cells[] = { - { - .name = "wm9712-codec", - .platform_data = &codec_pdata, - .pdata_size = sizeof(codec_pdata), - }, - { - .name = "wm97xx-ts", - .platform_data = &codec_pdata, - .pdata_size = sizeof(codec_pdata), - }, - }; - - codec_pdata.ac97 = wm97xx->ac97; - codec_pdata.regmap = devm_regmap_init_ac97(wm97xx->ac97, - &wm9712_regmap_config); - codec_pdata.batt_pdata = pdata->batt_pdata; - if (IS_ERR(codec_pdata.regmap)) - return PTR_ERR(codec_pdata.regmap); - - return devm_mfd_add_devices(wm97xx->dev, PLATFORM_DEVID_NONE, cells, - ARRAY_SIZE(cells), NULL, 0, NULL); -} +static struct mfd_cell wm9712_cells[] = { + { + .name = "wm9712-codec", + }, + { + .name = "wm97xx-ts", + }, +}; static const struct reg_default wm9713_reg_defaults[] = { { 0x02, 0x8080 }, /* Speaker Output Volume */ @@ -293,39 +255,23 @@ static const struct regmap_config wm9713_regmap_config = { .writeable_reg = wm97xx_writeable_reg, }; -static int wm9713_register(struct wm97xx_priv *wm97xx, - struct wm97xx_pdata *pdata) -{ - static struct wm97xx_platform_data codec_pdata; - static const struct mfd_cell cells[] = { - { - .name = "wm9713-codec", - .platform_data = &codec_pdata, - .pdata_size = sizeof(codec_pdata), - }, - { - .name = "wm97xx-ts", - .platform_data = &codec_pdata, - .pdata_size = sizeof(codec_pdata), - }, - }; - - codec_pdata.ac97 = wm97xx->ac97; - codec_pdata.regmap = devm_regmap_init_ac97(wm97xx->ac97, - &wm9713_regmap_config); - codec_pdata.batt_pdata = pdata->batt_pdata; - if (IS_ERR(codec_pdata.regmap)) - return PTR_ERR(codec_pdata.regmap); - - return devm_mfd_add_devices(wm97xx->dev, PLATFORM_DEVID_NONE, cells, - ARRAY_SIZE(cells), NULL, 0, NULL); -} +static struct mfd_cell wm9713_cells[] = { + { + .name = "wm9713-codec", + }, + { + .name = "wm97xx-ts", + }, +}; static int wm97xx_ac97_probe(struct ac97_codec_device *adev) { struct wm97xx_priv *wm97xx; - int ret; - void *pdata = snd_ac97_codec_get_platdata(adev); + const struct regmap_config *config; + struct wm97xx_platform_data *codec_pdata; + struct mfd_cell *cells; + int ret = 0, nb_cells, i; + struct wm97xx_pdata *pdata = snd_ac97_codec_get_platdata(adev); wm97xx = devm_kzalloc(ac97_codec_dev2dev(adev), sizeof(*wm97xx), GFP_KERNEL); @@ -342,20 +288,48 @@ static int wm97xx_ac97_probe(struct ac97_codec_device *adev) dev_info(wm97xx->dev, "wm97xx core found, id=0x%x\n", adev->vendor_id); + codec_pdata = &wm97xx->codec_pdata; + codec_pdata->ac97 = wm97xx->ac97; + codec_pdata->batt_pdata = pdata->batt_pdata; + switch (adev->vendor_id) { case WM9705_VENDOR_ID: - ret = wm9705_register(wm97xx, pdata); + config = &wm9705_regmap_config; + cells = wm9705_cells; + nb_cells = ARRAY_SIZE(wm9705_cells); break; case WM9712_VENDOR_ID: - ret = wm9712_register(wm97xx, pdata); + config = &wm9712_regmap_config; + cells = wm9712_cells; + nb_cells = ARRAY_SIZE(wm9712_cells); break; case WM9713_VENDOR_ID: - ret = wm9713_register(wm97xx, pdata); + config = &wm9713_regmap_config; + cells = wm9713_cells; + nb_cells = ARRAY_SIZE(wm9713_cells); break; default: + config = NULL; + } + + for (i = 0; i < nb_cells; i++) { + cells[i].platform_data = codec_pdata; + cells[i].pdata_size = sizeof(*codec_pdata); + } + + if (config) { + codec_pdata->regmap = + devm_regmap_init_ac97(wm97xx->ac97, config); + if (IS_ERR(codec_pdata->regmap)) + ret = PTR_ERR(codec_pdata->regmap); + } else { ret = -ENODEV; } + if (!ret) + ret = devm_mfd_add_devices(wm97xx->dev, PLATFORM_DEVID_NONE, + cells, nb_cells, NULL, 0, NULL); + if (ret) snd_ac97_compat_release(wm97xx->ac97); diff --git a/include/linux/mfd/wm97xx.h b/include/linux/mfd/wm97xx.h index 627322f14d48..45fb54f19d09 100644 --- a/include/linux/mfd/wm97xx.h +++ b/include/linux/mfd/wm97xx.h @@ -1,17 +1,12 @@ /* * wm97xx client interface * - * Copyright (C) 2016 Robert Jarzmik + * Copyright (C) 2017 Robert Jarzmik * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #ifndef __LINUX_MFD_WM97XX_H @@ -27,5 +22,4 @@ struct wm97xx_platform_data { struct wm97xx_batt_pdata *batt_pdata; }; - #endif

5 18

[alsa-devel] [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop
by Lin Huang 05 Sep '17

05 Sep '17

From: huang lin <hl(a)rock-chips.com> on some board use enable pin to control dmic start and stop, so add this feature in dmic driver. Signed-off-by: Lin Huang <hl(a)rock-chips.com> --- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/dmic.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 010811e..d98233b 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -71,7 +71,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_DA732X if I2C select SND_SOC_DA9055 if I2C select SND_SOC_DIO2125 - select SND_SOC_DMIC + select SND_SOC_DMIC if GPIOLIB select SND_SOC_ES8316 if I2C select SND_SOC_ES8328_SPI if SPI_MASTER select SND_SOC_ES8328_I2C if I2C diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index 12e07f9..b88a1ee 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -19,6 +19,8 @@ * */ +#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/module.h> @@ -27,6 +29,34 @@ #include <sound/soc.h> #include <sound/soc-dapm.h> +static int dmic_daiops_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + struct gpio_desc *dmic_en = snd_soc_dai_get_drvdata(dai); + + if (!dmic_en) + return 0; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + gpiod_set_value(dmic_en, 1); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + gpiod_set_value(dmic_en, 0); + break; + } + + return 0; +} + +static const struct snd_soc_dai_ops dmic_dai_ops = { + .trigger = dmic_daiops_trigger, +}; + static struct snd_soc_dai_driver dmic_dai = { .name = "dmic-hifi", .capture = { @@ -38,8 +68,23 @@ static struct snd_soc_dai_driver dmic_dai = { | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE, }, + .ops = &dmic_dai_ops, }; +static int dmic_codec_probe(struct snd_soc_codec *codec) +{ + struct gpio_desc *dmic_en; + + dmic_en = devm_gpiod_get_optional(codec->dev, + "dmicen", GPIOD_OUT_LOW); + if (IS_ERR(dmic_en)) + return PTR_ERR(dmic_en); + + snd_soc_codec_set_drvdata(codec, dmic_en); + + return 0; +} + static const struct snd_soc_dapm_widget dmic_dapm_widgets[] = { SND_SOC_DAPM_AIF_OUT("DMIC AIF", "Capture", 0, SND_SOC_NOPM, 0, 0), @@ -51,6 +96,7 @@ static const struct snd_soc_dapm_route intercon[] = { }; static const struct snd_soc_codec_driver soc_dmic = { + .probe = dmic_codec_probe, .component_driver = { .dapm_widgets = dmic_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets), -- 2.7.4

4 4

[alsa-devel] [RFC PATCH 0/7] AC97 device/driver model revamp
by Robert Jarzmik 04 Sep '17

04 Sep '17

It all started in the pxa device-tree submission here : https://lkml.org/lkml/2016/2/25/965 It will be maintained in : git fetch https://github.com/rjarzmik/linux.git work/ac97 And now it transformed into this RFC, which would bring a ground for AC'97 devices closer to the linux device/driver model. This is just an RFC to see if we understand each other Mark. Amongst the driving ideas behind this RFC : - use device/driver model for AC'97 device/driver binding is based on vendor_id{1,2} - use auto-probe of the AC'97 bus to enumerate codecs and create devices - be compatible with previous platform_data model for codecs => this enables a smooth transition, where a codec (here wm9713) can be used either through platform_device or automatic discovery - struct snd_ac97 is not used This structure is really heavy, and doesn't represent an AC97 device, but rather an AC'97 codec internals IIUC. I think it's right place would be in include/sound/ac97/codec.h. This is also a problem for regmap adherence, hence the include/sound/ac97/compat.h. - a new AC'97 bus Kconfig is created This was done for a smooth transition ... let's see if it's a good idea. - split the AC'97 into : - the codec - the digital controller - the bus Amongst the things that are not all touched yet : - ac97_codec.c The generic AC'97 codec in sound/pci/ac97/ac97_codec.c has really a lot features, which are not at all PCI related. They could be transfered to sound/ac97, without the pci specific field. => this deserves a deep ahead thinking, which I'll do if the current approach is accepted by the communauty. The most important patch is 2/7 "ALSA: ac97: add an ac97 bus". This is the main evaluation point for the serie, the others are here so that I can test it all. Well, this is a long term effort, which might need a complete rewrite according to the comments it'll get. Let's expose it for comments and see how I can progress with it. Cheers. -- Robert Robert Jarzmik (7): ALSA: ac97: split out the generic ac97 registers ALSA: ac97: add an ac97 bus ASoC: wm9713: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support ARM: pxa: mioa701 remove wm9713 from platform devices ASoC: mioa701_wm9713: convert to new ac97 bus ASoC: add new ac97 bus support arch/arm/mach-pxa/mioa701.c | 1 - include/sound/ac97/codec.h | 98 ++++++++++++ include/sound/ac97/compat.h | 21 +++ include/sound/ac97/controller.h | 39 +++++ include/sound/ac97/regs.h | 262 +++++++++++++++++++++++++++++++ include/sound/ac97_codec.h | 239 +---------------------------- include/sound/pxa2xx-lib.h | 14 +- sound/Kconfig | 7 + sound/Makefile | 1 + sound/ac97/Kconfig | 9 ++ sound/ac97/Makefile | 5 + sound/ac97/ac97_core.h | 10 ++ sound/ac97/bus.c | 330 ++++++++++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 ++ sound/ac97/snd_ac97_compat.c | 104 +++++++++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 31 ++-- sound/soc/Kconfig | 4 + sound/soc/codecs/wm9713.c | 62 +++++++- sound/soc/pxa/Kconfig | 4 +- sound/soc/pxa/mioa701_wm9713.c | 4 +- sound/soc/pxa/pxa2xx-ac97.c | 12 +- 22 files changed, 1000 insertions(+), 273 deletions(-) create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 include/sound/ac97/regs.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.1.4

3 29

[alsa-devel] [PATCH v5 00/12] AC97 device/driver model revamp
by Robert Jarzmik 04 Sep '17

04 Sep '17

Hi Lars, Mark, Charles, Lee, This is a minor revision after v4, mainly reviews from Takashi, Charles. I extracted the diff from the v3 of sound/ac97 which is in [1] for easier spotting of what has globally changed. I tentatively kept your Ack Charles for patch 11/12, please shout if you disagree (there is an #ifdef added). I would still need a review from you, Lee, for the mfd patch (patch 6/12). Happy review. -- Robert Robert Jarzmik (12): ALSA: ac97: split out the generic ac97 registers ALSA: ac97: add an ac97 bus ASoC: add new ac97 bus support ASoC: arm: make pxa2xx-ac97-lib ac97 codec agnostic Input: wm97xx: split out touchscreen registering mfd: wm97xx-core: core support for wm97xx Codec Input: wm97xx: add new AC97 bus support ASoC: wm9713: add ac97 new bus support ASoC: wm9712: add ac97 new bus support ASoC: wm9705: add private structure ASoC: wm9705: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/wm97xx-core.c | 252 ++++++++++----- drivers/mfd/Kconfig | 15 + drivers/mfd/Makefile | 1 + drivers/mfd/wm97xx-core.c | 405 ++++++++++++++++++++++++ include/linux/mfd/wm97xx.h | 31 ++ include/sound/ac97/codec.h | 118 +++++++ include/sound/ac97/compat.h | 20 ++ include/sound/ac97/controller.h | 85 +++++ include/sound/ac97/regs.h | 262 ++++++++++++++++ include/sound/ac97_codec.h | 239 +------------- include/sound/pxa2xx-lib.h | 15 +- sound/Kconfig | 2 + sound/Makefile | 1 + sound/ac97/Kconfig | 19 ++ sound/ac97/Makefile | 8 + sound/ac97/ac97_core.h | 16 + sound/ac97/bus.c | 539 ++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 + sound/ac97/snd_ac97_compat.c | 108 +++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 37 ++- sound/arm/pxa2xx-ac97.c | 35 ++- sound/soc/codecs/Kconfig | 9 +- sound/soc/codecs/wm9705.c | 61 ++-- sound/soc/codecs/wm9712.c | 39 ++- sound/soc/codecs/wm9713.c | 39 ++- sound/soc/pxa/Kconfig | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 46 ++- 29 files changed, 2011 insertions(+), 414 deletions(-) create mode 100644 drivers/mfd/wm97xx-core.c create mode 100644 include/linux/mfd/wm97xx.h create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 include/sound/ac97/regs.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.11.0 [1] sound diff from last revision (git diff submit/ac97-3..submit/ac97-4 sound/ac97 include/sound/ac97) diff --git a/include/sound/ac97/compat.h b/include/sound/ac97/compat.h index d876464bf7e4..1351cba40048 100644 --- a/include/sound/ac97/compat.h +++ b/include/sound/ac97/compat.h @@ -13,7 +13,6 @@ #define AC97_COMPAT_H #include <sound/ac97_codec.h> -#include <sound/soc.h> struct snd_ac97 *snd_ac97_compat_alloc(struct ac97_codec_device *adev); void snd_ac97_compat_release(struct snd_ac97 *ac97); diff --git a/include/sound/ac97/controller.h b/include/sound/ac97/controller.h index 18c699925a85..b36ecdd64f14 100644 --- a/include/sound/ac97/controller.h +++ b/include/sound/ac97/controller.h @@ -8,12 +8,13 @@ #ifndef AC97_CONTROLLER_H #define AC97_CONTROLLER_H +#include <linux/device.h> #include <linux/list.h> #define AC97_BUS_MAX_CODECS 4 #define AC97_SLOTS_AVAILABLE_ALL 0xf -struct device; +struct ac97_controller_ops; /** * struct ac97_controller - The AC97 controller of the AC-Link @@ -21,8 +22,8 @@ struct device; * @controllers: linked list of all existing controllers. * @adap: the shell device ac97-%d, ie. ac97 adapter * @nr: the number of the shell device - * @parent: the device providing the AC97 controller. * @slots_available: the mask of accessible/scanable codecs. + * @parent: the device providing the AC97 controller. * @codecs: the 4 possible AC97 codecs (NULL if none found). * @codecs_pdata: platform_data for each codec (NULL if no pdata). * @@ -34,8 +35,8 @@ struct ac97_controller { struct list_head controllers; struct device adap; int nr; - struct device *parent; unsigned short slots_available; + struct device *parent; struct ac97_codec_device *codecs[AC97_BUS_MAX_CODECS]; void *codecs_pdata[AC97_BUS_MAX_CODECS]; }; diff --git a/sound/ac97/ac97_core.h b/sound/ac97/ac97_core.h index 219fec0d52e0..08441a4fda7c 100644 --- a/sound/ac97/ac97_core.h +++ b/sound/ac97/ac97_core.h @@ -8,3 +8,9 @@ unsigned int snd_ac97_bus_scan_one(struct ac97_controller *ac97, unsigned int codec_num); + +static inline bool ac97_ids_match(unsigned int id1, unsigned int id2, + unsigned int mask) +{ + return (id1 & mask) == (id2 & mask); +} diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c index af618a0e89cb..31f858eceffc 100644 --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -105,6 +105,7 @@ static int ac97_codec_add(struct ac97_controller *ac97_ctrl, int idx, return 0; err_free_codec: + put_device(&codec->dev); kfree(codec); ac97_ctrl->codecs[idx] = NULL; @@ -171,14 +172,10 @@ static int ac97_bus_reset(struct ac97_controller *ac97_ctrl) */ int snd_ac97_codec_driver_register(struct ac97_codec_driver *drv) { - int ret; - drv->driver.bus = &ac97_bus_type; - ret = driver_register(&drv->driver); - - return ret; + return driver_register(&drv->driver); } -EXPORT_SYMBOL(snd_ac97_codec_driver_register); +EXPORT_SYMBOL_GPL(snd_ac97_codec_driver_register); /** * snd_ac97_codec_driver_unregister - unregister an AC97 codec driver @@ -190,7 +187,7 @@ void snd_ac97_codec_driver_unregister(struct ac97_codec_driver *drv) { driver_unregister(&drv->driver); } -EXPORT_SYMBOL(snd_ac97_codec_driver_unregister); +EXPORT_SYMBOL_GPL(snd_ac97_codec_driver_unregister); /** * snd_ac97_codec_get_platdata - get platform_data @@ -208,7 +205,7 @@ void *snd_ac97_codec_get_platdata(const struct ac97_codec_device *adev) return ac97_ctrl->codecs_pdata[adev->num]; } -EXPORT_SYMBOL(snd_ac97_codec_get_platdata); +EXPORT_SYMBOL_GPL(snd_ac97_codec_get_platdata); static void ac97_ctrl_codecs_unregister(struct ac97_controller *ac97_ctrl) { @@ -359,7 +356,7 @@ struct ac97_controller *snd_ac97_controller_register( kfree(ac97_ctrl); return ERR_PTR(ret); } -EXPORT_SYMBOL(snd_ac97_controller_register); +EXPORT_SYMBOL_GPL(snd_ac97_controller_register); /** * snd_ac97_controller_unregister - unregister an ac97 controller @@ -370,7 +367,7 @@ void snd_ac97_controller_unregister(struct ac97_controller *ac97_ctrl) { ac97_del_adapter(ac97_ctrl); } -EXPORT_SYMBOL(snd_ac97_controller_unregister); +EXPORT_SYMBOL_GPL(snd_ac97_controller_unregister); #ifdef CONFIG_PM static int ac97_pm_runtime_suspend(struct device *dev) @@ -466,7 +463,7 @@ static int ac97_bus_match(struct device *dev, struct device_driver *drv) return false; do { - if ((id[i].id & id->mask) == (adev->vendor_id & id[i].mask)) + if (ac97_ids_match(id[i].id, adev->vendor_id, id[i].mask)) return true; } while (id[i++].id); diff --git a/sound/ac97/snd_ac97_compat.c b/sound/ac97/snd_ac97_compat.c index ac8d835c1513..61544e0d8de4 100644 --- a/sound/ac97/snd_ac97_compat.c +++ b/sound/ac97/snd_ac97_compat.c @@ -88,16 +88,19 @@ int snd_ac97_reset(struct snd_ac97 *ac97, bool try_warm, unsigned int id, { struct ac97_codec_device *adev = to_ac97_device(ac97->private_data); struct ac97_controller *actrl = adev->ac97_ctrl; + unsigned int scanned; if (try_warm) { compat_ac97_warm_reset(ac97); - if (snd_ac97_bus_scan_one(actrl, adev->num) == adev->vendor_id) + scanned = snd_ac97_bus_scan_one(actrl, adev->num); + if (ac97_ids_match(scanned, adev->vendor_id, id_mask)) return 1; } compat_ac97_reset(ac97); compat_ac97_warm_reset(ac97); - if (snd_ac97_bus_scan_one(actrl, adev->num) == adev->vendor_id) + scanned = snd_ac97_bus_scan_one(actrl, adev->num); + if (ac97_ids_match(scanned, adev->vendor_id, id_mask)) return 0; return -ENODEV;

3 16

[alsa-devel] [PATCH v4 00/12] AC97 device/driver model revamp
by Robert Jarzmik 04 Sep '17

04 Sep '17

Hi Lars, Mark, Charles, Lee, This is a minor revision after v3, mainly reviews from Takashi, Charles. I did more extensive testing of load/unload of the whole serie, and apart from a bug in wm97xx-core in touchscreen tree (for a which a patch will be sent apart), it seems to work properly. I extracted the diff from the v3 of sound/ac97 which is in [1] for easier spotting of what has globally changed. I would still need a review from you, Lee, for the mfd patch (patch 6/12). Happy review. -- Robert Robert Jarzmik (12): ALSA: ac97: split out the generic ac97 registers ALSA: ac97: add an ac97 bus ASoC: add new ac97 bus support ASoC: arm: make pxa2xx-ac97-lib ac97 codec agnostic Input: wm97xx: split out touchscreen registering mfd: wm97xx-core: core support for wm97xx Codec Input: wm97xx: add new AC97 bus support ASoC: wm9713: add ac97 new bus support ASoC: wm9712: add ac97 new bus support ASoC: wm9705: add private structure ASoC: wm9705: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/wm97xx-core.c | 252 ++++++++++----- drivers/mfd/Kconfig | 15 + drivers/mfd/Makefile | 1 + drivers/mfd/wm97xx-core.c | 405 ++++++++++++++++++++++++ include/linux/mfd/wm97xx.h | 31 ++ include/sound/ac97/codec.h | 118 +++++++ include/sound/ac97/compat.h | 21 ++ include/sound/ac97/controller.h | 84 +++++ include/sound/ac97/regs.h | 262 +++++++++++++++ include/sound/ac97_codec.h | 239 +------------- include/sound/pxa2xx-lib.h | 15 +- sound/Kconfig | 2 + sound/Makefile | 1 + sound/ac97/Kconfig | 19 ++ sound/ac97/Makefile | 8 + sound/ac97/ac97_core.h | 10 + sound/ac97/bus.c | 542 ++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 + sound/ac97/snd_ac97_compat.c | 105 +++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 37 ++- sound/arm/pxa2xx-ac97.c | 35 ++- sound/soc/codecs/Kconfig | 9 +- sound/soc/codecs/wm9705.c | 59 ++-- sound/soc/codecs/wm9712.c | 37 ++- sound/soc/codecs/wm9713.c | 39 ++- sound/soc/pxa/Kconfig | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 46 ++- 29 files changed, 2001 insertions(+), 414 deletions(-) create mode 100644 drivers/mfd/wm97xx-core.c create mode 100644 include/linux/mfd/wm97xx.h create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 include/sound/ac97/regs.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.11.0 [1] sound diff from last revision (git diff submit/ac97-2..submit/ac97-3 sound/ac97 include/sound/ac97) diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c index 7cda8175341e..af618a0e89cb 100644 --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -76,7 +76,6 @@ static void ac97_codec_release(struct device *dev) adev = to_ac97_device(dev); ac97_ctrl = adev->ac97_ctrl; ac97_ctrl->codecs[adev->num] = NULL; - sysfs_remove_link(&dev->kobj, "ac97_controller"); kfree(adev); } @@ -269,8 +268,29 @@ static const struct attribute_group *ac97_adapter_groups[] = { NULL, }; +static void ac97_del_adapter(struct ac97_controller *ac97_ctrl) +{ + mutex_lock(&ac97_controllers_mutex); + ac97_ctrl_codecs_unregister(ac97_ctrl); + list_del(&ac97_ctrl->controllers); + mutex_unlock(&ac97_controllers_mutex); + + device_unregister(&ac97_ctrl->adap); +} + +static void ac97_adapter_release(struct device *dev) +{ + struct ac97_controller *ac97_ctrl; + + ac97_ctrl = to_ac97_controller(dev); + idr_remove(&ac97_adapter_idr, ac97_ctrl->nr); + dev_dbg(&ac97_ctrl->adap, "adapter unregistered by %s\n", + dev_name(ac97_ctrl->parent)); +} + static const struct device_type ac97_adapter_type = { .groups = ac97_adapter_groups, + .release = ac97_adapter_release, }; static int ac97_add_adapter(struct ac97_controller *ac97_ctrl) @@ -298,16 +318,6 @@ static int ac97_add_adapter(struct ac97_controller *ac97_ctrl) return ret; } -static void ac97_del_adapter(struct ac97_controller *ac97_ctrl) -{ - mutex_lock(&ac97_controllers_mutex); - ac97_ctrl_codecs_unregister(ac97_ctrl); - list_del(&ac97_ctrl->controllers); - idr_remove(&ac97_adapter_idr, ac97_ctrl->nr); - mutex_unlock(&ac97_controllers_mutex); - put_device(&ac97_ctrl->adap); -} - /** * snd_ac97_controller_register - register an ac97 controller * @ops: the ac97 bus operations @@ -508,7 +518,7 @@ static int ac97_bus_remove(struct device *dev) } static struct bus_type ac97_bus_type = { - .name = "ac97", + .name = "ac97bus", .dev_groups = ac97_dev_groups, .match = ac97_bus_match, .pm = &ac97_pm, @@ -522,5 +532,11 @@ static int __init ac97_bus_init(void) } subsys_initcall(ac97_bus_init); +static void __exit ac97_bus_exit(void) +{ + bus_unregister(&ac97_bus_type); +} +module_exit(ac97_bus_exit); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Robert Jarzmik <robert.jarzmik(a)free.fr>");

4 19

[alsa-devel] [GIT PULL] cs43130 fixes
by Mark Brown 04 Sep '17

04 Sep '17

The following changes since commit 465c925695593b43695e2396f7279879a72275eb: ASoC: cs43130: Add devicetree bindings for CS43130 (2017-09-01 11:45:16 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.14-cs43130 for you to fetch changes up to 7051334672e54fae67e02d5d3296fb62b3343be7: ASoC: cs43130: Fix unused compiler warnings for PM runtime (2017-09-04 15:45:12 +0100) ---------------------------------------------------------------- ASoC: Fixes for the CS43130 driver A couple of warning fixes for the newly added CS43130 driver. ---------------------------------------------------------------- Colin Ian King (1): ASoC: cs43130: fix spelling mistake: "irq_occurrance" -> "irq_occurrence" Takashi Iwai (2): ASoC: cs43130: Fix possible Oops with invalid dev_id ASoC: cs43130: Fix unused compiler warnings for PM runtime sound/soc/codecs/cs43130.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)

2 1