redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: simple-amplifier: rename dio2125 to simple-amplifer

Browse source 
The dio2125 is simple enough that we can make it a generic component.
Just rename and sed the dio2125 amplifier driver to simple_amplifier.

Suggested-by: Nicolò Veronese <nicveronese@gmail.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jerome Brunet 2018-06-26 14:11:27 +02:00 committed by Mark Brown
parent 0ed03e6dc2
commit 8d881bb621
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
3 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/soc/codecs/Kconfig
View file

@ -74,7 +74,6 @@ config SND_SOC_ALL_CODECS
select SND_SOC_DA7219 if I2C select SND_SOC_DA7219 if I2C
select SND_SOC_DA732X if I2C select SND_SOC_DA732X if I2C
select SND_SOC_DA9055 if I2C select SND_SOC_DA9055 if I2C
select SND_SOC_DIO2125
select SND_SOC_DMIC if GPIOLIB select SND_SOC_DMIC if GPIOLIB
select SND_SOC_ES8316 if I2C select SND_SOC_ES8316 if I2C
select SND_SOC_ES8328_SPI if SPI_MASTER select SND_SOC_ES8328_SPI if SPI_MASTER
@ -144,6 +143,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_RT5682 if I2C select SND_SOC_RT5682 if I2C
select SND_SOC_SGTL5000 if I2C select SND_SOC_SGTL5000 if I2C
select SND_SOC_SI476X if MFD_SI476X_CORE select SND_SOC_SI476X if MFD_SI476X_CORE
select SND_SOC_SIMPLE_AMPLIFIER
select SND_SOC_SIRF_AUDIO_CODEC select SND_SOC_SIRF_AUDIO_CODEC
select SND_SOC_SPDIF select SND_SOC_SPDIF
select SND_SOC_SSM2305 select SND_SOC_SSM2305
@ -573,10 +573,6 @@ config SND_SOC_DA732X
config SND_SOC_DA9055 config SND_SOC_DA9055
tristate tristate
config SND_SOC_DIO2125
tristate "Dioo DIO2125 Amplifier"
select GPIOLIB
config SND_SOC_DMIC config SND_SOC_DMIC
tristate tristate
@ -897,6 +893,10 @@ config SND_SOC_SIGMADSP_REGMAP
tristate tristate
select SND_SOC_SIGMADSP select SND_SOC_SIGMADSP
config SND_SOC_SIMPLE_AMPLIFIER
tristate "Simple Audio Amplifier"
select GPIOLIB
config SND_SOC_SIRF_AUDIO_CODEC config SND_SOC_SIRF_AUDIO_CODEC
tristate "SiRF SoC internal audio codec" tristate "SiRF SoC internal audio codec"
select REGMAP_MMIO select REGMAP_MMIO

4
sound/soc/codecs/Makefile
View file

@ -250,9 +250,9 @@ snd-soc-wm9713-objs := wm9713.o
snd-soc-wm-hubs-objs := wm_hubs.o snd-soc-wm-hubs-objs := wm_hubs.o
snd-soc-zx-aud96p22-objs := zx_aud96p22.o snd-soc-zx-aud96p22-objs := zx_aud96p22.o
# Amp # Amp
snd-soc-dio2125-objs := dio2125.o
snd-soc-max9877-objs := max9877.o snd-soc-max9877-objs := max9877.o
snd-soc-max98504-objs := max98504.o snd-soc-max98504-objs := max98504.o
snd-soc-simple-amplifier-objs := simple-amplifier.o
snd-soc-tpa6130a2-objs := tpa6130a2.o snd-soc-tpa6130a2-objs := tpa6130a2.o
snd-soc-tas2552-objs := tas2552.o snd-soc-tas2552-objs := tas2552.o
@ -509,7 +509,7 @@ obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
obj-$(CONFIG_SND_SOC_ZX_AUD96P22) += snd-soc-zx-aud96p22.o obj-$(CONFIG_SND_SOC_ZX_AUD96P22) += snd-soc-zx-aud96p22.o
# Amp # Amp
obj-$(CONFIG_SND_SOC_DIO2125) += snd-soc-dio2125.o
obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
obj-$(CONFIG_SND_SOC_MAX98504) += snd-soc-max98504.o obj-$(CONFIG_SND_SOC_MAX98504) += snd-soc-max98504.o
obj-$(CONFIG_SND_SOC_SIMPLE_AMPLIFIER) += snd-soc-simple-amplifier.o
obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o

