Skip to contentSkip to conversation

ASoC: add generic simple-amplifier support

PATCH In review Nicolò Veronese 4 participants 12 messages Jun 25, 2018 – Jun 26, 2018

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ASoC: add generic simple-amplifier support

Many boards have speaker amplifier attached on an analog output. Most of them are only managed by a mute or shutdown GPIO.
In order to reduce duplicate driver, this patch adds generic/simple-amplifier.

---
 sound/soc/generic/Kconfig            |   5 ++
 sound/soc/generic/Makefile           |   2 +
 sound/soc/generic/simple-amplifier.c | 109 +++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 sound/soc/generic/simple-amplifier.c
sound/soc/generic/Kconfig +5 -0
index c954be0..ace17c3a 100644
@@ -7,6 +7,11 @@ config SND_SIMPLE_CARD
 	help
 	  This option enables generic simple sound card support
 
+config SND_SIMPLE_AMPLIFIER
+	tristate "ASoC Simple Amplifier support"
+	help
+	  This option enables generic simple amplifier support
+
 config SND_SIMPLE_SCU_CARD
 	tristate "ASoC Simple SCU sound card support"
 	depends on OF
sound/soc/generic/Makefile +2 -0
index 9dec293..805a746 100644
@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0
 snd-soc-simple-card-utils-objs	:= simple-card-utils.o
 snd-soc-simple-card-objs	:= simple-card.o
+snd-soc-simple-amplifier-objs		:= simple-amplifier.o
 snd-soc-simple-scu-card-objs	:= simple-scu-card.o
 snd-soc-audio-graph-card-objs	:= audio-graph-card.o
 snd-soc-audio-graph-scu-card-objs	:= audio-graph-scu-card.o
 
 obj-$(CONFIG_SND_SIMPLE_CARD_UTILS)	+= snd-soc-simple-card-utils.o
 obj-$(CONFIG_SND_SIMPLE_CARD)		+= snd-soc-simple-card.o
+obj-$(CONFIG_SND_SIMPLE_AMPLIFIER)		+= snd-soc-simple-amplifier.o
 obj-$(CONFIG_SND_SIMPLE_SCU_CARD)	+= snd-soc-simple-scu-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_CARD)	+= snd-soc-audio-graph-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_SCU_CARD)	+= snd-soc-audio-graph-scu-card.o
sound/soc/generic/simple-amplifier.c new file +109 -0

109 lines not on this page · raw message

Signature · 6 lines
2.7.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#1 lore raw

PATCH 2/2 ASoC: simple-amplifier: add dt-bindings

---
 .../devicetree/bindings/sound/simple-amplifier.txt | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/simple-amplifier.txt
Documentation/devicetree/bindings/sound/simple-amplifier.txt new file +36 -0
new file mode 100644
index 0000000..1c2b57c
@@ -0,0 +1,36 @@
+Simple-Amplifier:
+
+Simple-Amplifier specifies a simple aux device for your codec.
+Most aplifiers are managed by a single GPIO. The main function
+of this driver is to toggle the MUTE/SHUTDOWN GPIO.
+
+Required properties:
+
+- compatible	: "simple-audio-amplifier"
+
+- VCC-supply	: power supply for the device, as covered
+in Documentation/devicetree/bindings/regulator/regulator.txt
+
+Optional properties:
+
+- shutdown-gpios	: The gpio to be toggled on and off
+to shutdown the amplifier when not in use. as covered
+in Documentation/gpio/board.txt
+
+Example:
+
+sound {
+	compatible = "simple-audio-card";
+	...
+	simple-audio-card,routing =
+		"LEFT AMP IN", "LINE_OUT_LEFT",
+		"RIGHT AMP IN", "LINE_OUT_RIGHT";
+	simple-audio-card,aux-devs = <&amp>;
+	...
+};
+
+amp: amplifier {
+	compatible = "simple-audio-amplifier";
+	VCC-supply = <&regulator>
+	shutdown-gpios = <&r_pio 2 GPIO_ACTIVE_LOW>;
+};
Signature · 6 lines
2.7.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
maintainer
#2 lore raw
In reply to Nicolò Veronese
Quoted 3 lines · Nicolò Veronese

