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

Commit 51a545a3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next

parents a1916ff3 0471cd93

Documentation/devicetree/bindings/sound/pcm1792a.txt→Documentation/devicetree/bindings/sound/pcm179x.txt

+1 −1
Original line number Diff line number Diff line 
Texas Instruments pcm1792a DT bindings

Texas Instruments pcm179x DT bindings



This driver supports the SPI bus.

sound/soc/codecs/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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_PCM1792A if SPI_MASTER

	select SND_SOC_PCM179X if SPI_MASTER

	select SND_SOC_PCM3008

	select SND_SOC_PCM3168A_I2C if I2C

	select SND_SOC_PCM3168A_SPI if SPI_MASTER
@@ -526,8 +526,8 @@ config SND_SOC_PCM1681 
	tristate "Texas Instruments PCM1681 CODEC"

	depends on I2C



config SND_SOC_PCM1792A

	tristate "Texas Instruments PCM1792A CODEC"

config SND_SOC_PCM179X

	tristate "Texas Instruments PCM179X CODEC"

	depends on SPI_MASTER



config SND_SOC_PCM3008

sound/soc/codecs/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ snd-soc-mc13783-objs := mc13783.o 
snd-soc-ml26124-objs := ml26124.o

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

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

snd-soc-pcm1792a-codec-objs := pcm1792a.o

snd-soc-pcm179x-codec-objs := pcm179x.o

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

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

snd-soc-pcm3168a-i2c-objs := pcm3168a-i2c.o
@@ -284,7 +284,7 @@ obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o 
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_PCM1792A)	+= snd-soc-pcm1792a-codec.o

obj-$(CONFIG_SND_SOC_PCM179X)	+= snd-soc-pcm179x-codec.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

sound/soc/codecs/pcm1792a.c→sound/soc/codecs/pcm179x.c

