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

[alsa-devel] [patch] ASoC: mediatek: mt2701: fix some error handling in probe
by Dan Carpenter 07 Jul '16

07 Jul '16

The check for if the "afe" allocation failed was too late and there wasn't a check for "afe->platform_priv". Fixes: 43a6a7e71063 ('ASoC: mediatek: add mt2701 platform driver implementation.') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c index c865ba1..fc5a87d 100644 --- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c +++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c @@ -1350,11 +1350,13 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) ret = 0; afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL); + if (!afe) + return -ENOMEM; afe->platform_priv = devm_kzalloc(&pdev->dev, sizeof(*afe_priv), GFP_KERNEL); - afe_priv = afe->platform_priv; - if (!afe) + if (!afe->platform_priv) return -ENOMEM; + afe_priv = afe->platform_priv; afe->dev = &pdev->dev; dev = afe->dev;

3 2

[alsa-devel] [PATCH 1/2] ASoC: rt5645: set RT5645_PRIV_INDEX as volatile
by Bard Liao 07 Jul '16

07 Jul '16

RT5645_PRIV_INDEX(0x6a) indicate the address of PR- registers. So, it should be volatile. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5645.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 97bf96e..9251720 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -441,6 +441,7 @@ static bool rt5645_volatile_register(struct device *dev, unsigned int reg) switch (reg) { case RT5645_RESET: + case RT5645_PRIV_INDEX: case RT5645_PRIV_DATA: case RT5645_IN1_CTRL1: case RT5645_IN1_CTRL2: -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] [PATCH] ASoC: atmel_ssc_dai: Fix DMA params for different SSC
by Peter Meerwald 07 Jul '16

07 Jul '16

From: Peter Meerwald <p.meerwald(a)bct-electronic.com> follow-up patch from c706f2e55f ASoC: atmel_ssc_dai: distinguish the different SSC cpu_dai id is always 0, use platform_device id to distinguish DMA parameters of SSCs Signed-off-by: Peter Meerwald-Stadler <p.meerwald(a)bct-electronic.com> Cc: "Wu, Songjun" <songjun.wu(a)atmel.com> Cc: Nicolas Ferre <nicolas.ferre(a)atmel.com> --- sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 841d059..c7daea8 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -320,7 +320,7 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, return ret; } - dma_params = &ssc_dma_params[dai->id][dir]; + dma_params = &ssc_dma_params[pdev->id][dir]; dma_params->ssc = ssc_p->ssc; dma_params->substream = substream; -- 2.9.0

2 1

[alsa-devel] [PATCH 0/3 v3] ALSA: ctl: add dimension information validator
by Takashi Sakamoto 07 Jul '16

07 Jul '16

This patchset is revised version of my previous one: [alsa-devel] [PATCH 0/3 v2] ALSA: ctl: add dimension information validator http://mailman.alsa-project.org/pipermail/alsa-devel/2016-July/109830.html Changes: * Apply simpler prevention of arithmetic overflow. Takashi Sakamoto (3): ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members ALSA: control: add dimension validator for userspace element ALSA: control: add dimension validator for kernel driver sound/core/control.c | 78 ++++++++++++++++++++++++++++++++--------- sound/pci/echoaudio/echoaudio.c | 6 ++-- 2 files changed, 65 insertions(+), 19 deletions(-) -- 2.7.4

2 10

[alsa-devel] [PATCH] ALSA: hda/realtek - add new pin definition in alc225 pin quirk table
by Hui Wang 07 Jul '16

07 Jul '16

We have some Dell laptops which can't detect headset mic, the machines use the codec ALC225, they have some new pin configuration values, after adding them in the alc225 pin quirk table, they work well. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 45d4dc1..e25ef2b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5753,7 +5753,6 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {} }; #define ALC225_STANDARD_PINS \ - {0x12, 0xb7a60130}, \ {0x21, 0x04211020} #define ALC256_STANDARD_PINS \ @@ -5778,9 +5777,19 @@ static const struct hda_model_fixup alc269_fixup_models[] = { static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, ALC225_STANDARD_PINS, + {0x12, 0xb7a60130}, {0x14, 0x901701a0}), SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, ALC225_STANDARD_PINS, + {0x12, 0xb7a60130}, + {0x14, 0x901701b0}), + SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, + ALC225_STANDARD_PINS, + {0x12, 0xb7a60150}, + {0x14, 0x901701a0}), + SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, + ALC225_STANDARD_PINS, + {0x12, 0xb7a60150}, {0x14, 0x901701b0}), SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE, {0x14, 0x90170110}, -- 1.9.1

