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

[alsa-devel] [PATCH 1/2] ASoC: topology: Rename clock_gated to clock_cont in snd_soc_tplg_hw_config
by Kirill Marinushkin 20 Feb '18

20 Feb '18

In kernel `soc-dai.h`, DAI clock gating is defined as following: ~~~~ \#define SND_SOC_DAIFMT_CONT (1 << 4) /* continuous clock */ \#define SND_SOC_DAIFMT_GATED (0 << 4) /* clock is gated */ ~~~~ Therefore, the corresponding field of struct snd_soc_tplg_hw_config should be inverted compared to the current logic: clock_count = 1 => SND_SOC_DAIFMT_CONT clock_count = 0 => SND_SOC_DAIFMT_GATED Signed-off-by: Kirill Marinushkin <k.marinushkin(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org --- include/uapi/sound/asoc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 69c37ecbff7e..10188850dede 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -312,7 +312,9 @@ struct snd_soc_tplg_hw_config { __le32 size; /* in bytes of this structure */ __le32 id; /* unique ID - - used to match */ __le32 fmt; /* SND_SOC_DAI_FORMAT_ format value */ - __u8 clock_gated; /* 1 if clock can be gated to save power */ + __u8 clock_cont; /* 1 if clock is continuous, and can not be + * gated to save power + */ __u8 invert_bclk; /* 1 for inverted BCLK, 0 for normal */ __u8 invert_fsync; /* 1 for inverted frame clock, 0 for normal */ __u8 bclk_master; /* 1 for master of BCLK, 0 for slave */ -- 2.13.6

3 10

[alsa-devel] [PATCH] ALSA: hda-beep: add SPDX identifiers
by Matt Ranostay 20 Feb '18

20 Feb '18

Add SPDX GPLv2.0+ identifiers and update authors email Signed-off-by: Matt Ranostay <matt.ranostay(a)konsulko.com> --- sound/pci/hda/hda_beep.c | 17 ++--------------- sound/pci/hda/hda_beep.h | 17 ++--------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index c397e7da0eac..066b5b59c4d7 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c @@ -1,22 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Digital Beep Input Interface for HD-audio codec * - * Author: Matt Ranostay <mranostay(a)gmail.com> + * Author: Matt Ranostay <matt.ranostay(a)konsulko.com> * Copyright (c) 2008 Embedded Alley Solutions Inc - * - * This driver 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 driver 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/input.h> diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h index 1052ad380e97..d1a6a9c1329a 100644 --- a/sound/pci/hda/hda_beep.h +++ b/sound/pci/hda/hda_beep.h @@ -1,22 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Digital Beep Input Interface for HD-audio codec * - * Author: Matt Ranostay <mranostay(a)gmail.com> + * Author: Matt Ranostay <matt.ranostay(a)konsulko.com> * Copyright (c) 2008 Embedded Alley Solutions Inc - * - * This driver 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 driver 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __SOUND_HDA_BEEP_H -- 2.14.1

2 1

[alsa-devel] [PATCH] ASoC: codecs: ak5558: Fix style for SPDX identifier
by Daniel Baluta 20 Feb '18

20 Feb '18

Use // for .c and /* for .h files according to: Documentation/process/license-rules.rst file. Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- sound/soc/codecs/ak5558.c | 11 +++++------ sound/soc/codecs/ak5558.h | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/ak5558.c b/sound/soc/codecs/ak5558.c index f224831..f4ed5cc 100644 --- a/sound/soc/codecs/ak5558.c +++ b/sound/soc/codecs/ak5558.c @@ -1,10 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 -/* - * Audio driver for AK5558 ADC - * - * Copyright (C) 2015 Asahi Kasei Microdevices Corporation - * Copyright 2018 NXP - */ +// +// Audio driver for AK5558 ADC +// +// Copyright (C) 2015 Asahi Kasei Microdevices Corporation +// Copyright 2018 NXP #include <linux/delay.h> #include <linux/gpio/consumer.h> diff --git a/sound/soc/codecs/ak5558.h b/sound/soc/codecs/ak5558.h index 7c9e373..6105908 100644 --- a/sound/soc/codecs/ak5558.h +++ b/sound/soc/codecs/ak5558.h @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* +/* SPDX-License-Identifier: GPL-2.0 + * * Audio driver header for AK5558 * * Copyright (C) 2016 Asahi Kasei Microdevices Corporation -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: hdmi-codec: Fix module unloading caused kernel crash
by Peter Ujfalusi 20 Feb '18

20 Feb '18

