[alsa-devel] [PATCH 0/3] ASoC: pcm179x: Add I2C support, declare support for continuous rates
This series add support for I2C and declares support for continuous sample rates.
Please note that this has only been tested using I2C and PCM1791A. I'd be grateful if someone can test it with other devices in the PCM179X family and/or SPI.
These patches are against linux-next.
Jacob Siverskog (3): ASoC: pcm179x: Split into core and SPI parts ASoC: pcm179x: Add I2C interface driver ASoC: pcm179x: Support continuous rates
.../devicetree/bindings/sound/pcm179x.txt | 11 ++- sound/soc/codecs/Kconfig | 20 +++++- sound/soc/codecs/Makefile | 4 ++ sound/soc/codecs/pcm179x-i2c.c | 82 ++++++++++++++++++++++ sound/soc/codecs/pcm179x-spi.c | 81 +++++++++++++++++++++ sound/soc/codecs/pcm179x.c | 64 +++-------------- sound/soc/codecs/pcm179x.h | 14 +++- 7 files changed, 215 insertions(+), 61 deletions(-) create mode 100644 sound/soc/codecs/pcm179x-i2c.c create mode 100644 sound/soc/codecs/pcm179x-spi.c
The pcm179x family supports both SPI and I2C for configuration. This patch splits the driver into core and SPI parts, in preparation for I2C support.
Reviewed-by: Johan Hovold johan@kernel.org Signed-off-by: Jacob Siverskog jacob@teenage.engineering --- sound/soc/codecs/Kconfig | 11 ++++-- sound/soc/codecs/Makefile | 2 ++ sound/soc/codecs/pcm179x-spi.c | 81 ++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/pcm179x.c | 60 ++++--------------------------- sound/soc/codecs/pcm179x.h | 12 +++++++ 5 files changed, 110 insertions(+), 56 deletions(-) create mode 100644 sound/soc/codecs/pcm179x-spi.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 50693c8..eaf13cb 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -87,7 +87,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_ML26124 if I2C select SND_SOC_NAU8825 if I2C select SND_SOC_PCM1681 if I2C - select SND_SOC_PCM179X if SPI_MASTER + select SND_SOC_PCM179X_SPI if SPI_MASTER select SND_SOC_PCM3008 select SND_SOC_PCM3168A_I2C if I2C select SND_SOC_PCM3168A_SPI if SPI_MASTER @@ -527,8 +527,15 @@ config SND_SOC_PCM1681 depends on I2C
config SND_SOC_PCM179X - tristate "Texas Instruments PCM179X CODEC" + tristate + +config SND_SOC_PCM179X_SPI + tristate "Texas Instruments PCM179X CODEC family (SPI)" depends on SPI_MASTER + select SND_SOC_PCM179X + help + Enable support for Texas Instruments PCM179x CODEC family. + Select this if your PCM179x is connected via an SPI bus.
config SND_SOC_PCM3008 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index d44f7d3..56e94d8 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -81,6 +81,7 @@ snd-soc-ml26124-objs := ml26124.o snd-soc-nau8825-objs := nau8825.o snd-soc-pcm1681-objs := pcm1681.o snd-soc-pcm179x-codec-objs := pcm179x.o +snd-soc-pcm179x-spi-objs := pcm179x-spi.o snd-soc-pcm3008-objs := pcm3008.o snd-soc-pcm3168a-objs := pcm3168a.o snd-soc-pcm3168a-i2c-objs := pcm3168a-i2c.o @@ -285,6 +286,7 @@ obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o obj-$(CONFIG_SND_SOC_NAU8825) += snd-soc-nau8825.o obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o obj-$(CONFIG_SND_SOC_PCM179X) += snd-soc-pcm179x-codec.o +obj-$(CONFIG_SND_SOC_PCM179X_SPI) += snd-soc-pcm179x-spi.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o obj-$(CONFIG_SND_SOC_PCM3168A) += snd-soc-pcm3168a.o obj-$(CONFIG_SND_SOC_PCM3168A_I2C) += snd-soc-pcm3168a-i2c.o diff --git a/sound/soc/codecs/pcm179x-spi.c b/sound/soc/codecs/pcm179x-spi.c new file mode 100644 index 0000000..73641f5 --- /dev/null +++ b/sound/soc/codecs/pcm179x-spi.c @@ -0,0 +1,81 @@ +/* + * PCM179X ASoC SPI driver + * + * Copyright (c) Amarula Solutions B.V. 2013 + * + * Michael Trimarchi michael@amarulasolutions.com + * + * 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. + */ + +#include <linux/module.h> +#include <linux/of.h> +#include <linux/spi/spi.h> +#include <linux/regmap.h> + +#include "pcm179x.h" + +static int pcm179x_spi_probe(struct spi_device *spi) +{ + struct pcm179x_private *pcm179x; + int ret; + + pcm179x = devm_kzalloc(&spi->dev, sizeof(struct pcm179x_private), + GFP_KERNEL); + if (!pcm179x) + return -ENOMEM; + + spi_set_drvdata(spi, pcm179x); + + pcm179x->dev = &spi->dev; + + pcm179x->regmap = devm_regmap_init_spi(spi, &pcm179x_regmap_config); + if (IS_ERR(pcm179x->regmap)) { + ret = PTR_ERR(pcm179x->regmap); + dev_err(&spi->dev, "Failed to register regmap: %d\n", ret); + return ret; + } + + return pcm179x_common_init(pcm179x); +} + +static int pcm179x_spi_remove(struct spi_device *spi) +{ + return pcm179x_common_exit(spi_get_drvdata(spi)); +} + +const struct of_device_id pcm179x_of_match[] = { + { .compatible = "ti,pcm1792a", }, + { } +}; +MODULE_DEVICE_TABLE(of, pcm179x_of_match); + +static const struct spi_device_id pcm179x_spi_ids[] = { + { "pcm179x", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(spi, pcm179x_spi_ids); + +static struct spi_driver pcm179x_spi_driver = { + .driver = { + .name = "pcm179x", + .of_match_table = of_match_ptr(pcm179x_of_match), + }, + .id_table = pcm179x_spi_ids, + .probe = pcm179x_spi_probe, + .remove = pcm179x_spi_remove, +}; + +module_spi_driver(pcm179x_spi_driver); + +MODULE_DESCRIPTION("ASoC PCM179X SPI driver"); +MODULE_AUTHOR("Michael Trimarchi michael@amarulasolutions.com"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c index a56c7b7..08bc6e0 100644 --- a/sound/soc/codecs/pcm179x.c +++ b/sound/soc/codecs/pcm179x.c @@ -20,7 +20,6 @@ #include <linux/slab.h> #include <linux/kernel.h> #include <linux/device.h> -#include <linux/spi/spi.h>
#include <sound/core.h> #include <sound/pcm.h> @@ -29,7 +28,6 @@ #include <sound/soc.h> #include <sound/tlv.h> #include <linux/of.h> -#include <linux/of_device.h>
#include "pcm179x.h"
@@ -70,12 +68,6 @@ static bool pcm179x_writeable_reg(struct device *dev, unsigned register reg) return accessible && reg != 0x16 && reg != 0x17; }
-struct pcm179x_private { - struct regmap *regmap; - unsigned int format; - unsigned int rate; -}; - static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int format) { @@ -194,13 +186,7 @@ static struct snd_soc_dai_driver pcm179x_dai = { .ops = &pcm179x_dai_ops, };
-static const struct of_device_id pcm179x_of_match[] = { - { .compatible = "ti,pcm1792a", }, - { } -}; -MODULE_DEVICE_TABLE(of, pcm179x_of_match); - -static const struct regmap_config pcm179x_regmap = { +const struct regmap_config pcm179x_regmap_config = { .reg_bits = 8, .val_bits = 8, .max_register = 23, @@ -209,6 +195,7 @@ static const struct regmap_config pcm179x_regmap = { .writeable_reg = pcm179x_writeable_reg, .readable_reg = pcm179x_accessible_reg, }; +EXPORT_SYMBOL_GPL(pcm179x_regmap_config);
static struct snd_soc_codec_driver soc_codec_dev_pcm179x = { .controls = pcm179x_controls, @@ -219,53 +206,18 @@ static struct snd_soc_codec_driver soc_codec_dev_pcm179x = { .num_dapm_routes = ARRAY_SIZE(pcm179x_dapm_routes), };
-static int pcm179x_spi_probe(struct spi_device *spi) +int pcm179x_common_init(struct pcm179x_private *priv) { - struct pcm179x_private *pcm179x; - int ret; - - pcm179x = devm_kzalloc(&spi->dev, sizeof(struct pcm179x_private), - GFP_KERNEL); - if (!pcm179x) - return -ENOMEM; - - spi_set_drvdata(spi, pcm179x); - - pcm179x->regmap = devm_regmap_init_spi(spi, &pcm179x_regmap); - if (IS_ERR(pcm179x->regmap)) { - ret = PTR_ERR(pcm179x->regmap); - dev_err(&spi->dev, "Failed to register regmap: %d\n", ret); - return ret; - } - - return snd_soc_register_codec(&spi->dev, + return snd_soc_register_codec(priv->dev, &soc_codec_dev_pcm179x, &pcm179x_dai, 1); }
-static int pcm179x_spi_remove(struct spi_device *spi) +int pcm179x_common_exit(struct pcm179x_private *priv) { - snd_soc_unregister_codec(&spi->dev); + snd_soc_unregister_codec(priv->dev); return 0; }
-static const struct spi_device_id pcm179x_spi_ids[] = { - { "pcm179x", 0 }, - { }, -}; -MODULE_DEVICE_TABLE(spi, pcm179x_spi_ids); - -static struct spi_driver pcm179x_codec_driver = { - .driver = { - .name = "pcm179x", - .of_match_table = of_match_ptr(pcm179x_of_match), - }, - .id_table = pcm179x_spi_ids, - .probe = pcm179x_spi_probe, - .remove = pcm179x_spi_remove, -}; - -module_spi_driver(pcm179x_codec_driver); - MODULE_DESCRIPTION("ASoC PCM179X driver"); MODULE_AUTHOR("Michael Trimarchi michael@amarulasolutions.com"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/pcm179x.h b/sound/soc/codecs/pcm179x.h index c6fdc06..d1536e0 100644 --- a/sound/soc/codecs/pcm179x.h +++ b/sound/soc/codecs/pcm179x.h @@ -17,6 +17,13 @@ #ifndef __PCM179X_H__ #define __PCM179X_H__
+struct pcm179x_private { + struct device *dev; + struct regmap *regmap; + unsigned int format; + unsigned int rate; +}; + #define PCM1792A_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_8000_48000 | \ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \ SNDRV_PCM_RATE_192000) @@ -24,4 +31,9 @@ #define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S16_LE)
+extern const struct regmap_config pcm179x_regmap_config; + +int pcm179x_common_init(struct pcm179x_private *priv); +int pcm179x_common_exit(struct pcm179x_private *priv); + #endif
On Mon, Jan 18, 2016 at 04:57:35PM +0100, Jacob Siverskog wrote:
The pcm179x family supports both SPI and I2C for configuration. This patch splits the driver into core and SPI parts, in preparation for I2C support.
Reviewed-by: Johan Hovold johan@kernel.org Signed-off-by: Jacob Siverskog jacob@teenage.engineering
+const struct of_device_id pcm179x_of_match[] = {
Missing static keyword.
- { .compatible = "ti,pcm1792a", },
- { }
+}; +MODULE_DEVICE_TABLE(of, pcm179x_of_match);
-static int pcm179x_spi_probe(struct spi_device *spi) +int pcm179x_common_init(struct pcm179x_private *priv) {
- struct pcm179x_private *pcm179x;
- int ret;
- pcm179x = devm_kzalloc(&spi->dev, sizeof(struct pcm179x_private),
GFP_KERNEL);- if (!pcm179x)
return -ENOMEM;- spi_set_drvdata(spi, pcm179x);
- pcm179x->regmap = devm_regmap_init_spi(spi, &pcm179x_regmap);
- if (IS_ERR(pcm179x->regmap)) {
ret = PTR_ERR(pcm179x->regmap);dev_err(&spi->dev, "Failed to register regmap: %d\n", ret);return ret;- }
- return snd_soc_register_codec(&spi->dev,
- return snd_soc_register_codec(priv->dev, &soc_codec_dev_pcm179x, &pcm179x_dai, 1);
}
-static int pcm179x_spi_remove(struct spi_device *spi) +int pcm179x_common_exit(struct pcm179x_private *priv) {
- snd_soc_unregister_codec(&spi->dev);
- snd_soc_unregister_codec(priv->dev); return 0;
}
And missing EXPORT_SYMBOL_GPL for these two.
That should take care of the 0-day build-test errors.
Thanks, Johan
The PCM179x family supports both SPI and I2C. This patch adds support for the I2C interface.
Reviewed-by: Johan Hovold johan@kernel.org Signed-off-by: Jacob Siverskog jacob@teenage.engineering --- .../devicetree/bindings/sound/pcm179x.txt | 11 ++- sound/soc/codecs/Kconfig | 9 +++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/pcm179x-i2c.c | 82 ++++++++++++++++++++++ 4 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 sound/soc/codecs/pcm179x-i2c.c
diff --git a/Documentation/devicetree/bindings/sound/pcm179x.txt b/Documentation/devicetree/bindings/sound/pcm179x.txt index 4ae70d3..436c2b2 100644 --- a/Documentation/devicetree/bindings/sound/pcm179x.txt +++ b/Documentation/devicetree/bindings/sound/pcm179x.txt @@ -1,6 +1,6 @@ Texas Instruments pcm179x DT bindings
-This driver supports the SPI bus. +This driver supports both the I2C and SPI bus.
Required properties:
@@ -9,6 +9,11 @@ Required properties: For required properties on SPI, please consult Documentation/devicetree/bindings/spi/spi-bus.txt
+Required properties on I2C: + + - reg: the I2C address + + Examples:
codec_spi: 1792a@0 { @@ -16,3 +21,7 @@ Examples: spi-max-frequency = <600000>; };
+ codec_i2c: 1792a@4c { + compatible = "ti,pcm1792a"; + reg = <0x4c>; + }; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index eaf13cb..45269cc 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -87,6 +87,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_ML26124 if I2C select SND_SOC_NAU8825 if I2C select SND_SOC_PCM1681 if I2C + select SND_SOC_PCM179X_I2C if I2C select SND_SOC_PCM179X_SPI if SPI_MASTER select SND_SOC_PCM3008 select SND_SOC_PCM3168A_I2C if I2C @@ -529,6 +530,14 @@ config SND_SOC_PCM1681 config SND_SOC_PCM179X tristate
+config SND_SOC_PCM179X_I2C + tristate "Texas Instruments PCM179X CODEC family (I2C)" + depends on I2C + select SND_SOC_PCM179X + help + Enable support for Texas Instruments PCM179x CODEC family. + Select this if your PCM179x is connected via an I2C bus. + config SND_SOC_PCM179X_SPI tristate "Texas Instruments PCM179X CODEC family (SPI)" depends on SPI_MASTER diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 56e94d8..9acd777 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -81,6 +81,7 @@ snd-soc-ml26124-objs := ml26124.o snd-soc-nau8825-objs := nau8825.o snd-soc-pcm1681-objs := pcm1681.o snd-soc-pcm179x-codec-objs := pcm179x.o +snd-soc-pcm179x-i2c-objs := pcm179x-i2c.o snd-soc-pcm179x-spi-objs := pcm179x-spi.o snd-soc-pcm3008-objs := pcm3008.o snd-soc-pcm3168a-objs := pcm3168a.o @@ -286,6 +287,7 @@ obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o obj-$(CONFIG_SND_SOC_NAU8825) += snd-soc-nau8825.o obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o obj-$(CONFIG_SND_SOC_PCM179X) += snd-soc-pcm179x-codec.o +obj-$(CONFIG_SND_SOC_PCM179X_I2C) += snd-soc-pcm179x-i2c.o obj-$(CONFIG_SND_SOC_PCM179X_SPI) += snd-soc-pcm179x-spi.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o obj-$(CONFIG_SND_SOC_PCM3168A) += snd-soc-pcm3168a.o diff --git a/sound/soc/codecs/pcm179x-i2c.c b/sound/soc/codecs/pcm179x-i2c.c new file mode 100644 index 0000000..0b20870 --- /dev/null +++ b/sound/soc/codecs/pcm179x-i2c.c @@ -0,0 +1,82 @@ +/* + * PCM179X ASoC I2C driver + * + * Copyright (c) Teenage Engineering AB 2016 + * + * Jacob Siverskog jacob@teenage.engineering + * + * 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. + */ + +#include <linux/module.h> +#include <linux/of.h> +#include <linux/i2c.h> +#include <linux/regmap.h> + +#include "pcm179x.h" + +static int pcm179x_i2c_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct pcm179x_private *pcm179x; + int ret; + + pcm179x = devm_kzalloc(&client->dev, sizeof(struct pcm179x_private), + GFP_KERNEL); + if (!pcm179x) + return -ENOMEM; + + i2c_set_clientdata(client, pcm179x); + + pcm179x->dev = &client->dev; + + pcm179x->regmap = devm_regmap_init_i2c(client, &pcm179x_regmap_config); + if (IS_ERR(pcm179x->regmap)) { + ret = PTR_ERR(pcm179x->regmap); + dev_err(&client->dev, "Failed to register regmap: %d\n", ret); + return ret; + } + + return pcm179x_common_init(pcm179x); +} + +static int pcm179x_i2c_remove(struct i2c_client *client) +{ + return pcm179x_common_exit(i2c_get_clientdata(client)); +} + +const struct of_device_id pcm179x_of_match[] = { + { .compatible = "ti,pcm1792a", }, + { } +}; +MODULE_DEVICE_TABLE(of, pcm179x_of_match); + +static const struct i2c_device_id pcm179x_i2c_ids[] = { + { "pcm179x", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, pcm179x_i2c_ids); + +static struct i2c_driver pcm179x_i2c_driver = { + .driver = { + .name = "pcm179x", + .of_match_table = of_match_ptr(pcm179x_of_match), + }, + .id_table = pcm179x_i2c_ids, + .probe = pcm179x_i2c_probe, + .remove = pcm179x_i2c_remove, +}; + +module_i2c_driver(pcm179x_i2c_driver); + +MODULE_DESCRIPTION("ASoC PCM179X I2C driver"); +MODULE_AUTHOR("Jacob Siverskog jacob@teenage.engineering"); +MODULE_LICENSE("GPL");
Hi
On Mon, Jan 18, 2016 at 4:57 PM, Jacob Siverskog jacob@teenage.engineering wrote:
The PCM179x family supports both SPI and I2C. This patch adds support for the I2C interface.
Reviewed-by: Johan Hovold johan@kernel.org Signed-off-by: Jacob Siverskog jacob@teenage.engineering
.../devicetree/bindings/sound/pcm179x.txt | 11 ++- sound/soc/codecs/Kconfig | 9 +++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/pcm179x-i2c.c | 82 ++++++++++++++++++++++ 4 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 sound/soc/codecs/pcm179x-i2c.c
diff --git a/Documentation/devicetree/bindings/sound/pcm179x.txt b/Documentation/devicetree/bindings/sound/pcm179x.txt index 4ae70d3..436c2b2 100644 --- a/Documentation/devicetree/bindings/sound/pcm179x.txt +++ b/Documentation/devicetree/bindings/sound/pcm179x.txt @@ -1,6 +1,6 @@ Texas Instruments pcm179x DT bindings
-This driver supports the SPI bus. +This driver supports both the I2C and SPI bus.
Required properties:
@@ -9,6 +9,11 @@ Required properties: For required properties on SPI, please consult Documentation/devicetree/bindings/spi/spi-bus.txt
+Required properties on I2C:
- reg: the I2C address
I think that you have an extra space here
Examples:
codec_spi: 1792a@0 {@@ -16,3 +21,7 @@ Examples: spi-max-frequency = <600000>; };
codec_i2c: 1792a@4c {compatible = "ti,pcm1792a";reg = <0x4c>;};
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index eaf13cb..45269cc 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -87,6 +87,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_ML26124 if I2C select SND_SOC_NAU8825 if I2C select SND_SOC_PCM1681 if I2C
select SND_SOC_PCM179X_I2C if I2C select SND_SOC_PCM179X_SPI if SPI_MASTER select SND_SOC_PCM3008 select SND_SOC_PCM3168A_I2C if I2C@@ -529,6 +530,14 @@ config SND_SOC_PCM1681 config SND_SOC_PCM179X tristate
+config SND_SOC_PCM179X_I2C
tristate "Texas Instruments PCM179X CODEC family (I2C)"depends on I2Cselect SND_SOC_PCM179XhelpEnable support for Texas Instruments PCM179x CODEC family.Select this if your PCM179x is connected via an I2C bus.config SND_SOC_PCM179X_SPI tristate "Texas Instruments PCM179X CODEC family (SPI)" depends on SPI_MASTER diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 56e94d8..9acd777 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -81,6 +81,7 @@ snd-soc-ml26124-objs := ml26124.o snd-soc-nau8825-objs := nau8825.o snd-soc-pcm1681-objs := pcm1681.o snd-soc-pcm179x-codec-objs := pcm179x.o +snd-soc-pcm179x-i2c-objs := pcm179x-i2c.o snd-soc-pcm179x-spi-objs := pcm179x-spi.o snd-soc-pcm3008-objs := pcm3008.o snd-soc-pcm3168a-objs := pcm3168a.o @@ -286,6 +287,7 @@ obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o obj-$(CONFIG_SND_SOC_NAU8825) += snd-soc-nau8825.o obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o obj-$(CONFIG_SND_SOC_PCM179X) += snd-soc-pcm179x-codec.o +obj-$(CONFIG_SND_SOC_PCM179X_I2C) += snd-soc-pcm179x-i2c.o obj-$(CONFIG_SND_SOC_PCM179X_SPI) += snd-soc-pcm179x-spi.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o obj-$(CONFIG_SND_SOC_PCM3168A) += snd-soc-pcm3168a.o diff --git a/sound/soc/codecs/pcm179x-i2c.c b/sound/soc/codecs/pcm179x-i2c.c new file mode 100644 index 0000000..0b20870 --- /dev/null +++ b/sound/soc/codecs/pcm179x-i2c.c @@ -0,0 +1,82 @@ +/*
- PCM179X ASoC I2C driver
- Copyright (c) Teenage Engineering AB 2016
Jacob Siverskog <jacob@teenage.engineering>
- 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.
- */
+#include <linux/module.h> +#include <linux/of.h> +#include <linux/i2c.h> +#include <linux/regmap.h>
+#include "pcm179x.h"
+static int pcm179x_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)+{
struct pcm179x_private *pcm179x;int ret;pcm179x = devm_kzalloc(&client->dev, sizeof(struct pcm179x_private),GFP_KERNEL);if (!pcm179x)return -ENOMEM;i2c_set_clientdata(client, pcm179x);pcm179x->dev = &client->dev;pcm179x->regmap = devm_regmap_init_i2c(client, &pcm179x_regmap_config);if (IS_ERR(pcm179x->regmap)) {ret = PTR_ERR(pcm179x->regmap);dev_err(&client->dev, "Failed to register regmap: %d\n", ret);return ret;}return pcm179x_common_init(pcm179x);+}
+static int pcm179x_i2c_remove(struct i2c_client *client) +{
return pcm179x_common_exit(i2c_get_clientdata(client));+}
+const struct of_device_id pcm179x_of_match[] = {
{ .compatible = "ti,pcm1792a", },{ }+}; +MODULE_DEVICE_TABLE(of, pcm179x_of_match);
can match go in the common part?
+static const struct i2c_device_id pcm179x_i2c_ids[] = {
{ "pcm179x", 0 },{ }+}; +MODULE_DEVICE_TABLE(i2c, pcm179x_i2c_ids);
+static struct i2c_driver pcm179x_i2c_driver = {
.driver = {.name = "pcm179x",.of_match_table = of_match_ptr(pcm179x_of_match),},.id_table = pcm179x_i2c_ids,.probe = pcm179x_i2c_probe,.remove = pcm179x_i2c_remove,+};
+module_i2c_driver(pcm179x_i2c_driver);
+MODULE_DESCRIPTION("ASoC PCM179X I2C driver"); +MODULE_AUTHOR("Jacob Siverskog jacob@teenage.engineering");
+MODULE_LICENSE("GPL");
2.7.0
On Mon, Jan 18, 2016 at 05:14:42PM +0100, Michael Trimarchi wrote:
Hi
On Mon, Jan 18, 2016 at 4:57 PM, Jacob Siverskog jacob@teenage.engineering wrote:
The PCM179x family supports both SPI and I2C. This patch adds support for the I2C interface.
Reviewed-by: Johan Hovold johan@kernel.org Signed-off-by: Jacob Siverskog jacob@teenage.engineering
+const struct of_device_id pcm179x_of_match[] = {
{ .compatible = "ti,pcm1792a", },{ }+}; +MODULE_DEVICE_TABLE(of, pcm179x_of_match);
can match go in the common part?
For matching purposes it could, but that would prevent the OF-aliases from being defined for the driver modules.
There are a couple of codec drivers that have taken this route, and it works as long as they also define a legacy (e.g. i2c_device_id) table that modalias autoloading can fall back to.
But having having the common module carry the OF-aliases does not seem like the right thing to do (e.g. as the common module cannot drive anything on its own) even if it avoids a copy of the OF id table.
+static const struct i2c_device_id pcm179x_i2c_ids[] = {
{ "pcm179x", 0 },{ }+}; +MODULE_DEVICE_TABLE(i2c, pcm179x_i2c_ids);
+static struct i2c_driver pcm179x_i2c_driver = {
.driver = {.name = "pcm179x",.of_match_table = of_match_ptr(pcm179x_of_match),},.id_table = pcm179x_i2c_ids,.probe = pcm179x_i2c_probe,.remove = pcm179x_i2c_remove,+};
+module_i2c_driver(pcm179x_i2c_driver);
Thanks, Johan
On Mon, Jan 18, 2016 at 05:56:57PM +0100, Johan Hovold wrote:
On Mon, Jan 18, 2016 at 05:14:42PM +0100, Michael Trimarchi wrote:
{ .compatible = "ti,pcm1792a", },{ }+}; +MODULE_DEVICE_TABLE(of, pcm179x_of_match);
can match go in the common part?
For matching purposes it could, but that would prevent the OF-aliases from being defined for the driver modules.
There are a couple of codec drivers that have taken this route, and it works as long as they also define a legacy (e.g. i2c_device_id) table that modalias autoloading can fall back to.
But having having the common module carry the OF-aliases does not seem like the right thing to do (e.g. as the common module cannot drive anything on its own) even if it avoids a copy of the OF id table.
This does seem like something that the modules code should be able to cope with - we have a reference from the driver struct to the table which you'd really expect it to be using. We already have some issues there with userspace not handling multiple modaliases terribly well IIRC.
On Tue, Jan 19, 2016 at 12:25:24PM +0000, Mark Brown wrote:
On Mon, Jan 18, 2016 at 05:56:57PM +0100, Johan Hovold wrote:
On Mon, Jan 18, 2016 at 05:14:42PM +0100, Michael Trimarchi wrote:
{ .compatible = "ti,pcm1792a", },{ }+}; +MODULE_DEVICE_TABLE(of, pcm179x_of_match);
can match go in the common part?
For matching purposes it could, but that would prevent the OF-aliases from being defined for the driver modules.
There are a couple of codec drivers that have taken this route, and it works as long as they also define a legacy (e.g. i2c_device_id) table that modalias autoloading can fall back to.
But having having the common module carry the OF-aliases does not seem like the right thing to do (e.g. as the common module cannot drive anything on its own) even if it avoids a copy of the OF id table.
This does seem like something that the modules code should be able to cope with - we have a reference from the driver struct to the table which you'd really expect it to be using. We already have some issues there with userspace not handling multiple modaliases terribly well IIRC.
That reference is only used for matching, while the aliases are generated from the MODULE_DEVICE_TABLE macro (and elf magic).
Even if this sometimes means duplicating an id-table (and i2c and spi OF id tables aren't necessarily always identical either), it seems to me that the MODULE_DEVICE_TABLE should go in the actual driver rather than any module dependency.
Thanks, Johan
On Tue, Jan 19, 2016 at 03:11:44PM +0100, Johan Hovold wrote:
On Tue, Jan 19, 2016 at 12:25:24PM +0000, Mark Brown wrote:
This does seem like something that the modules code should be able to cope with - we have a reference from the driver struct to the table which you'd really expect it to be using. We already have some issues there with userspace not handling multiple modaliases terribly well IIRC.
That reference is only used for matching, while the aliases are generated from the MODULE_DEVICE_TABLE macro (and elf magic).
Sure, but there's no reason we can't change that.
On Tue, Jan 19, 2016 at 04:32:08PM +0000, Mark Brown wrote:
On Tue, Jan 19, 2016 at 03:11:44PM +0100, Johan Hovold wrote:
On Tue, Jan 19, 2016 at 12:25:24PM +0000, Mark Brown wrote:
This does seem like something that the modules code should be able to cope with - we have a reference from the driver struct to the table which you'd really expect it to be using. We already have some issues there with userspace not handling multiple modaliases terribly well IIRC.
That reference is only used for matching, while the aliases are generated from the MODULE_DEVICE_TABLE macro (and elf magic).
Sure, but there's no reason we can't change that.
Might take quite a bit of work to the modpost tools to achieve, though.
Johan
According to the PCM179x data sheets sampling frequencies between 10 kHz and 200 kHz are supported. Specify support in the driver.
Tested with PCM1791A.
References: http://www.ti.com/lit/ds/symlink/pcm1791a.pdf http://www.ti.com/lit/ds/symlink/pcm1792a.pdf http://www.ti.com/lit/ds/symlink/pcm1795.pdf http://www.ti.com/lit/ds/symlink/pcm1796.pdf
Reviewed-by: Johan Hovold johan@kernel.org Signed-off-by: Jacob Siverskog jacob@teenage.engineering --- sound/soc/codecs/pcm179x.c | 4 +++- sound/soc/codecs/pcm179x.h | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c index 08bc6e0..5a70384 100644 --- a/sound/soc/codecs/pcm179x.c +++ b/sound/soc/codecs/pcm179x.c @@ -181,7 +181,9 @@ static struct snd_soc_dai_driver pcm179x_dai = { .stream_name = "Playback", .channels_min = 2, .channels_max = 2, - .rates = PCM1792A_RATES, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 10000, + .rate_max = 200000, .formats = PCM1792A_FORMATS, }, .ops = &pcm179x_dai_ops, }; diff --git a/sound/soc/codecs/pcm179x.h b/sound/soc/codecs/pcm179x.h index d1536e0..7829157 100644 --- a/sound/soc/codecs/pcm179x.h +++ b/sound/soc/codecs/pcm179x.h @@ -24,10 +24,6 @@ struct pcm179x_private { unsigned int rate; };
-#define PCM1792A_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_8000_48000 | \ - SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \ - SNDRV_PCM_RATE_192000) - #define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S16_LE)
Hi Jacob
On Mon, Jan 18, 2016 at 4:57 PM, Jacob Siverskog jacob@teenage.engineering wrote:
This series add support for I2C and declares support for continuous sample rates.
Please note that this has only been tested using I2C and PCM1791A. I'd be grateful if someone can test it with other devices in the PCM179X family and/or SPI.
Thank you for this patcheset. I have only one patch that is pending and I don't think that you have rebased on the last one that add constraints of the format.
Mark, I can even rebase my last patch on top of this patchset and make Jacob life more easy
Michael
These patches are against linux-next.
Jacob Siverskog (3): ASoC: pcm179x: Split into core and SPI parts ASoC: pcm179x: Add I2C interface driver ASoC: pcm179x: Support continuous rates
.../devicetree/bindings/sound/pcm179x.txt | 11 ++- sound/soc/codecs/Kconfig | 20 +++++- sound/soc/codecs/Makefile | 4 ++ sound/soc/codecs/pcm179x-i2c.c | 82 ++++++++++++++++++++++ sound/soc/codecs/pcm179x-spi.c | 81 +++++++++++++++++++++ sound/soc/codecs/pcm179x.c | 64 +++-------------- sound/soc/codecs/pcm179x.h | 14 +++- 7 files changed, 215 insertions(+), 61 deletions(-) create mode 100644 sound/soc/codecs/pcm179x-i2c.c create mode 100644 sound/soc/codecs/pcm179x-spi.c
-- 2.7.0
participants (4)
-
Jacob Siverskog -
Johan Hovold -
Mark Brown -
Michael Trimarchi