2 2

[alsa-devel] [PATCH] ASoC: nau8825: jack connection decision with different insertion logic
by John Hsu 06 Jul '16

06 Jul '16

The original design only covers the jack insertion logic is active low. Add more condition to cover no matter the logic is active low and high. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 3f30e6e..a2f0d03 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1345,10 +1345,18 @@ EXPORT_SYMBOL_GPL(nau8825_enable_jack_detect); static bool nau8825_is_jack_inserted(struct regmap *regmap) { - int status; + int status, jkdet, res; regmap_read(regmap, NAU8825_REG_I2C_DEVICE_ID, &status); - return !(status & NAU8825_GPIO2JD1); + regmap_read(regmap, NAU8825_REG_JACK_DET_CTRL, &jkdet); + + /* return jack connection status according to jack insertion logic + * active high or active low. + */ + res = !(status & NAU8825_GPIO2JD1) * !(jkdet & NAU8825_JACK_POLARITY) + + (status & NAU8825_GPIO2JD1) * (jkdet & NAU8825_JACK_POLARITY); + + return res ? true : false; } static void nau8825_restart_jack_detection(struct regmap *regmap) -- 2.6.4

3 5

[alsa-devel] [PATCH 0/6] ASoC: simple-card: use asoc_simple_card_parse_xxx()
by Kuninori Morimoto 06 Jul '16

06 Jul '16

Hi Mark These are v3 of [PATCH 00/39 v2] ASoC: add simple-card-core and standardize "simple" card but as new patch series. These are separated into small pieces. Basically, these patches are util.c has new function -> simple-card use it. I will post next remain patches if previous patches was accepted. It will be 6 - 9 patches / 1 series. Now, util.c on mark/topic/simple branch has daifmt() function. So, 1) - 2) : use new daifmt() 3) - 5) : add new dailink_name() and use it. 6) : tidyup rsrc-card This existing rcar-card will be renamed to simple-dpcm-card in final patch. (Maybe we need to consider more better nameing) Kuninori Morimoto (6): 1) ASoC: simple-card: use asoc_simple_card_parse_daifmt() 2) ASoC: rsrc-card: use asoc_simple_card_parse_daifmt() 3) ASoC: simple-card-utils: add asoc_simple_card_parse_dailink_name() 4) ASoC: simple-card: use asoc_simple_card_parse_dailink_name() 5) ASoC: rsrc-card: use asoc_simple_card_parse_dailink_name() 6) ASoC: rsrc-card: use asoc_simple_dai instead of rsrc_card_dai include/sound/simple_card.h | 11 +---- include/sound/simple_card_utils.h | 12 +++++ sound/soc/generic/Kconfig | 1 + sound/soc/generic/simple-card-utils.c | 30 +++++++++++++ sound/soc/generic/simple-card.c | 60 ++----------------------- sound/soc/sh/Kconfig | 1 + sound/soc/sh/rcar/rsrc-card.c | 83 ++++++++--------------------------- 7 files changed, 67 insertions(+), 131 deletions(-) -- 1.9.1

2 10

[alsa-devel] [PATCH v3 1/2] sound: lpass-cpu: add module licence and description
by Srinivas Kandagatla 06 Jul '16

06 Jul '16

This patch adds module licence to lpass-cpu driver, without this patch lpass-cpu module would taint with below error: snd_soc_lpass_cpu: module license 'unspecified' taints kernel. Disabling lock debugging due to kernel taint snd_soc_lpass_cpu: Unknown symbol regmap_write (err 0) snd_soc_lpass_cpu: Unknown symbol devm_kmalloc (err 0) ... Acked-by: Kenneth Westfield <kwestfie(a)codeaurora.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/lpass-cpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 3cde9fb..eff3f9a 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -586,3 +586,6 @@ int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev) return 0; } EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_platform_remove); + +MODULE_DESCRIPTION("QTi LPASS CPU Driver"); +MODULE_LICENSE("GPL v2"); -- 2.7.4