The hcp->chmap_info must not be freed up in the hdmi_codec_remove() function as it leads to kernel crash due ALSA core's pcm_chmap_ctl_private_free() is trying to free it up again when the card destroyed via snd_card_free. Since the driver was converted to devm_snd_soc_register_component() the whole platform_device.remove can be removed. Commit cd6111b26280a ("ASoC: hdmi-codec: add channel mapping control") should not have added the kfree(hcp->chmap_info); to the hdmi_codec_remove function. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/codecs/hdmi-codec.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 42df579cb507..6fa11888672d 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -798,23 +798,11 @@ static int hdmi_codec_probe(struct platform_device *pdev) return 0; } -static int hdmi_codec_remove(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct hdmi_codec_priv *hcp; - - hcp = dev_get_drvdata(dev); - kfree(hcp->chmap_info); - - return 0; -} - static struct platform_driver hdmi_codec_driver = { .driver = { .name = HDMI_CODEC_DRV_NAME, }, .probe = hdmi_codec_probe, - .remove = hdmi_codec_remove, }; module_platform_driver(hdmi_codec_driver); -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

3 3

[alsa-devel] [PATCH v2] ASoC: hdmi-codec: Fix module unloading caused kernel crash
by Peter Ujfalusi 20 Feb '18

20 Feb '18

The hcp->chmap_info must not be freed up in the hdmi_codec_remove() function as it leads to kernel crash due ALSA core's pcm_chmap_ctl_private_free() is trying to free it up again when the card destroyed via snd_card_free. Commit cd6111b26280a ("ASoC: hdmi-codec: add channel mapping control") should not have added the kfree(hcp->chmap_info); to the hdmi_codec_remove function. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Reviewed-by: Jyri Sarha <jsarha(a)ti.com> Tested-by: Jyri Sarha <jsarha(a)ti.com> --- Hi, Changes since v1: - Rebased on mainline (4.16-rc2) Mainline does not have devm_ version of snd_soc_register_codec(), the hdmi_codec_remove callback can not be removed. Regards, Peter sound/soc/codecs/hdmi-codec.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 5672e516bec3..c1830ccd3bb8 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -798,12 +798,7 @@ static int hdmi_codec_probe(struct platform_device *pdev) static int hdmi_codec_remove(struct platform_device *pdev) { - struct device *dev = &pdev->dev; - struct hdmi_codec_priv *hcp; - - hcp = dev_get_drvdata(dev); - kfree(hcp->chmap_info); - snd_soc_unregister_codec(dev); + snd_soc_unregister_codec(&pdev->dev); return 0; } -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 1

[alsa-devel] [asoc:topic/topology 1/1] sound/soc/soc-topology.c:1985:33: error: 'SND_SOC_TPLG_DAI_CLK_GATE_GATED' undeclared; did you mean 'SND_SOC_TPLG_DAPM_AIF_OUT'?
by kbuild test robot 20 Feb '18