41
sound/soc/codecs/dio2125.c → sound/soc/codecs/simple-amplifier.c
View file

@ -21,9 +21,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <sound/soc.h> #include <sound/soc.h>
#define DRV_NAME "dio2125" #define DRV_NAME "simple-amplifier"
struct dio2125 { struct simple_amp {
struct gpio_desc *gpiod_enable; struct gpio_desc *gpiod_enable;
}; };
@ -31,7 +31,7 @@ static int drv_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *control, int event) struct snd_kcontrol *control, int event)
{ {
struct snd_soc_component *c = snd_soc_dapm_to_component(w->dapm); struct snd_soc_component *c = snd_soc_dapm_to_component(w->dapm);
struct dio2125 *priv = snd_soc_component_get_drvdata(c); struct simple_amp *priv = snd_soc_component_get_drvdata(c);
int val; int val;
switch (event) { switch (event) {
@ -51,7 +51,7 @@ static int drv_event(struct snd_soc_dapm_widget *w,
return 0; return 0;
} }
static const struct snd_soc_dapm_widget dio2125_dapm_widgets[] = { static const struct snd_soc_dapm_widget simple_amp_dapm_widgets[] = {
SND_SOC_DAPM_INPUT("INL"), SND_SOC_DAPM_INPUT("INL"),
SND_SOC_DAPM_INPUT("INR"), SND_SOC_DAPM_INPUT("INR"),
SND_SOC_DAPM_OUT_DRV_E("DRV", SND_SOC_NOPM, 0, 0, NULL, 0, drv_event, SND_SOC_DAPM_OUT_DRV_E("DRV", SND_SOC_NOPM, 0, 0, NULL, 0, drv_event,
@ -60,24 +60,24 @@ static const struct snd_soc_dapm_widget dio2125_dapm_widgets[] = {
SND_SOC_DAPM_OUTPUT("OUTR"), SND_SOC_DAPM_OUTPUT("OUTR"),
}; };
static const struct snd_soc_dapm_route dio2125_dapm_routes[] = { static const struct snd_soc_dapm_route simple_amp_dapm_routes[] = {
{ "DRV", NULL, "INL" }, { "DRV", NULL, "INL" },
{ "DRV", NULL, "INR" }, { "DRV", NULL, "INR" },
{ "OUTL", NULL, "DRV" }, { "OUTL", NULL, "DRV" },
{ "OUTR", NULL, "DRV" }, { "OUTR", NULL, "DRV" },
}; };
static const struct snd_soc_component_driver dio2125_component_driver = { static const struct snd_soc_component_driver simple_amp_component_driver = {
.dapm_widgets = dio2125_dapm_widgets, .dapm_widgets = simple_amp_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(dio2125_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(simple_amp_dapm_widgets),
.dapm_routes = dio2125_dapm_routes, .dapm_routes = simple_amp_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(dio2125_dapm_routes), .num_dapm_routes = ARRAY_SIZE(simple_amp_dapm_routes),
}; };
static int dio2125_probe(struct platform_device *pdev) static int simple_amp_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dio2125 *priv; struct simple_amp *priv;
int err; int err;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@ -93,28 +93,29 @@ static int dio2125_probe(struct platform_device *pdev)
return err; return err;
} }
return devm_snd_soc_register_component(dev, &dio2125_component_driver, return devm_snd_soc_register_component(dev,
&simple_amp_component_driver,
NULL, 0); NULL, 0);
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id dio2125_ids[] = { static const struct of_device_id simple_amp_ids[] = {
{ .compatible = "dioo,dio2125", }, { .compatible = "dioo,dio2125", },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, dio2125_ids); MODULE_DEVICE_TABLE(of, simple_amp_ids);
#endif #endif
static struct platform_driver dio2125_driver = { static struct platform_driver simple_amp_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.of_match_table = of_match_ptr(dio2125_ids), .of_match_table = of_match_ptr(simple_amp_ids),
}, },
.probe = dio2125_probe, .probe = simple_amp_probe,
}; };
module_platform_driver(dio2125_driver); module_platform_driver(simple_amp_driver);
MODULE_DESCRIPTION("ASoC DIO2125 output driver"); MODULE_DESCRIPTION("ASoC Simple Audio Amplifier driver");
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>"); MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");