Many boards have speaker amplifier attached on an analog output. Most of them are only managed by a mute or shutdown GPIO.
In order to reduce duplicate driver, this patch adds generic/simple-amplifier.

Copying in Hans who has a machine that needs something like this, not deleting context for his benefit.

This looks good to me, one coding style thing below but otherwise the main thing I'm thinking is that we might want to add a mono channel as well for simplicity when wiring up a system using a mono amplifier. That could always be done later though.

Quoted 58 lines
---
 sound/soc/generic/Kconfig            |   5 ++
 sound/soc/generic/Makefile           |   2 +
 sound/soc/generic/simple-amplifier.c | 109 +++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 sound/soc/generic/simple-amplifier.c
sound/soc/generic/Kconfig +5 -0
index c954be0..ace17c3a 100644
@@ -7,6 +7,11 @@ config SND_SIMPLE_CARD
 	help
 	  This option enables generic simple sound card support
 
+config SND_SIMPLE_AMPLIFIER
+	tristate "ASoC Simple Amplifier support"
+	help
+	  This option enables generic simple amplifier support
+
 config SND_SIMPLE_SCU_CARD
 	tristate "ASoC Simple SCU sound card support"
 	depends on OF
sound/soc/generic/Makefile +2 -0
index 9dec293..805a746 100644
@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0
 snd-soc-simple-card-utils-objs	:= simple-card-utils.o
 snd-soc-simple-card-objs	:= simple-card.o
+snd-soc-simple-amplifier-objs		:= simple-amplifier.o
 snd-soc-simple-scu-card-objs	:= simple-scu-card.o
 snd-soc-audio-graph-card-objs	:= audio-graph-card.o
 snd-soc-audio-graph-scu-card-objs	:= audio-graph-scu-card.o
 
 obj-$(CONFIG_SND_SIMPLE_CARD_UTILS)	+= snd-soc-simple-card-utils.o
 obj-$(CONFIG_SND_SIMPLE_CARD)		+= snd-soc-simple-card.o
+obj-$(CONFIG_SND_SIMPLE_AMPLIFIER)		+= snd-soc-simple-amplifier.o
 obj-$(CONFIG_SND_SIMPLE_SCU_CARD)	+= snd-soc-simple-scu-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_CARD)	+= snd-soc-audio-graph-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_SCU_CARD)	+= snd-soc-audio-graph-scu-card.o
sound/soc/generic/simple-amplifier.c new file +8 -0
new file mode 100644
index 0000000..e135a43
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: GPL-2.0
+// ALSA SoC simple amplifier driver
+//
+// Copyright 2018
+// Author:  Nicolò Veronese <[email protected]>
+
+#include <linux/module.h>
+#include <linux/platform_device.h>

sound/soc/generic/simple-amplifier.c line 18

Quoted 10 lines
sound/soc/generic/simple-amplifier.c new file +10 -0
+#include <linux/gpio/consumer.h>
+#include <linux/regulator/consumer.h>
+
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+/* This struct is used to save the context */
+struct simple_amp_data {
+	struct device *dev;
+	struct regmap *regmap;

You don't need a regmap here.

Quoted 49 lines
sound/soc/generic/simple-amplifier.c new file +49 -0
+	struct gpio_desc *power_gpio;
+};
+
+static int simple_amp_power_event(struct snd_soc_dapm_widget *widget,
+				 struct snd_kcontrol *kctrl, int event)
+{
+	struct snd_soc_component *c = snd_soc_dapm_to_component(widget->dapm);
+	struct simple_amp_data *data = snd_soc_component_get_drvdata(c);
+
+	/* Shutdown GPIO */
+    if (data->power_gpio)
+        gpiod_set_value_cansleep(data->power_gpio, SND_SOC_DAPM_EVENT_ON(event));
+
+	return 0;
+}
+
+static const struct snd_soc_dapm_widget simple_amp_dapm_widgets[] = {
+	SND_SOC_DAPM_INPUT("LEFT AMP IN"),
+	SND_SOC_DAPM_INPUT("RIGHT AMP IN"),
+
+	SND_SOC_DAPM_OUTPUT("SPK LEFT"),
+	SND_SOC_DAPM_OUTPUT("SPK RIGHT"),
+
+	SND_SOC_DAPM_REGULATOR_SUPPLY("VCC", 20, 0),
+	SND_SOC_DAPM_SPK("MUTE", simple_amp_power_event),
+};
+
+static const struct snd_soc_dapm_route simple_amp_dapm_routes[] = {
+	{ "MUTE", NULL, "LEFT AMP IN" },
+	{ "MUTE", NULL, "RIGHT AMP IN" },
+
+	{ "SPK LEFT", NULL, "VCC" },
+	{ "SPK RIGHT", NULL, "VCC" },
+
+	{ "SPK LEFT", NULL, "MUTE" },
+	{ "SPK RIGHT", NULL, "MUTE" },
+};
+
+static const struct snd_soc_component_driver simple_amp_component_driver = {
+	.name = "simple-amplifier",
+	.dapm_widgets = simple_amp_dapm_widgets,
+	.num_dapm_widgets = ARRAY_SIZE(simple_amp_dapm_widgets),
+	.dapm_routes = simple_amp_dapm_routes,
+	.num_dapm_routes = ARRAY_SIZE(simple_amp_dapm_routes),
+};
+
+static int asoc_simple_amp_probe(struct platform_device *pdev)
+{
+	struct simple_amp_data *data;

sound/soc/generic/simple-amplifier.c line 77

Quoted 10 lines
sound/soc/generic/simple-amplifier.c new file +10 -0
+	struct device *dev = &pdev->dev;
+	int ret;
+
+	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+	data->dev = &pdev->dev;
+	platform_set_drvdata(pdev, data);
+
+	if(of_property_read_bool(pdev->dev.of_node,"shutdown-gpios")) {

Coding style: should be if (

Quoted 35 lines
sound/soc/generic/simple-amplifier.c new file +32 -0
+		data->power_gpio = devm_gpiod_get_optional(&pdev->dev, "shutdown", GPIOD_OUT_LOW);
+
+		if (IS_ERR(data->power_gpio)) {
+			ret = PTR_ERR(data->power_gpio);
+			dev_err(&pdev->dev, "Failed to get shutdown gpio: %d\n", ret);
+			return ret;
+		}
+	}
+
+	return devm_snd_soc_register_component(dev,
+			&simple_amp_component_driver, NULL, 0);
+}
+
+static const struct of_device_id asoc_simple_of_match[] = {
+	{ .compatible = "simple-audio-amplifier", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
+
+static struct platform_driver asoc_simple_amp = {
+	.driver = {
+		.name = "asoc-simple-amplifier",
+		.of_match_table = of_match_ptr(asoc_simple_of_match),
+	},
+	.probe = asoc_simple_amp_probe,
+};
+
+module_platform_driver(asoc_simple_amp);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("ASoC Simple Amplifier");
+MODULE_AUTHOR("Nicolò Veronese <[email protected]>");
Signature · 1 line
2.7.4
#3 lore raw
Quoted 5 lines · Mark Brown
Quoted 3 lines · Nicolò Veronese

Many boards have speaker amplifier attached on an analog output. Most of them are only managed by a mute or shutdown GPIO.
In order to reduce duplicate driver, this patch adds generic/simple-amplifier.

Quoted 10 lines

Copying in Hans who has a machine that needs something like this, not deleting context for his benefit.

This looks good to me, one coding style thing below but otherwise the main thing I'm thinking is that we might want to add a mono channel as well for simplicity when wiring up a system using a mono amplifier. That could always be done later though.

Quoted 2 lines

Hi Nicolo,

Same comment as on IRC, you driver looks very similar to the one I posted a while back (sound/soc/codecs/dio2125.c)

Could you just add your compatible to the list in the existing driver ? Is there anything I missed which makes them incompatible ?

Regards
Jerome

Quoted 163 lines
Quoted 56 lines
---
 sound/soc/generic/Kconfig            |   5 ++
 sound/soc/generic/Makefile           |   2 +
 sound/soc/generic/simple-amplifier.c | 109 +++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 sound/soc/generic/simple-amplifier.c
sound/soc/generic/Kconfig +5 -0
index c954be0..ace17c3a 100644
@@ -7,6 +7,11 @@ config SND_SIMPLE_CARD
 	help
 	  This option enables generic simple sound card support
 
+config SND_SIMPLE_AMPLIFIER
+	tristate "ASoC Simple Amplifier support"
+	help
+	  This option enables generic simple amplifier support
+
 config SND_SIMPLE_SCU_CARD
 	tristate "ASoC Simple SCU sound card support"
 	depends on OF
sound/soc/generic/Makefile +2 -0
index 9dec293..805a746 100644
@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0
 snd-soc-simple-card-utils-objs	:= simple-card-utils.o
 snd-soc-simple-card-objs	:= simple-card.o
+snd-soc-simple-amplifier-objs		:= simple-amplifier.o
 snd-soc-simple-scu-card-objs	:= simple-scu-card.o
 snd-soc-audio-graph-card-objs	:= audio-graph-card.o
 snd-soc-audio-graph-scu-card-objs	:= audio-graph-scu-card.o
 
 obj-$(CONFIG_SND_SIMPLE_CARD_UTILS)	+= snd-soc-simple-card-utils.o
 obj-$(CONFIG_SND_SIMPLE_CARD)		+= snd-soc-simple-card.o
+obj-$(CONFIG_SND_SIMPLE_AMPLIFIER)		+= snd-soc-simple-amplifier.o
 obj-$(CONFIG_SND_SIMPLE_SCU_CARD)	+= snd-soc-simple-scu-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_CARD)	+= snd-soc-audio-graph-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_SCU_CARD)	+= snd-soc-audio-graph-scu-card.o
sound/soc/generic/simple-amplifier.c new file +8 -0
new file mode 100644
index 0000000..e135a43
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: GPL-2.0
+// ALSA SoC simple amplifier driver
+//
+// Copyright 2018
+// Author:  Nicolò Veronese <[email protected]>
+
+#include <linux/module.h>
+#include <linux/platform_device.h>

sound/soc/generic/simple-amplifier.c line 18

Quoted 10 lines
sound/soc/generic/simple-amplifier.c new file +10 -0
+#include <linux/gpio/consumer.h>
+#include <linux/regulator/consumer.h>
+
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+/* This struct is used to save the context */
+struct simple_amp_data {
+	struct device *dev;
+	struct regmap *regmap;

You don't need a regmap here.

Quoted 49 lines
sound/soc/generic/simple-amplifier.c new file +49 -0
+	struct gpio_desc *power_gpio;
+};
+
+static int simple_amp_power_event(struct snd_soc_dapm_widget *widget,
+				 struct snd_kcontrol *kctrl, int event)
+{
+	struct snd_soc_component *c = snd_soc_dapm_to_component(widget->dapm);
+	struct simple_amp_data *data = snd_soc_component_get_drvdata(c);
+
+	/* Shutdown GPIO */
+    if (data->power_gpio)
+        gpiod_set_value_cansleep(data->power_gpio, SND_SOC_DAPM_EVENT_ON(event));
+
+	return 0;
+}
+
+static const struct snd_soc_dapm_widget simple_amp_dapm_widgets[] = {
+	SND_SOC_DAPM_INPUT("LEFT AMP IN"),
+	SND_SOC_DAPM_INPUT("RIGHT AMP IN"),
+
+	SND_SOC_DAPM_OUTPUT("SPK LEFT"),
+	SND_SOC_DAPM_OUTPUT("SPK RIGHT"),
+
+	SND_SOC_DAPM_REGULATOR_SUPPLY("VCC", 20, 0),
+	SND_SOC_DAPM_SPK("MUTE", simple_amp_power_event),
+};
+
+static const struct snd_soc_dapm_route simple_amp_dapm_routes[] = {
+	{ "MUTE", NULL, "LEFT AMP IN" },
+	{ "MUTE", NULL, "RIGHT AMP IN" },
+
+	{ "SPK LEFT", NULL, "VCC" },
+	{ "SPK RIGHT", NULL, "VCC" },
+
+	{ "SPK LEFT", NULL, "MUTE" },
+	{ "SPK RIGHT", NULL, "MUTE" },
+};
+
+static const struct snd_soc_component_driver simple_amp_component_driver = {
+	.name = "simple-amplifier",
+	.dapm_widgets = simple_amp_dapm_widgets,
+	.num_dapm_widgets = ARRAY_SIZE(simple_amp_dapm_widgets),
+	.dapm_routes = simple_amp_dapm_routes,
+	.num_dapm_routes = ARRAY_SIZE(simple_amp_dapm_routes),
+};
+
+static int asoc_simple_amp_probe(struct platform_device *pdev)
+{
+	struct simple_amp_data *data;

sound/soc/generic/simple-amplifier.c line 77

Quoted 10 lines
sound/soc/generic/simple-amplifier.c new file +10 -0
+	struct device *dev = &pdev->dev;
+	int ret;
+
+	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+	data->dev = &pdev->dev;
+	platform_set_drvdata(pdev, data);
+
+	if(of_property_read_bool(pdev->dev.of_node,"shutdown-gpios")) {

Coding style: should be if (

Quoted 32 lines
sound/soc/generic/simple-amplifier.c new file +32 -0
+		data->power_gpio = devm_gpiod_get_optional(&pdev->dev, "shutdown", GPIOD_OUT_LOW);
+
+		if (IS_ERR(data->power_gpio)) {
+			ret = PTR_ERR(data->power_gpio);
+			dev_err(&pdev->dev, "Failed to get shutdown gpio: %d\n", ret);
+			return ret;
+		}
+	}
+
+	return devm_snd_soc_register_component(dev,
+			&simple_amp_component_driver, NULL, 0);
+}
+
+static const struct of_device_id asoc_simple_of_match[] = {
+	{ .compatible = "simple-audio-amplifier", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
+
+static struct platform_driver asoc_simple_amp = {
+	.driver = {
+		.name = "asoc-simple-amplifier",
+		.of_match_table = of_match_ptr(asoc_simple_of_match),
+	},
+	.probe = asoc_simple_amp_probe,
+};
+
+module_platform_driver(asoc_simple_amp);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("ASoC Simple Amplifier");
+MODULE_AUTHOR("Nicolò Veronese <[email protected]>");
Quoted 8 lines
Quoted 3 lines
Signature · 1 line
2.7.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

maintainer
#4 lore raw
Quoted 5 lines · Jerome Brunet

Same comment as on IRC, you driver looks very similar to the one I posted a while back (sound/soc/codecs/dio2125.c)

Could you just add your compatible to the list in the existing driver ? Is there anything I missed which makes them incompatible ?

It's probably a good idea to rename that driver so it's a bit more discoverable - you're absolutely right that it's very similar and doing basically the same thing but I'd completely forgotten that it existed :/

#5 lore raw
Quoted 10 lines · Mark Brown
Quoted 4 lines · Jerome Brunet

Same comment as on IRC, you driver looks very similar to the one I posted a while back (sound/soc/codecs/dio2125.c)
Could you just add your compatible to the list in the existing driver ? Is there anything I missed which makes them incompatible ?

It's probably a good idea to rename that driver so it's a bit more discoverable - you're absolutely right that it's very similar and doing basically the same thing but I'd completely forgotten that it existed :/

Agreed , the name is poorly chosen. I did not thought it was a generic need at the time.

Nicolò, do you want to do the remame ? or would you prefer me to do it ?

Cheers
Jerome
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#6 lore raw

If you can do it, it's better.
I'm still learning, take care that the "simple-amplifier" can support supplys.

Regards,
Nicolò

Il giorno lun 25 giu 2018 alle ore 13:51 Jerome Brunet <[email protected]> ha scritto:

Quoted 13 lines · Mark Brown
Quoted 3 lines · Jerome Brunet
Quoted 2 lines

Same comment as on IRC, you driver looks very similar to the one I

posted a

Quoted 7 lines
Quoted 3 lines

while back (sound/soc/codecs/dio2125.c)
Could you just add your compatible to the list in the existing driver ? Is there anything I missed which makes them incompatible ?

It's probably a good idea to rename that driver so it's a bit more discoverable - you're absolutely right that it's very similar and doing basically the same thing but I'd completely forgotten that it existed :/

Quoted 9 lines

Agreed , the name is poorly chosen. I did not thought it was a generic need at
the time.

Nicolò, do you want to do the remame ? or would you prefer me to do it ?

Cheers
Jerome

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#7 lore raw
Quoted 2 lines · Nicolò Veronese

If you can do it, it's better.
I'm still learning, take care that the "simple-amplifier" can support supplys.

supplies support makes sense.

If I may suggest the following:
* 1) Just perform a simple rename/sed first (Don't forget the DT documentation)
* 2) Add your compatible to the list
* 3) Add optional supply support if you need it

Cheers
Jerome

Quoted 24 lines

Regards,
Nicolò

Il giorno lun 25 giu 2018 alle ore 13:51 Jerome Brunet <[email protected]> ha scritto:

Quoted 19 lines · Mark Brown
Quoted 10 lines · Jerome Brunet
Quoted 5 lines

Same comment as on IRC, you driver looks very similar to the one I posted a while back (sound/soc/codecs/dio2125.c)
Could you just add your compatible to the list in the existing driver ? Is there anything I missed which makes them incompatible ?

It's probably a good idea to rename that driver so it's a bit more discoverable - you're absolutely right that it's very similar and doing basically the same thing but I'd completely forgotten that it existed :/

Agreed , the name is poorly chosen. I did not thought it was a generic need at the time.

Nicolò, do you want to do the remame ? or would you prefer me to do it ?

Cheers
Jerome

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#8 lore raw
In reply to Jerome Brunet
Quoted 17 lines · Jerome Brunet
Quoted 5 lines · Mark Brown
Quoted 3 lines · Nicolò Veronese

Many boards have speaker amplifier attached on an analog output. Most of them are only managed by a mute or shutdown GPIO.
In order to reduce duplicate driver, this patch adds generic/simple-amplifier.

Quoted 10 lines

Copying in Hans who has a machine that needs something like this, not deleting context for his benefit.

This looks good to me, one coding style thing below but otherwise the main thing I'm thinking is that we might want to add a mono channel as well for simplicity when wiring up a system using a mono amplifier. That could always be done later though.

Quoted 2 lines
Quoted 7 lines

Hi Nicolo,

Same comment as on IRC, you driver looks very similar to the one I posted a while back (sound/soc/codecs/dio2125.c)

Could you just add your compatible to the list in the existing driver ? Is there anything I missed which makes them incompatible ?

I think slightly different semantics apply for "shutdown" vs "mute" pins / controls.
"shutdown" implies a low power, if not powered off altogether, mode which might require a slight delay to charge up when the amp is enabled. "mute" is just that,
disconnecting the output, which would be useful in masking pops or other noises, but does nothing to help power consumption.

Not sure if the subtle differences can be handled in DAPM, but it would be nice to have. I've seen devices that have both control pins.

Regards
ChenYu

Quoted 175 lines

Regards
Jerome

Quoted 163 lines
Quoted 56 lines
---
 sound/soc/generic/Kconfig            |   5 ++
 sound/soc/generic/Makefile           |   2 +
 sound/soc/generic/simple-amplifier.c | 109 +++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 sound/soc/generic/simple-amplifier.c
sound/soc/generic/Kconfig +5 -0
index c954be0..ace17c3a 100644
@@ -7,6 +7,11 @@ config SND_SIMPLE_CARD
    help
      This option enables generic simple sound card support
 
+config SND_SIMPLE_AMPLIFIER
+   tristate "ASoC Simple Amplifier support"
+   help
+     This option enables generic simple amplifier support
+
 config SND_SIMPLE_SCU_CARD
    tristate "ASoC Simple SCU sound card support"
    depends on OF
sound/soc/generic/Makefile +2 -0
index 9dec293..805a746 100644
@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0
 snd-soc-simple-card-utils-objs     := simple-card-utils.o
 snd-soc-simple-card-objs   := simple-card.o
+snd-soc-simple-amplifier-objs              := simple-amplifier.o
 snd-soc-simple-scu-card-objs       := simple-scu-card.o
 snd-soc-audio-graph-card-objs      := audio-graph-card.o
 snd-soc-audio-graph-scu-card-objs  := audio-graph-scu-card.o
 
 obj-$(CONFIG_SND_SIMPLE_CARD_UTILS)        += snd-soc-simple-card-utils.o
 obj-$(CONFIG_SND_SIMPLE_CARD)              += snd-soc-simple-card.o
+obj-$(CONFIG_SND_SIMPLE_AMPLIFIER)         += snd-soc-simple-amplifier.o
 obj-$(CONFIG_SND_SIMPLE_SCU_CARD)  += snd-soc-simple-scu-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_CARD) += snd-soc-audio-graph-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_SCU_CARD)     += snd-soc-audio-graph-scu-card.o
sound/soc/generic/simple-amplifier.c new file +8 -0
new file mode 100644
index 0000000..e135a43
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: GPL-2.0
+// ALSA SoC simple amplifier driver
+//
+// Copyright 2018
+// Author:  Nicolò Veronese <[email protected]>
+
+#include <linux/module.h>
+#include <linux/platform_device.h>

sound/soc/generic/simple-amplifier.c line 18

Quoted 10 lines
sound/soc/generic/simple-amplifier.c new file +10 -0
+#include <linux/gpio/consumer.h>
+#include <linux/regulator/consumer.h>
+
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+/* This struct is used to save the context */
+struct simple_amp_data {
+   struct device *dev;
+   struct regmap *regmap;

You don't need a regmap here.

Quoted 49 lines
sound/soc/generic/simple-amplifier.c new file +49 -0
+   struct gpio_desc *power_gpio;
+};
+
+static int simple_amp_power_event(struct snd_soc_dapm_widget *widget,
+                            struct snd_kcontrol *kctrl, int event)
+{
+   struct snd_soc_component *c = snd_soc_dapm_to_component(widget->dapm);
+   struct simple_amp_data *data = snd_soc_component_get_drvdata(c);
+
+   /* Shutdown GPIO */
+    if (data->power_gpio)
+        gpiod_set_value_cansleep(data->power_gpio, SND_SOC_DAPM_EVENT_ON(event));
+
+   return 0;
+}
+
+static const struct snd_soc_dapm_widget simple_amp_dapm_widgets[] = {
+   SND_SOC_DAPM_INPUT("LEFT AMP IN"),
+   SND_SOC_DAPM_INPUT("RIGHT AMP IN"),
+
+   SND_SOC_DAPM_OUTPUT("SPK LEFT"),
+   SND_SOC_DAPM_OUTPUT("SPK RIGHT"),
+
+   SND_SOC_DAPM_REGULATOR_SUPPLY("VCC", 20, 0),
+   SND_SOC_DAPM_SPK("MUTE", simple_amp_power_event),
+};
+
+static const struct snd_soc_dapm_route simple_amp_dapm_routes[] = {
+   { "MUTE", NULL, "LEFT AMP IN" },
+   { "MUTE", NULL, "RIGHT AMP IN" },
+
+   { "SPK LEFT", NULL, "VCC" },
+   { "SPK RIGHT", NULL, "VCC" },
+
+   { "SPK LEFT", NULL, "MUTE" },
+   { "SPK RIGHT", NULL, "MUTE" },
+};
+
+static const struct snd_soc_component_driver simple_amp_component_driver = {
+   .name = "simple-amplifier",
+   .dapm_widgets = simple_amp_dapm_widgets,
+   .num_dapm_widgets = ARRAY_SIZE(simple_amp_dapm_widgets),
+   .dapm_routes = simple_amp_dapm_routes,
+   .num_dapm_routes = ARRAY_SIZE(simple_amp_dapm_routes),
+};
+
+static int asoc_simple_amp_probe(struct platform_device *pdev)
+{
+   struct simple_amp_data *data;

sound/soc/generic/simple-amplifier.c line 77

Quoted 10 lines
sound/soc/generic/simple-amplifier.c new file +10 -0
+   struct device *dev = &pdev->dev;
+   int ret;
+
+   data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+   if (!data)
+           return -ENOMEM;
+   data->dev = &pdev->dev;
+   platform_set_drvdata(pdev, data);
+
+   if(of_property_read_bool(pdev->dev.of_node,"shutdown-gpios")) {

Coding style: should be if (

Quoted 32 lines
sound/soc/generic/simple-amplifier.c new file +32 -0
+           data->power_gpio = devm_gpiod_get_optional(&pdev->dev, "shutdown", GPIOD_OUT_LOW);
+
+           if (IS_ERR(data->power_gpio)) {
+                   ret = PTR_ERR(data->power_gpio);
+                   dev_err(&pdev->dev, "Failed to get shutdown gpio: %d\n", ret);
+                   return ret;
+           }
+   }
+
+   return devm_snd_soc_register_component(dev,
+                   &simple_amp_component_driver, NULL, 0);
+}
+
+static const struct of_device_id asoc_simple_of_match[] = {
+   { .compatible = "simple-audio-amplifier", },
+   {},
+};
+MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
+
+static struct platform_driver asoc_simple_amp = {
+   .driver = {
+           .name = "asoc-simple-amplifier",
+           .of_match_table = of_match_ptr(asoc_simple_of_match),
+   },
+   .probe = asoc_simple_amp_probe,
+};
+
+module_platform_driver(asoc_simple_amp);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("ASoC Simple Amplifier");
+MODULE_AUTHOR("Nicolò Veronese <[email protected]>");
Quoted 8 lines
Quoted 3 lines

--
2.7.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Quoted 4 lines

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

maintainer
#9 lore raw
Quoted 10 lines · Chen-Yu Tsai

I think slightly different semantics apply for "shutdown" vs "mute" pins / controls.
"shutdown" implies a low power, if not powered off altogether, mode which might require a slight delay to charge up when the amp is enabled. "mute" is just that,
disconnecting the output, which would be useful in masking pops or other noises, but does nothing to help power consumption.

Not sure if the subtle differences can be handled in DAPM, but it would be nice to have. I've seen devices that have both control pins.

It's certainly potentially useful to have pins for both and treat them differently - ideally something that's a mute would get autodisable type treatment so we mask out any pops in the input path but also make it available to userspace if it needs it. That's something that could be done when the need arises though, until something that actually has both controls appears handling a mute pin like a power control is probably going to result in the most reliable integration.

Having the binding specify both differently would be good for future proofing.

#10 lore raw
Quoted 13 lines · Mark Brown
Quoted 10 lines · Chen-Yu Tsai

I think slightly different semantics apply for "shutdown" vs "mute" pins / controls.
"shutdown" implies a low power, if not powered off altogether, mode which might require a slight delay to charge up when the amp is enabled. "mute" is just that,
disconnecting the output, which would be useful in masking pops or other noises, but does nothing to help power consumption.

Not sure if the subtle differences can be handled in DAPM, but it would be nice to have. I've seen devices that have both control pins.

Quoted 7 lines

It's certainly potentially useful to have pins for both and treat them differently - ideally something that's a mute would get autodisable type treatment so we mask out any pops in the input path but also make it available to userspace if it needs it. That's something that could be done when the need arises though, until something that actually has both controls appears handling a mute pin like a power control is probably going to result in the most reliable integration.

Agreed. I'll dig around to see which one of my devices has this.

Quoted 2 lines

Having the binding specify both differently would be good for future proofing.

Ack.

Also, would it be possible to specify the name or prefix of the widgets from the device tree, such that it would be possible to have multiple instances? I'm thinking one amp for speakers, and one for headphones, each individually controlled.

ChenYu

maintainer
#11 lore raw
Quoted 4 lines · Chen-Yu Tsai

Also, would it be possible to specify the name or prefix of the widgets from the device tree, such that it would be possible to have multiple instances? I'm thinking one amp for speakers, and one for headphones, each individually controlled.

There's already a general facility for doing this - name_prefix. I don't think it's got a DT binding yet but no reason not to add one.