6 files changed, 924 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/sound/ssm2518.txt b/Documentation/devicetree/bindings/sound/ssm2518.txt
new file mode 100644
index 000000000000..59381a778c79
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/ssm2518.txt
@@ -0,0 +1,20 @@
+SSM2518 audio amplifier
+
+This device supports I2C only.
+
+Required properties:
+  - compatible : Must be "adi,ssm2518"
+  - reg : the I2C address of the device. This will either be 0x34 (ADDR pin low)
+        or 0x35 (ADDR pin high)
+
+Optional properties:
+  - gpios : GPIO connected to the nSD pin. If the property is not present it is
+                assumed that the nSD pin is hardwired to always on.
+
+Example:
+
+        ssm2518: ssm2518@34 {
+                compatible = "adi,ssm2518";
+                reg = <0x34>;
+                gpios = <&gpio 5 0>;
+        };
diff --git a/include/linux/platform_data/ssm2518.h b/include/linux/platform_data/ssm2518.h
new file mode 100644
index 000000000000..9a8e3ea287e3
--- /dev/null
+++ b/include/linux/platform_data/ssm2518.h
@@ -0,0 +1,22 @@
+/*
+ * SSM2518 amplifier audio driver
+ *
+ * Copyright 2013 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef __LINUX_PLATFORM_DATA_SSM2518_H__
+#define __LINUX_PLATFORM_DATA_SSM2518_H__
+
+/**
+ * struct ssm2518_platform_data - Platform data for the ssm2518 driver
+ * @enable_gpio: GPIO connected to the nSD pin. Set to -1 if the nSD pin is
+ *            hardwired.
+ */
+struct ssm2518_platform_data {
+        int enable_gpio;
+};
+
+#endif
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 0615e00b4ab7..badb6fbacaa6 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -61,6 +61,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_SI476X if MFD_SI476X_CORE
         select SND_SOC_SN95031 if INTEL_SCU_IPC
         select SND_SOC_SPDIF
+        select SND_SOC_SSM2518 if I2C
         select SND_SOC_SSM2602 if SND_SOC_I2C_AND_SPI
         select SND_SOC_STA32X if I2C
         select SND_SOC_STA529 if I2C
@@ -317,6 +318,9 @@ config SND_SOC_SN95031
 config SND_SOC_SPDIF
         tristate
 
+config SND_SOC_SSM2518
+        tristate
+
 config SND_SOC_SSM2602
         tristate
 
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index c8117cbd8864..70fd8066f546 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -53,6 +53,7 @@ snd-soc-si476x-objs := si476x.o
 snd-soc-sn95031-objs := sn95031.o
 snd-soc-spdif-tx-objs := spdif_transmitter.o
 snd-soc-spdif-rx-objs := spdif_receiver.o
+snd-soc-ssm2518-objs := ssm2518.o
 snd-soc-ssm2602-objs := ssm2602.o
 snd-soc-sta32x-objs := sta32x.o
 snd-soc-sta529-objs := sta529.o
@@ -178,6 +179,7 @@ obj-$(CONFIG_SND_SOC_SIGMADSP)	+= snd-soc-sigmadsp.o
 obj-$(CONFIG_SND_SOC_SI476X)    += snd-soc-si476x.o
 obj-$(CONFIG_SND_SOC_SN95031)   +=snd-soc-sn95031.o
 obj-$(CONFIG_SND_SOC_SPDIF)     += snd-soc-spdif-rx.o snd-soc-spdif-tx.o
+obj-$(CONFIG_SND_SOC_SSM2518)   += snd-soc-ssm2518.o
 obj-$(CONFIG_SND_SOC_SSM2602)   += snd-soc-ssm2602.o
 obj-$(CONFIG_SND_SOC_STA32X)   += snd-soc-sta32x.o
 obj-$(CONFIG_SND_SOC_STA529)   += snd-soc-sta529.o
diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c
new file mode 100644
index 000000000000..95aed552139a
--- /dev/null
+++ b/sound/soc/codecs/ssm2518.c
@@ -0,0 +1,856 @@
+/*
+ * SSM2518 amplifier audio driver
+ *
+ * Copyright 2013 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_data/ssm2518.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+
+#include "ssm2518.h"
+
+#define SSM2518_REG_POWER1              0x00
+#define SSM2518_REG_CLOCK               0x01
+#define SSM2518_REG_SAI_CTRL1           0x02
+#define SSM2518_REG_SAI_CTRL2           0x03
+#define SSM2518_REG_CHAN_MAP            0x04
+#define SSM2518_REG_LEFT_VOL            0x05
+#define SSM2518_REG_RIGHT_VOL           0x06
+#define SSM2518_REG_MUTE_CTRL           0x07
+#define SSM2518_REG_FAULT_CTRL          0x08
+#define SSM2518_REG_POWER2              0x09
+#define SSM2518_REG_DRC_1               0x0a
+#define SSM2518_REG_DRC_2               0x0b
+#define SSM2518_REG_DRC_3               0x0c
+#define SSM2518_REG_DRC_4               0x0d
+#define SSM2518_REG_DRC_5               0x0e
+#define SSM2518_REG_DRC_6               0x0f
+#define SSM2518_REG_DRC_7               0x10
+#define SSM2518_REG_DRC_8               0x11
+#define SSM2518_REG_DRC_9               0x12
+
+#define SSM2518_POWER1_RESET                    BIT(7)
+#define SSM2518_POWER1_NO_BCLK                  BIT(5)
+#define SSM2518_POWER1_MCS_MASK                 (0xf << 1)
+#define SSM2518_POWER1_MCS_64FS                 (0x0 << 1)
+#define SSM2518_POWER1_MCS_128FS                (0x1 << 1)
+#define SSM2518_POWER1_MCS_256FS                (0x2 << 1)
+#define SSM2518_POWER1_MCS_384FS                (0x3 << 1)
+#define SSM2518_POWER1_MCS_512FS                (0x4 << 1)
+#define SSM2518_POWER1_MCS_768FS                (0x5 << 1)
+#define SSM2518_POWER1_MCS_100FS                (0x6 << 1)
+#define SSM2518_POWER1_MCS_200FS                (0x7 << 1)
+#define SSM2518_POWER1_MCS_400FS                (0x8 << 1)
+#define SSM2518_POWER1_SPWDN                    BIT(0)
+
+#define SSM2518_CLOCK_ASR                       BIT(0)
+
+#define SSM2518_SAI_CTRL1_FMT_MASK              (0x3 << 5)
+#define SSM2518_SAI_CTRL1_FMT_I2S               (0x0 << 5)
+#define SSM2518_SAI_CTRL1_FMT_LJ                (0x1 << 5)
+#define SSM2518_SAI_CTRL1_FMT_RJ_24BIT          (0x2 << 5)
+#define SSM2518_SAI_CTRL1_FMT_RJ_16BIT          (0x3 << 5)
+
+#define SSM2518_SAI_CTRL1_SAI_MASK              (0x7 << 2)
+#define SSM2518_SAI_CTRL1_SAI_I2S               (0x0 << 2)
+#define SSM2518_SAI_CTRL1_SAI_TDM_2             (0x1 << 2)
+#define SSM2518_SAI_CTRL1_SAI_TDM_4             (0x2 << 2)
+#define SSM2518_SAI_CTRL1_SAI_TDM_8             (0x3 << 2)
+#define SSM2518_SAI_CTRL1_SAI_TDM_16            (0x4 << 2)
+#define SSM2518_SAI_CTRL1_SAI_MONO              (0x5 << 2)
+
+#define SSM2518_SAI_CTRL1_FS_MASK               (0x3)
+#define SSM2518_SAI_CTRL1_FS_8000_12000         (0x0)
+#define SSM2518_SAI_CTRL1_FS_16000_24000        (0x1)
+#define SSM2518_SAI_CTRL1_FS_32000_48000        (0x2)
+#define SSM2518_SAI_CTRL1_FS_64000_96000        (0x3)
+
+#define SSM2518_SAI_CTRL2_BCLK_INTERAL          BIT(7)
+#define SSM2518_SAI_CTRL2_LRCLK_PULSE           BIT(6)
+#define SSM2518_SAI_CTRL2_LRCLK_INVERT          BIT(5)
+#define SSM2518_SAI_CTRL2_MSB                   BIT(4)
+#define SSM2518_SAI_CTRL2_SLOT_WIDTH_MASK       (0x3 << 2)
+#define SSM2518_SAI_CTRL2_SLOT_WIDTH_32         (0x0 << 2)
+#define SSM2518_SAI_CTRL2_SLOT_WIDTH_24         (0x1 << 2)
+#define SSM2518_SAI_CTRL2_SLOT_WIDTH_16         (0x2 << 2)
+#define SSM2518_SAI_CTRL2_BCLK_INVERT           BIT(1)
+
+#define SSM2518_CHAN_MAP_RIGHT_SLOT_OFFSET      4
+#define SSM2518_CHAN_MAP_RIGHT_SLOT_MASK        0xf0
+#define SSM2518_CHAN_MAP_LEFT_SLOT_OFFSET       0