20 Feb '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/topology head: bdb86c40e8c5d2abe2ec7be964d621c1b7c27081 commit: bdb86c40e8c5d2abe2ec7be964d621c1b7c27081 [1/1] ASoC: topology: Add missing clock gating parameter when parsing hw_configs config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: git checkout bdb86c40e8c5d2abe2ec7be964d621c1b7c27081 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): sound/soc/soc-topology.c: In function 'set_link_hw_format': >> sound/soc/soc-topology.c:1985:33: error: 'SND_SOC_TPLG_DAI_CLK_GATE_GATED' undeclared (first use in this function); did you mean 'SND_SOC_TPLG_DAPM_AIF_OUT'? if (hw_config->clock_gated == SND_SOC_TPLG_DAI_CLK_GATE_GATED) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SND_SOC_TPLG_DAPM_AIF_OUT sound/soc/soc-topology.c:1985:33: note: each undeclared identifier is reported only once for each function it appears in >> sound/soc/soc-topology.c:1988:5: error: 'SND_SOC_TPLG_DAI_CLK_GATE_CONT' undeclared (first use in this function); did you mean 'SND_SOC_TPLG_DAI_CLK_GATE_GATED'? SND_SOC_TPLG_DAI_CLK_GATE_CONT) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SND_SOC_TPLG_DAI_CLK_GATE_GATED vim +1985 sound/soc/soc-topology.c 1959 1960 /** 1961 * set_link_hw_format - Set the HW audio format of the physical DAI link. 1962 * @link: &snd_soc_dai_link which should be updated 1963 * @cfg: physical link configs. 1964 * 1965 * Topology context contains a list of supported HW formats (configs) and 1966 * a default format ID for the physical link. This function will use this 1967 * default ID to choose the HW format to set the link's DAI format for init. 1968 */ 1969 static void set_link_hw_format(struct snd_soc_dai_link *link, 1970 struct snd_soc_tplg_link_config *cfg) 1971 { 1972 struct snd_soc_tplg_hw_config *hw_config; 1973 unsigned char bclk_master, fsync_master; 1974 unsigned char invert_bclk, invert_fsync; 1975 int i; 1976 1977 for (i = 0; i < cfg->num_hw_configs; i++) { 1978 hw_config = &cfg->hw_config[i]; 1979 if (hw_config->id != cfg->default_hw_config_id) 1980 continue; 1981 1982 link->dai_fmt = hw_config->fmt & SND_SOC_DAIFMT_FORMAT_MASK; 1983 1984 /* clock gating */ > 1985 if (hw_config->clock_gated == SND_SOC_TPLG_DAI_CLK_GATE_GATED) 1986 link->dai_fmt |= SND_SOC_DAIFMT_GATED; 1987 else if (hw_config->clock_gated == > 1988 SND_SOC_TPLG_DAI_CLK_GATE_CONT) 1989 link->dai_fmt |= SND_SOC_DAIFMT_CONT; 1990 1991 /* clock signal polarity */ 1992 invert_bclk = hw_config->invert_bclk; 1993 invert_fsync = hw_config->invert_fsync; 1994 if (!invert_bclk && !invert_fsync) 1995 link->dai_fmt |= SND_SOC_DAIFMT_NB_NF; 1996 else if (!invert_bclk && invert_fsync) 1997 link->dai_fmt |= SND_SOC_DAIFMT_NB_IF; 1998 else if (invert_bclk && !invert_fsync) 1999 link->dai_fmt |= SND_SOC_DAIFMT_IB_NF; 2000 else 2001 link->dai_fmt |= SND_SOC_DAIFMT_IB_IF; 2002 2003 /* clock masters */ 2004 bclk_master = hw_config->bclk_master; 2005 fsync_master = hw_config->fsync_master; 2006 if (!bclk_master && !fsync_master) 2007 link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; 2008 else if (bclk_master && !fsync_master) 2009 link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFM; 2010 else if (!bclk_master && fsync_master) 2011 link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFS; 2012 else 2013 link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; 2014 } 2015 } 2016 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH 0/2] Fix coding style issues in AK4458 DAC
by Cosmin-Gabriel Samoila 20 Feb '18

20 Feb '18

Modify SPDX license comment style and sort headers alphabetically. Cosmin-Gabriel Samoila (2): ASoC: ak4458: Modify SPDX license format ASoC: ak4458: Sort headers alphabetically sound/soc/codecs/ak4458.c | 23 +++++++++++------------ sound/soc/codecs/ak4458.h | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) -- 2.7.4

2 4

[alsa-devel] Applied "ASoC: Add DT bindings documentation for max9759 amplifier" to the asoc tree
by Mark Brown 20 Feb '18

20 Feb '18

The patch ASoC: Add DT bindings documentation for max9759 amplifier has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 01182d6529ae499bb73129f4766b45c2ae8e700b Mon Sep 17 00:00:00 2001 From: Neil Armstrong <narmstrong(a)baylibre.com> Date: Mon, 19 Feb 2018 14:45:57 +0100 Subject: [PATCH] ASoC: Add DT bindings documentation for max9759 amplifier This patch adds DT bindings documentation for Maxim MAX9759 speaker amplifier. Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> Reviewed-by: Rob Herring <robh(a)kernel.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- .../devicetree/bindings/sound/maxim,max9759.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.txt diff --git a/Documentation/devicetree/bindings/sound/maxim,max9759.txt b/Documentation/devicetree/bindings/sound/maxim,max9759.txt new file mode 100644 index 000000000000..737a996374d3 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/maxim,max9759.txt @@ -0,0 +1,18 @@ +Maxim MAX9759 Speaker Amplifier +=============================== + +Required properties: +- compatible : "maxim,max9759" +- shutdown-gpios : the gpio connected to the shutdown pin +- mute-gpios : the gpio connected to the mute pin +- gain-gpios : the 2 gpios connected to the g1 and g2 pins + +Example: + +max9759: analog-amplifier { + compatible = "maxim,max9759"; + shutdown-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>; + mute-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>; + gain-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>, + <&gpio3 25 GPIO_ACTIVE_LOW>; +}; -- 2.16.1

1 0

[alsa-devel] Applied "ASoC: max9759: Add Amplifier Driver" to the asoc tree
by Mark Brown 20 Feb '18

20 Feb '18

The patch ASoC: max9759: Add Amplifier Driver has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From fa8d915172b8c10ec0734c4021e99e9705023b07 Mon Sep 17 00:00:00 2001 From: Neil Armstrong <narmstrong(a)baylibre.com> Date: Mon, 19 Feb 2018 14:45:58 +0100 Subject: [PATCH] ASoC: max9759: Add Amplifier Driver The max9759 is a gpio controlled amplifier. Tested on a Variscite Dart MX6 SoM based custom board. Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/Kconfig | 5 ++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/max9759.c | 207 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+) create mode 100644 sound/soc/codecs/max9759.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2b331f7266ab..f9ea4603a903 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -98,6 +98,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX98373 if I2C select SND_SOC_MAX9850 if I2C select SND_SOC_MAX9860 if I2C + select SND_SOC_MAX9759 select SND_SOC_MAX9768 if I2C select SND_SOC_MAX9877 if I2C select SND_SOC_MC13783 if MFD_MC13XXX @@ -1187,6 +1188,10 @@ config SND_SOC_ZX_AUD96P22 config SND_SOC_LM4857 tristate +config SND_SOC_MAX9759 + tristate "Maxim MAX9759 speaker Amplifier" + select GPIOLIB + config SND_SOC_MAX9768 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index da1571336f1e..af4238d90c99 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -80,6 +80,7 @@ snd-soc-jz4740-codec-objs := jz4740.o snd-soc-l3-objs := l3.o snd-soc-lm4857-objs := lm4857.o snd-soc-lm49453-objs := lm49453.o +snd-soc-max9759-objs := max9759.o snd-soc-max9768-objs := max9768.o snd-soc-max98088-objs := max98088.o snd-soc-max98090-objs := max98090.o @@ -325,6 +326,7 @@ obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o obj-$(CONFIG_SND_SOC_LM4857) += snd-soc-lm4857.o obj-$(CONFIG_SND_SOC_LM49453) += snd-soc-lm49453.o +obj-$(CONFIG_SND_SOC_MAX9759) += snd-soc-max9759.o obj-$(CONFIG_SND_SOC_MAX9768) += snd-soc-max9768.o obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o obj-$(CONFIG_SND_SOC_MAX98090) += snd-soc-max98090.o diff --git a/sound/soc/codecs/max9759.c b/sound/soc/codecs/max9759.c new file mode 100644 index 000000000000..ecfb4a80424b --- /dev/null +++ b/sound/soc/codecs/max9759.c @@ -0,0 +1,207 @@ +// SPDX-Licence-Identifier: GPL-2.0 +/* + * MAX9759 Amplifier Driver + * + * Copyright (c) 2017 BayLibre, SAS. + * Author: Neil Armstrong <narmstrong(a)baylibre.com> + */ + +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/tlv.h> + +#define DRV_NAME "max9759" + +struct max9759 { + struct gpio_desc *gpiod_shutdown; + struct gpio_desc *gpiod_mute; + struct gpio_descs *gpiod_gain; + bool is_mute; + unsigned int gain; +}; + +static int pga_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *control, int event) +{ + struct snd_soc_component *c = snd_soc_dapm_to_component(w->dapm); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + if (SND_SOC_DAPM_EVENT_ON(event)) + gpiod_set_value_cansleep(priv->gpiod_shutdown, 0); + else + gpiod_set_value_cansleep(priv->gpiod_shutdown, 1); + + return 0; +} + +/* From 6dB to 24dB in steps of 6dB */ +static const DECLARE_TLV_DB_SCALE(speaker_gain_tlv, 600, 600, 0); + +static int speaker_gain_control_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + ucontrol->value.integer.value[0] = priv->gain; + + return 0; +} + +static const bool speaker_gain_table[4][2] = { + /* G1, G2 */ + {true, true}, /* +6dB */ + {false, true}, /* +12dB */ + {true, false}, /* +18dB */ + {false, false}, /* +24dB */ +}; + +static int speaker_gain_control_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + if (ucontrol->value.integer.value[0] > 3) + return -EINVAL; + + priv->gain = ucontrol->value.integer.value[0]; + + /* G1 */ + gpiod_set_value_cansleep(priv->gpiod_gain->desc[0], + speaker_gain_table[priv->gain][0]); + /* G2 */ + gpiod_set_value_cansleep(priv->gpiod_gain->desc[1], + speaker_gain_table[priv->gain][1]); + + return 1; +} + +static int speaker_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + ucontrol->value.integer.value[0] = !priv->is_mute; + + return 0; +} + +static int speaker_mute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + + priv->is_mute = !ucontrol->value.integer.value[0]; + + gpiod_set_value_cansleep(priv->gpiod_mute, priv->is_mute); + + return 1; +} + +static const struct snd_kcontrol_new max9759_dapm_controls[] = { + SOC_SINGLE_EXT_TLV("Speaker Gain Volume", 0, 0, 3, 0, + speaker_gain_control_get, speaker_gain_control_put, + speaker_gain_tlv), + SOC_SINGLE_BOOL_EXT("Playback Switch", 0, + speaker_mute_get, speaker_mute_put), +}; + +static const struct snd_soc_dapm_widget max9759_dapm_widgets[] = { + SND_SOC_DAPM_INPUT("INL"), + SND_SOC_DAPM_INPUT("INR"), + SND_SOC_DAPM_PGA_E("PGA", SND_SOC_NOPM, 0, 0, NULL, 0, pga_event, + (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD)), + SND_SOC_DAPM_OUTPUT("OUTL"), + SND_SOC_DAPM_OUTPUT("OUTR"), +}; + +static const struct snd_soc_dapm_route max9759_dapm_routes[] = { + { "PGA", NULL, "INL" }, + { "PGA", NULL, "INR" }, + { "OUTL", NULL, "PGA" }, + { "OUTR", NULL, "PGA" }, +}; + +static const struct snd_soc_component_driver max9759_component_driver = { + .controls = max9759_dapm_controls, + .num_controls = ARRAY_SIZE(max9759_dapm_controls), + .dapm_widgets = max9759_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max9759_dapm_widgets), + .dapm_routes = max9759_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(max9759_dapm_routes), +}; + +static int max9759_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct max9759 *priv; + int err; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + platform_set_drvdata(pdev, priv); + + priv->gpiod_shutdown = devm_gpiod_get(dev, "shutdown", GPIOD_OUT_HIGH); + if (IS_ERR(priv->gpiod_shutdown)) { + err = PTR_ERR(priv->gpiod_shutdown); + if (err != -EPROBE_DEFER) + dev_err(dev, "Failed to get 'shutdown' gpio: %d", err); + return err; + } + + priv->gpiod_mute = devm_gpiod_get(dev, "mute", GPIOD_OUT_HIGH); + if (IS_ERR(priv->gpiod_mute)) { + err = PTR_ERR(priv->gpiod_mute); + if (err != -EPROBE_DEFER) + dev_err(dev, "Failed to get 'mute' gpio: %d", err); + return err; + } + priv->is_mute = true; + + priv->gpiod_gain = devm_gpiod_get_array(dev, "gain", GPIOD_OUT_HIGH); + if (IS_ERR(priv->gpiod_gain)) { + err = PTR_ERR(priv->gpiod_gain); + if (err != -EPROBE_DEFER) + dev_err(dev, "Failed to get 'gain' gpios: %d", err); + return err; + } + priv->gain = 0; + + if (priv->gpiod_gain->ndescs != 2) { + dev_err(dev, "Invalid 'gain' gpios count: %d", + priv->gpiod_gain->ndescs); + return -EINVAL; + } + + return devm_snd_soc_register_component(dev, &max9759_component_driver, + NULL, 0); +} + +#ifdef CONFIG_OF +static const struct of_device_id max9759_ids[] = { + { .compatible = "maxim,max9759", }, + { } +}; +MODULE_DEVICE_TABLE(of, max9759_ids); +#endif + +static struct platform_driver max9759_driver = { + .driver = { + .name = DRV_NAME, + .of_match_table = of_match_ptr(max9759_ids), + }, + .probe = max9759_probe, +}; + +module_platform_driver(max9759_driver); + +MODULE_DESCRIPTION("ASoC MAX9759 amplifier driver"); +MODULE_AUTHOR("Neil Armstrong <narmstrong(a)baylibre.com>"); +MODULE_LICENSE("GPL"); -- 2.16.1

1 0

[alsa-devel] [PATCH 0/2] ASoC: Add support for max9759 Amplifier Driver
by Neil Armstrong 20 Feb '18

20 Feb '18

The MAX9759 is a gpio controlled speaker amplifier, this patchset add the DT Bindings and the corresponding ASoC component driver. Neil Armstrong (2): ASoC: Add DT bindings documentation for max9759 amplifier ASoC: max9759: Add Amplifier Driver .../devicetree/bindings/sound/maxim,max9759.txt | 18 ++ sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/max9759.c | 207 +++++++++++++++++++++ 4 files changed, 232 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.txt create mode 100644 sound/soc/codecs/max9759.c -- 2.7.4

3 4