6 files changed, 727 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/sound/tas2552.txt b/Documentation/devicetree/bindings/sound/tas2552.txt
new file mode 100644
index 000000000000..55e2a0af5645
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/tas2552.txt
@@ -0,0 +1,26 @@
+Texas Instruments - tas2552 Codec module
+
+The tas2552 serial control bus communicates through I2C protocols
+
+Required properties:
+        - compatible - One of:
+                "ti,tas2552" - TAS2552
+        - reg -  I2C slave address
+        - supply-*: Required supply regulators are:
+                "vbat"          battery voltage
+                "iovdd"         I/O Voltage
+                "avdd"          Analog DAC Voltage
+
+Optional properties:
+        - enable-gpio - gpio pin to enable/disable the device
+
+Example:
+
+tas2552: tas2552@41 {
+        compatible = "ti,tas2552";
+        reg = <0x41>;
+        enable-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>;
+};
+
+For more product information please see the link below:
+http://www.ti.com/product/TAS2552
diff --git a/include/sound/tas2552-plat.h b/include/sound/tas2552-plat.h
new file mode 100644
index 000000000000..65e7627ba38e
--- /dev/null
+++ b/include/sound/tas2552-plat.h
@@ -0,0 +1,25 @@
+/*
+ * TAS2552 driver platform header
+ *
+ * Copyright (C) 2014 Texas Instruments Inc.
+ *
+ * Author: Dan Murphy <dmurphy@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+#ifndef TAS2552_PLAT_H
+#define TAS2552_PLAT_H
+
+struct tas2552_platform_data {
+        int enable_gpio;
+};
+
+#endif
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index cbfa1e18f651..480881747ec5 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -91,6 +91,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_STA350 if I2C
         select SND_SOC_STA529 if I2C
         select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
+        select SND_SOC_TAS2552 if I2C
         select SND_SOC_TAS5086 if I2C
         select SND_SOC_TLV320AIC23_I2C if I2C
         select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
@@ -513,6 +514,10 @@ config SND_SOC_STA529
 config SND_SOC_STAC9766
         tristate
 
+config SND_SOC_TAS2552
+        tristate "Texas Instruments TAS2552 Mono Audio amplifier"
+        depends on I2C
+
 config SND_SOC_TAS5086
         tristate "Texas Instruments TAS5086 speaker amplifier"
         depends on I2C
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index be3377b8d73f..d79de052ef8e 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -160,6 +160,7 @@ snd-soc-wm-hubs-objs := wm_hubs.o
 # Amp
 snd-soc-max9877-objs := max9877.o
 snd-soc-tpa6130a2-objs := tpa6130a2.o
+snd-soc-tas2552-objs := tas2552.o
 
 obj-$(CONFIG_SND_SOC_88PM860X)  += snd-soc-88pm860x.o
 obj-$(CONFIG_SND_SOC_AB8500_CODEC)      += snd-soc-ab8500-codec.o
@@ -251,6 +252,7 @@ obj-$(CONFIG_SND_SOC_STA32X)   += snd-soc-sta32x.o
 obj-$(CONFIG_SND_SOC_STA350)   += snd-soc-sta350.o
 obj-$(CONFIG_SND_SOC_STA529)   += snd-soc-sta529.o
 obj-$(CONFIG_SND_SOC_STAC9766)  += snd-soc-stac9766.o
+obj-$(CONFIG_SND_SOC_TAS2552)   += snd-soc-tas2552.o
 obj-$(CONFIG_SND_SOC_TAS5086)   += snd-soc-tas5086.o
 obj-$(CONFIG_SND_SOC_TLV320AIC23)       += snd-soc-tlv320aic23.o
 obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)   += snd-soc-tlv320aic23-i2c.o
diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c
new file mode 100644
index 000000000000..f0760af5a21e
--- /dev/null
+++ b/sound/soc/codecs/tas2552.c
@@ -0,0 +1,540 @@
+/*
+ * tas2552.c - ALSA SoC Texas Instruments TAS2552 Mono Audio Amplifier
+ *
+ * Copyright (C) 2014 Texas Instruments Incorporated -  http://www.ti.com
+ *
+ * Author: Dan Murphy <dmurphy@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * 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/errno.h>
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#include <linux/gpio/consumer.h>
+#include <linux/regulator/consumer.h>
+
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/tlv.h>
+#include <sound/tas2552-plat.h>
+
+#include "tas2552.h"
+
+static struct reg_default tas2552_reg_defs[] = {
+        {TAS2552_CFG_1, 0x22},
+        {TAS2552_CFG_3, 0x80},
+        {TAS2552_DOUT, 0x00},
+        {TAS2552_OUTPUT_DATA, 0xc0},
+        {TAS2552_PDM_CFG, 0x01},
+        {TAS2552_PGA_GAIN, 0x00},
+        {TAS2552_BOOST_PT_CTRL, 0x0f},
+        {TAS2552_RESERVED_0D, 0x00},
+        {TAS2552_LIMIT_RATE_HYS, 0x08},
+        {TAS2552_CFG_2, 0xef},
+        {TAS2552_SER_CTRL_1, 0x00},
+        {TAS2552_SER_CTRL_2, 0x00},
+        {TAS2552_PLL_CTRL_1, 0x10},
+        {TAS2552_PLL_CTRL_2, 0x00},
+        {TAS2552_PLL_CTRL_3, 0x00},
+        {TAS2552_BTIP, 0x8f},
+        {TAS2552_BTS_CTRL, 0x80},
+        {TAS2552_LIMIT_RELEASE, 0x04},
+        {TAS2552_LIMIT_INT_COUNT, 0x00},
+        {TAS2552_EDGE_RATE_CTRL, 0x40},
+        {TAS2552_VBAT_DATA, 0x00},
+};
+
+#define TAS2552_NUM_SUPPLIES    3
+static const char *tas2552_supply_names[TAS2552_NUM_SUPPLIES] = {
+        "vbat",         /* vbat voltage */
+        "iovdd",        /* I/O Voltage */
+        "avdd",         /* Analog DAC Voltage */
+};
+
+struct tas2552_data {
+        struct snd_soc_codec *codec;
+        struct regmap *regmap;
+        struct i2c_client *tas2552_client;
+        struct regulator_bulk_data supplies[TAS2552_NUM_SUPPLIES];
+        struct gpio_desc *enable_gpio;
+        unsigned char regs[TAS2552_VBAT_DATA];
+        unsigned int mclk;
+};
+
+static void tas2552_sw_shutdown(struct tas2552_data *tas_data, int sw_shutdown)
+{
+        u8 cfg1_reg;
+
+        if (sw_shutdown)
+                cfg1_reg = 0;
+        else
+                cfg1_reg = TAS2552_SWS_MASK;
+
+        snd_soc_update_bits(tas_data->codec, TAS2552_CFG_1,
+                                                 TAS2552_SWS_MASK, cfg1_reg);
+}
+
+static int tas2552_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 tas2552_data *tas2552 = dev_get_drvdata(codec->dev);
+        int sample_rate, pll_clk;
+        int d;
+        u8 p, j;
+
+        /* Turn on Class D amplifier */
+        snd_