+271 −0
Original line number Diff line number Diff line 
/*

 * PCM1792A ASoC codec driver

 * PCM179X ASoC codec driver

 *

 * Copyright (c) Amarula Solutions B.V. 2013

 *
@@ -31,21 +31,21 @@ 
#include <linux/of.h>

#include <linux/of_device.h>



#include "pcm1792a.h"

#include "pcm179x.h"



#define PCM1792A_DAC_VOL_LEFT	0x10

#define PCM1792A_DAC_VOL_RIGHT	0x11

#define PCM1792A_FMT_CONTROL	0x12

#define PCM1792A_MODE_CONTROL	0x13

#define PCM1792A_SOFT_MUTE	PCM1792A_FMT_CONTROL

#define PCM179X_DAC_VOL_LEFT	0x10

#define PCM179X_DAC_VOL_RIGHT	0x11

#define PCM179X_FMT_CONTROL	0x12

#define PCM179X_MODE_CONTROL	0x13

#define PCM179X_SOFT_MUTE	PCM179X_FMT_CONTROL



#define PCM1792A_FMT_MASK	0x70

#define PCM1792A_FMT_SHIFT	4

#define PCM1792A_MUTE_MASK	0x01

#define PCM1792A_MUTE_SHIFT	0

#define PCM1792A_ATLD_ENABLE	(1 << 7)

#define PCM179X_FMT_MASK	0x70

#define PCM179X_FMT_SHIFT	4

#define PCM179X_MUTE_MASK	0x01

#define PCM179X_MUTE_SHIFT	0

#define PCM179X_ATLD_ENABLE	(1 << 7)



static const struct reg_default pcm1792a_reg_defaults[] = {

static const struct reg_default pcm179x_reg_defaults[] = {

	{ 0x10, 0xff },

	{ 0x11, 0xff },

	{ 0x12, 0x50 },
@@ -56,57 +56,57 @@ static const struct reg_default pcm1792a_reg_defaults[] = { 
	{ 0x17, 0x00 },

};



static bool pcm1792a_accessible_reg(struct device *dev, unsigned int reg)

static bool pcm179x_accessible_reg(struct device *dev, unsigned int reg)

{

	return reg >= 0x10 && reg <= 0x17;

}



static bool pcm1792a_writeable_reg(struct device *dev, unsigned register reg)

static bool pcm179x_writeable_reg(struct device *dev, unsigned register reg)

{

	bool accessible;



	accessible = pcm1792a_accessible_reg(dev, reg);

	accessible = pcm179x_accessible_reg(dev, reg);



	return accessible && reg != 0x16 && reg != 0x17;

}



struct pcm1792a_private {

struct pcm179x_private {

	struct regmap *regmap;

	unsigned int format;

	unsigned int rate;

};



static int pcm1792a_set_dai_fmt(struct snd_soc_dai *codec_dai,

static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai,

                             unsigned int format)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct pcm1792a_private *priv = snd_soc_codec_get_drvdata(codec);

	struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec);



	priv->format = format;



	return 0;

}



static int pcm1792a_digital_mute(struct snd_soc_dai *dai, int mute)

static int pcm179x_digital_mute(struct snd_soc_dai *dai, int mute)

{

	struct snd_soc_codec *codec = dai->codec;

	struct pcm1792a_private *priv = snd_soc_codec_get_drvdata(codec);

	struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec);

	int ret;



	ret = regmap_update_bits(priv->regmap, PCM1792A_SOFT_MUTE,

				 PCM1792A_MUTE_MASK, !!mute);

	ret = regmap_update_bits(priv->regmap, PCM179X_SOFT_MUTE,

				 PCM179X_MUTE_MASK, !!mute);

	if (ret < 0)

		return ret;



	return 0;

}



static int pcm1792a_hw_params(struct snd_pcm_substream *substream,

static int pcm179x_hw_params(struct snd_pcm_substream *substream,

			     struct snd_pcm_hw_params *params,

			     struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct pcm1792a_private *priv = snd_soc_codec_get_drvdata(codec);

	struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec);

	int val = 0, ret;



	priv->rate = params_rate(params);
@@ -143,129 +143,129 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	val = val << PCM1792A_FMT_SHIFT | PCM1792A_ATLD_ENABLE;

	val = val << PCM179X_FMT_SHIFT | PCM179X_ATLD_ENABLE;



	ret = regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL,

				 PCM1792A_FMT_MASK | PCM1792A_ATLD_ENABLE, val);

	ret = regmap_update_bits(priv->regmap, PCM179X_FMT_CONTROL,

				 PCM179X_FMT_MASK | PCM179X_ATLD_ENABLE, val);

	if (ret < 0)

		return ret;



	return 0;

}



static const struct snd_soc_dai_ops pcm1792a_dai_ops = {

	.set_fmt	= pcm1792a_set_dai_fmt,

	.hw_params	= pcm1792a_hw_params,

	.digital_mute	= pcm1792a_digital_mute,

static const struct snd_soc_dai_ops pcm179x_dai_ops = {

	.set_fmt	= pcm179x_set_dai_fmt,

	.hw_params	= pcm179x_hw_params,

	.digital_mute	= pcm179x_digital_mute,

};



static const DECLARE_TLV_DB_SCALE(pcm1792a_dac_tlv, -12000, 50, 1);

static const DECLARE_TLV_DB_SCALE(pcm179x_dac_tlv, -12000, 50, 1);



static const struct snd_kcontrol_new pcm1792a_controls[] = {

	SOC_DOUBLE_R_RANGE_TLV("DAC Playback Volume", PCM1792A_DAC_VOL_LEFT,

			 PCM1792A_DAC_VOL_RIGHT, 0, 0xf, 0xff, 0,

			 pcm1792a_dac_tlv),

	SOC_SINGLE("DAC Invert Output Switch", PCM1792A_MODE_CONTROL, 7, 1, 0),

	SOC_SINGLE("DAC Rolloff Filter Switch", PCM1792A_MODE_CONTROL, 1, 1, 0),

static const struct snd_kcontrol_new pcm179x_controls[] = {

	SOC_DOUBLE_R_RANGE_TLV("DAC Playback Volume", PCM179X_DAC_VOL_LEFT,

			 PCM179X_DAC_VOL_RIGHT, 0, 0xf, 0xff, 0,

			 pcm179x_dac_tlv),

	SOC_SINGLE("DAC Invert Output Switch", PCM179X_MODE_CONTROL, 7, 1, 0),

	SOC_SINGLE("DAC Rolloff Filter Switch", PCM179X_MODE_CONTROL, 1, 1, 0),

};



static const struct snd_soc_dapm_widget pcm1792a_dapm_widgets[] = {

static const struct snd_soc_dapm_widget pcm179x_dapm_widgets[] = {

SND_SOC_DAPM_OUTPUT("IOUTL+"),

SND_SOC_DAPM_OUTPUT("IOUTL-"),

SND_SOC_DAPM_OUTPUT("IOUTR+"),

SND_SOC_DAPM_OUTPUT("IOUTR-"),

};



static const struct snd_soc_dapm_route pcm1792a_dapm_routes[] = {

static const struct snd_soc_dapm_route pcm179x_dapm_routes[] = {

	{ "IOUTL+", NULL, "Playback" },

	{ "IOUTL-", NULL, "Playback" },

	{ "IOUTR+", NULL, "Playback" },

	{ "IOUTR-", NULL, "Playback" },

};



static struct snd_soc_dai_driver pcm1792a_dai = {

	.name = "pcm1792a-hifi",

static struct snd_soc_dai_driver pcm179x_dai = {

	.name = "pcm179x-hifi",

	.playback = {

		.stream_name = "Playback",

		.channels_min = 2,

		.channels_max = 2,

		.rates = PCM1792A_RATES,

		.formats = PCM1792A_FORMATS, },

	.ops = &pcm1792a_dai_ops,

	.ops = &pcm179x_dai_ops,

};



static const struct of_device_id pcm1792a_of_match[] = {

static const struct of_device_id pcm179x_of_match[] = {

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

	{ }

};

MODULE_DEVICE_TABLE(of, pcm1792a_of_match);

MODULE_DEVICE_TABLE(of, pcm179x_of_match);



static const struct regmap_config pcm1792a_regmap = {

static const struct regmap_config pcm179x_regmap = {

	.reg_bits		= 8,

	.val_bits		= 8,

	.max_register		= 23,

	.reg_defaults		= pcm1792a_reg_defaults,

	.num_reg_defaults	= ARRAY_SIZE(pcm1792a_reg_defaults),

	.writeable_reg		= pcm1792a_writeable_reg,

	.readable_reg		= pcm1792a_accessible_reg,

	.reg_defaults		= pcm179x_reg_defaults,

	.num_reg_defaults	= ARRAY_SIZE(pcm179x_reg_defaults),

	.writeable_reg		= pcm179x_writeable_reg,

	.readable_reg		= pcm179x_accessible_reg,

};



static struct snd_soc_codec_driver soc_codec_dev_pcm1792a = {

	.controls		= pcm1792a_controls,

	.num_controls		= ARRAY_SIZE(pcm1792a_controls),

	.dapm_widgets		= pcm1792a_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(pcm1792a_dapm_widgets),

	.dapm_routes		= pcm1792a_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(pcm1792a_dapm_routes),

static struct snd_soc_codec_driver soc_codec_dev_pcm179x = {

	.controls		= pcm179x_controls,

	.num_controls		= ARRAY_SIZE(pcm179x_controls),

	.dapm_widgets		= pcm179x_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(pcm179x_dapm_widgets),

	.dapm_routes		= pcm179x_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(pcm179x_dapm_routes),

};



static int pcm1792a_spi_probe(struct spi_device *spi)

static int pcm179x_spi_probe(struct spi_device *spi)

{

	struct pcm1792a_private *pcm1792a;

	struct pcm179x_private *pcm179x;

	int ret;



	pcm1792a = devm_kzalloc(&spi->dev, sizeof(struct pcm1792a_private),

	pcm179x = devm_kzalloc(&spi->dev, sizeof(struct pcm179x_private),

				GFP_KERNEL);

	if (!pcm1792a)

	if (!pcm179x)

		return -ENOMEM;



	spi_set_drvdata(spi, pcm1792a);

	spi_set_drvdata(spi, pcm179x);



	pcm1792a->regmap = devm_regmap_init_spi(spi, &pcm1792a_regmap);

	if (IS_ERR(pcm1792a->regmap)) {

		ret = PTR_ERR(pcm1792a->regmap);

	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,

			&soc_codec_dev_pcm1792a, &pcm1792a_dai, 1);

			&soc_codec_dev_pcm179x, &pcm179x_dai, 1);

}



static int pcm1792a_spi_remove(struct spi_device *spi)

static int pcm179x_spi_remove(struct spi_device *spi)

{

	snd_soc_unregister_codec(&spi->dev);

	return 0;

}



static const struct spi_device_id pcm1792a_spi_ids[] = {

	{ "pcm1792a", 0 },

static const struct spi_device_id pcm179x_spi_ids[] = {

	{ "pcm179x", 0 },

	{ },

};

MODULE_DEVICE_TABLE(spi, pcm1792a_spi_ids);

MODULE_DEVICE_TABLE(spi, pcm179x_spi_ids);



static struct spi_driver pcm1792a_codec_driver = {

static struct spi_driver pcm179x_codec_driver = {

	.driver = {

		.name = "pcm1792a",

		.of_match_table = of_match_ptr(pcm1792a_of_match),

		.name = "pcm179x",

		.of_match_table = of_match_ptr(pcm179x_of_match),

	},

	.id_table = pcm1792a_spi_ids,

	.probe = pcm1792a_spi_probe,

	.remove = pcm1792a_spi_remove,

	.id_table = pcm179x_spi_ids,

	.probe = pcm179x_spi_probe,

	.remove = pcm179x_spi_remove,

};



module_spi_driver(pcm1792a_codec_driver);

module_spi_driver(pcm179x_codec_driver);



MODULE_DESCRIPTION("ASoC PCM1792A driver");

MODULE_DESCRIPTION("ASoC PCM179X driver");

MODULE_AUTHOR("Michael Trimarchi <michael@amarulasolutions.com>");

MODULE_LICENSE("GPL");

sound/soc/codecs/pcm1792a.h→sound/soc/codecs/pcm179x.h

+3 −3
Original line number Diff line number Diff line 
/*

 * definitions for PCM1792A

 * definitions for PCM179X

 *

 * Copyright 2013 Amarula Solutions

 *
@@ -14,8 +14,8 @@ 
 * GNU General Public License for more details.

 */



#ifndef __PCM1792A_H__

#define __PCM1792A_H__

#ifndef __PCM179X_H__

#define __PCM179X_H__



#define PCM1792A_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_8000_48000 | \

			SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \