Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 125bc681 authored by Jeremy McDermond's avatar Jeremy McDermond Committed by Mark Brown
Browse files

ASoC: tlv320aic32x4: Add SPI support 



Add support for running the tlv32x4 control channel over SPI rather than I2C.

Signed-off-by: default avatarJeremy McDermond <nh6z@nh6z.net>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3bcfd222

sound/soc/codecs/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_TLV320AIC26 if SPI_MASTER

	select SND_SOC_TLV320AIC31XX if I2C

	select SND_SOC_TLV320AIC32X4_I2C if I2C

	select SND_SOC_TLV320AIC32X4_SPI if SPI_MASTER

	select SND_SOC_TLV320AIC3X if I2C

	select SND_SOC_TPA6130A2 if I2C

	select SND_SOC_TLV320DAC33 if I2C
@@ -774,6 +775,11 @@ config SND_SOC_TLV320AIC32X4_I2C 
	depends on I2C

	select SND_SOC_TLV320AIC32X4



config SND_SOC_TLV320AIC32X4_SPI

	tristate

	depends on SPI_MASTER

	select SND_SOC_TLV320AIC32X4



config SND_SOC_TLV320AIC3X

	tristate "Texas Instruments TLV320AIC3x CODECs"

	depends on I2C

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ snd-soc-tlv320aic26-objs := tlv320aic26.o 
snd-soc-tlv320aic31xx-objs := tlv320aic31xx.o

snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o

snd-soc-tlv320aic32x4-i2c-objs := tlv320aic32x4-i2c.o

snd-soc-tlv320aic32x4-spi-objs := tlv320aic32x4-spi.o

snd-soc-tlv320aic3x-objs := tlv320aic3x.o

snd-soc-tlv320dac33-objs := tlv320dac33.o

snd-soc-ts3a227e-objs := ts3a227e.o
@@ -344,6 +345,7 @@ obj-$(CONFIG_SND_SOC_TLV320AIC26) += snd-soc-tlv320aic26.o 
obj-$(CONFIG_SND_SOC_TLV320AIC31XX)     += snd-soc-tlv320aic31xx.o

obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.o

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_TLV320DAC33)	+= snd-soc-tlv320dac33.o

obj-$(CONFIG_SND_SOC_TS3A227E)	+= snd-soc-ts3a227e.o

sound/soc/codecs/tlv320aic32x4-spi.c

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/*

 * linux/sound/soc/codecs/tlv320aic32x4-spi.c

 *

 * Copyright 2011 NW Digital Radio

 *

 * Author: Jeremy McDermond <nh6z@nh6z.net>

 *

 * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.

 *

 * 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/spi/spi.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/regmap.h>

#include <sound/soc.h>



#include "tlv320aic32x4.h"



static int aic32x4_spi_probe(struct spi_device *spi)

{

	struct regmap *regmap;

	struct regmap_config config;



	config = aic32x4_regmap_config;

	config.reg_bits = 7;

	config.pad_bits = 1;

	config.val_bits = 8;

	config.read_flag_mask = 0x01;



	regmap = devm_regmap_init_spi(spi, &config);

	return aic32x4_probe(&spi->dev, regmap);

}



static int aic32x4_spi_remove(struct spi_device *spi)

{

	return aic32x4_remove(&spi->dev);

}



static const struct spi_device_id aic32x4_spi_id[] = {

	{ "tlv320aic32x4", 0 },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(spi, aic32x4_spi_id);



static const struct of_device_id aic32x4_of_id[] = {

	{ .compatible = "ti,tlv320aic32x4", },

	{ /* senitel */ }

};

MODULE_DEVICE_TABLE(of, aic32x4_of_id);



static struct spi_driver aic32x4_spi_driver = {

	.driver = {

		.name = "tlv320aic32x4",

		.owner = THIS_MODULE,

		.of_match_table = aic32x4_of_id,

	},

	.probe =    aic32x4_spi_probe,

	.remove =   aic32x4_spi_remove,

	.id_table = aic32x4_spi_id,

};



module_spi_driver(aic32x4_spi_driver);



MODULE_DESCRIPTION("ASoC TLV320AIC32x4 codec driver SPI");

MODULE_AUTHOR("Jeremy McDermond <nh6z@nh6z.net>");

MODULE_LICENSE("GPL");