2 2

[alsa-devel] [PATCH v4 3/4] ASoC: samsung: Add DT bindings documentation for TM2 sound subsystem
by Sylwester Nawrocki 05 Jul '16

05 Jul '16

This patch adds DT binding documentation for Exnos5433 based TM2 and TM2E boards sound subsystem. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Acked-by: Rob Herring <robh(a)kernel.org> --- Changes since v2: - none. Changes since initial version: - dropped clocks, clock-names properties, instead properties from the CODEC node will be used, - property renames: 'samsung,model' -> 'model', 'samsung,i2s-controller' -> 'i2s-controller', 'samsung,speaker-amplifier' -> 'audio-amplifier', - added 'audio-codec' property. --- .../bindings/sound/samsung,tm2-audio.txt | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt diff --git a/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt b/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt new file mode 100644 index 0000000..3ae56f3 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt @@ -0,0 +1,36 @@ +Samsung Exynos5433 TM2(E) audio complex with WM5110 codec + +Required properties: + + - compatible : "samsung,tm2-audio" + - model : the user-visible name of this sound complex + - audio-codec: the phandle of the wm5110 audio codec node, + as described in Documentation/devicetree/bindings/mfd/arizona.txt + - i2s-controller : the phandle of the I2S controller + - audio-amplifier : the phandle of the MAX98504 amplifier + - samsung,audio-routing : a list of the connections between audio + components; each entry is a pair of strings, the first being the + connection's sink, the second being the connection's source; + valid names for sources and sinks are the WM5110's and MAX98504's + pins and the jacks on the board: + HP, SPK, Main Mic, Sub Mic, Third Mic, Headset Mic. + - mic-bias-gpios : GPIO pin that enables the Main Mic bias regulator + +Example: + +sound { + compatible = "samsung,tm2-audio"; + audio-codec = <&wm5110>; + i2s-controller = <&i2s0>; + audio-amplifier = <&max98504>; + mic-bias-gpios = <&gpr3 2 0>; + model = "wm5110"; + samsung,audio-routing = + "HP", "HPOUT1L", + "HP", "HPOUT1R", + "SPK", "SPKOUT", + "SPKOUT", "HPOUT2L", + "SPKOUT", "HPOUT2R", + "Main Mic", "MICBIAS2", + "IN1R", "Main Mic"; +}; -- 1.9.1

1 0

[alsa-devel] [PATCH v4 0/4] ASoC: samsung: Sound support for Exynos5433 TM2(E) boards
by Sylwester Nawrocki 05 Jul '16

05 Jul '16

This patch series adds a MFD driver for Samsung Exynos5433 SoC Low Power Audio Subsystem and an ASoC machine driver for Exynos5433 based TM2/TM2E boards. The changes since v3 are listed in individual patches, the main change was rewriting LPASS driver as a MFD driver. It seems much better now as the dependencies between LPASS Top block and its IP sub-blocks are properly taken care of. Sylwester Nawrocki (4): mfd: Add DT bindings documentation for Samsung Exynos LPASS mfd: Add Samsung Exynos Low Power Audio Subsystem driver ASoC: samsung: Add DT bindings documentation for TM2 sound subsystem ASoC: samsung: Add machine driver for Exynos5433 based TM2 board .../bindings/mfd/samsung,exynos5433-lpass.txt | 21 + .../bindings/sound/samsung,tm2-audio.txt | 36 ++ drivers/mfd/Kconfig | 8 + drivers/mfd/Makefile | 1 + drivers/mfd/exynos-lpass.c | 185 +++++++ include/linux/mfd/syscon/exynos5-pmu.h | 4 +- sound/soc/samsung/Kconfig | 9 + sound/soc/samsung/Makefile | 2 + sound/soc/samsung/tm2_wm5110.c | 579 +++++++++++++++++++++ 9 files changed, 844 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt create mode 100644 drivers/mfd/exynos-lpass.c create mode 100644 sound/soc/samsung/tm2_wm5110.c -- 1.9.1

1 0