diff mbox series

[4/4] ASoC: codecs: tlv320aic3x: add SPI support

Message ID 20210406142439.102396-5-jiri.prchal@aksignal.cz (mailing list archive)
State Accepted
Commit fd4daab3b139a24e71cae5de4f0ca715dbb6634a
Headers show
Series Adds SPI support | expand

Commit Message

Jiri Prchal April 6, 2021, 2:24 p.m. UTC 
Added SPI support.

Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz>
---
 sound/soc/codecs/Kconfig           |  7 +++
 sound/soc/codecs/Makefile          |  2 +
 sound/soc/codecs/tlv320aic3x-spi.c | 76 ++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 sound/soc/codecs/tlv320aic3x-spi.c

Comments

Mark Brown April 6, 2021, 4:54 p.m. UTC | #1 
On Tue, Apr 06, 2021 at 04:24:39PM +0200, Jiri Prchal wrote:
> Added SPI support.
> 
> Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz>
> ---
>  sound/soc/codecs/Kconfig           |  7 +++
>  sound/soc/codecs/Makefile          |  2 +
>  sound/soc/codecs/tlv320aic3x-spi.c | 76 ++++++++++++++++++++++++++++++
>  3 files changed, 85 insertions(+)
>  create mode 100644 sound/soc/codecs/tlv320aic3x-spi.c

This looks good but we should also add an update to the DT binding which
notes that SPI is also supported, right now reg is documented as being
at an I2C address.
Jiri Prchal April 7, 2021, 5:44 a.m. UTC | #2 
On 06. 04. 21 18:54, Mark Brown wrote:
> On Tue, Apr 06, 2021 at 04:24:39PM +0200, Jiri Prchal wrote:
>> Added SPI support.
>>
>> Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz>
>> ---
>>   sound/soc/codecs/Kconfig           |  7 +++
>>   sound/soc/codecs/Makefile          |  2 +
>>   sound/soc/codecs/tlv320aic3x-spi.c | 76 ++++++++++++++++++++++++++++++
>>   3 files changed, 85 insertions(+)
>>   create mode 100644 sound/soc/codecs/tlv320aic3x-spi.c
> 
> This looks good but we should also add an update to the DT binding which
> notes that SPI is also supported, right now reg is documented as being
> at an I2C address.
> 
Mark, please, will you navigate me where DT binding is.
I just added this to my board dts and that's all:
	spi0: spi@f0000000 {
	...
		// audio codec
		tlv320aic3106: codec@3 {
			compatible = "ti,tlv320aic3106";
			reg = <3>;
			#sound-dai-cells = <0>;
			spi-max-frequency = <1000000>;
			status = "okay";
			DRVDD-supply = <&reg_3v3>;
			AVDD-supply = <&reg_3v3>;
			IOVDD-supply = <&reg_3v3>;
			DVDD-supply = <&reg_1v8>;
			ai3x-ocmv = <0>;
		};
Péter Ujfalusi April 7, 2021, 12:28 p.m. UTC | #3 
Hi,

On 4/7/21 8:44 AM, Jiří Prchal wrote:
> 
> 
> On 06. 04. 21 18:54, Mark Brown wrote:
>> On Tue, Apr 06, 2021 at 04:24:39PM +0200, Jiri Prchal wrote:
>>> Added SPI support.
>>>
>>> Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz>
>>> ---
>>>   sound/soc/codecs/Kconfig           |  7 +++
>>>   sound/soc/codecs/Makefile          |  2 +
>>>   sound/soc/codecs/tlv320aic3x-spi.c | 76 ++++++++++++++++++++++++++++++
>>>   3 files changed, 85 insertions(+)
>>>   create mode 100644 sound/soc/codecs/tlv320aic3x-spi.c
>>
>> This looks good but we should also add an update to the DT binding which
>> notes that SPI is also supported, right now reg is documented as being
>> at an I2C address.
>>
> Mark, please, will you navigate me where DT binding is.

Documentation/devicetree/bindings/sound/tlv320aic3x.txt

> I just added this to my board dts and that's all:
>     spi0: spi@f0000000 {
>     ...
>         // audio codec
>         tlv320aic3106: codec@3 {
>             compatible = "ti,tlv320aic3106";
>             reg = <3>;
>             #sound-dai-cells = <0>;
>             spi-max-frequency = <1000000>;
>             status = "okay";
>             DRVDD-supply = <&reg_3v3>;
>             AVDD-supply = <&reg_3v3>;
>             IOVDD-supply = <&reg_3v3>;
>             DVDD-supply = <&reg_1v8>;
>             ai3x-ocmv = <0>;
>         };
diff mbox series

Patch

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 7f6a9b22c261..9dc85119bcab 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -215,6 +215,7 @@  config SND_SOC_ALL_CODECS
 	imply SND_SOC_TLV320AIC32X4_I2C
 	imply SND_SOC_TLV320AIC32X4_SPI
 	imply SND_SOC_TLV320AIC3X_I2C
+	imply SND_SOC_TLV320AIC3X_SPI
 	imply SND_SOC_TPA6130A2
 	imply SND_SOC_TLV320DAC33
 	imply SND_SOC_TSCS42XX
@@ -1427,6 +1428,12 @@  config SND_SOC_TLV320AIC3X_I2C
 	select SND_SOC_TLV320AIC3X
 	select REGMAP_I2C
 
+config SND_SOC_TLV320AIC3X_SPI
+	tristate "Texas Instruments TLV320AIC3x audio CODECs - SPI"
+	depends on SPI_MASTER
+	select SND_SOC_TLV320AIC3X
+	select REGMAP_SPI
+
 config SND_SOC_TLV320DAC33
 	tristate
 	depends on I2C
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 3710726f740f..022b3801d964 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -234,6 +234,7 @@  snd-soc-tlv320aic32x4-i2c-objs := tlv320aic32x4-i2c.o
 snd-soc-tlv320aic32x4-spi-objs := tlv320aic32x4-spi.o
 snd-soc-tlv320aic3x-objs := tlv320aic3x.o
 snd-soc-tlv320aic3x-i2c-objs := tlv320aic3x-i2c.o
+snd-soc-tlv320aic3x-spi-objs := tlv320aic3x-spi.o
 snd-soc-tlv320dac33-objs := tlv320dac33.o
 snd-soc-tlv320adcx140-objs := tlv320adcx140.o
 snd-soc-tscs42xx-objs := tscs42xx.o
@@ -550,6 +551,7 @@  obj-$(CONFIG_SND_SOC_TLV320AIC32X4_I2C)	+= snd-soc-tlv320aic32x4-i2c.o
 obj-$(CONFIG_SND_SOC_TLV320AIC32X4_SPI)	+= snd-soc-tlv320aic32x4-spi.o
 obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o
 obj-$(CONFIG_SND_SOC_TLV320AIC3X_I2C)	+= snd-soc-tlv320aic3x-i2c.o
+obj-$(CONFIG_SND_SOC_TLV320AIC3X_SPI)	+= snd-soc-tlv320aic3x-spi.o
 obj-$(CONFIG_SND_SOC_TLV320DAC33)	+= snd-soc-tlv320dac33.o
 obj-$(CONFIG_SND_SOC_TLV320ADCX140)	+= snd-soc-tlv320adcx140.o
 obj-$(CONFIG_SND_SOC_TSCS42XX)	+= snd-soc-tscs42xx.o
diff --git a/sound/soc/codecs/tlv320aic3x-spi.c b/sound/soc/codecs/tlv320aic3x-spi.c
new file mode 100644
index 000000000000..bd78ab0910da
--- /dev/null
+++ b/sound/soc/codecs/tlv320aic3x-spi.c
@@ -0,0 +1,76 @@ 
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * ALSA SoC TLV320AIC3x codec driver SPI interface
+ *
+ * Author:      Arun KS, <arunks@mistralsolutions.com>
+ * Copyright:   (C) 2008 Mistral Solutions Pvt Ltd.,
+ *
+ * Based on sound/soc/codecs/wm8731.c by Richard Purdie
+ *
+ */
+
+#include <linux/spi/spi.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+
+#include "tlv320aic3x.h"
+
+static int aic3x_spi_probe(struct spi_device *spi)
+{
+	struct regmap *regmap;
+	struct regmap_config config;
+	const struct spi_device_id *id = spi_get_device_id(spi);
+
+	config = aic3x_regmap;
+	config.reg_bits = 7;
+	config.pad_bits = 1;
+	config.val_bits = 8;
+	config.read_flag_mask = 0x01;
+
+	dev_dbg(&spi->dev, "probing tlv320aic3x spi device\n");
+
+	regmap = devm_regmap_init_spi(spi, &config);
+	return aic3x_probe(&spi->dev, regmap, id->driver_data);
+}
+
+static int aic3x_spi_remove(struct spi_device *spi)
+{
+	return aic3x_remove(&spi->dev);
+}
+
+static const struct spi_device_id aic3x_spi_id[] = {
+	{ "tlv320aic3x", AIC3X_MODEL_3X },
+	{ "tlv320aic33", AIC3X_MODEL_33 },
+	{ "tlv320aic3007", AIC3X_MODEL_3007 },
+	{ "tlv320aic3104", AIC3X_MODEL_3104 },
+	{ }
+};
+MODULE_DEVICE_TABLE(spi, aic3x_spi_id);
+
+static const struct of_device_id aic3x_of_id[] = {
+	{ .compatible = "ti,tlv320aic3x", },
+	{ .compatible = "ti,tlv320aic33" },
+	{ .compatible = "ti,tlv320aic3007" },
+	{ .compatible = "ti,tlv320aic3104" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, aic3x_of_id);
+
+static struct spi_driver aic3x_spi_driver = {
+	.driver = {
+		.name = "tlv320aic3x",
+		.owner = THIS_MODULE,
+		.of_match_table = aic3x_of_id,
+	},
+	.probe = aic3x_spi_probe,
+	.remove = aic3x_spi_remove,
+	.id_table = aic3x_spi_id,
+};
+
+module_spi_driver(aic3x_spi_driver);
+
+MODULE_DESCRIPTION("ASoC TLV320AIC3x codec driver SPI");
+MODULE_AUTHOR("Arun KS <arunks@mistralsolutions.com>");
+MODULE_LICENSE("GPL");