3 files changed, 583 insertions, 0 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index b92759a39361..1801a6517ddf 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -44,6 +44,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_LM4857 if I2C
         select SND_SOC_LM49453 if I2C
         select SND_SOC_MAX98088 if I2C
+        select SND_SOC_MAX98090 if I2C
         select SND_SOC_MAX98095 if I2C
         select SND_SOC_MAX9850 if I2C
         select SND_SOC_MAX9768 if I2C
@@ -258,6 +259,9 @@ config SND_SOC_LM49453
 config SND_SOC_MAX98088
        tristate
 
+config SND_SOC_MAX98090
+       tristate
+
 config SND_SOC_MAX98095
        tristate
 
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 9bd4d95aab4f..fff64db4bf29 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -34,6 +34,7 @@ snd-soc-lm4857-objs := lm4857.o
 snd-soc-lm49453-objs := lm49453.o
 snd-soc-max9768-objs := max9768.o
 snd-soc-max98088-objs := max98088.o
+snd-soc-max98090-objs := max98090.o
 snd-soc-max98095-objs := max98095.o
 snd-soc-max9850-objs := max9850.o
 snd-soc-mc13783-objs := mc13783.o
@@ -155,6 +156,7 @@ obj-$(CONFIG_SND_SOC_LM4857)	+= snd-soc-lm4857.o
 obj-$(CONFIG_SND_SOC_LM49453)   += snd-soc-lm49453.o
 obj-$(CONFIG_SND_SOC_MAX9768)   += snd-soc-max9768.o
 obj-$(CONFIG_SND_SOC_MAX98088)  += snd-soc-max98088.o
+obj-$(CONFIG_SND_SOC_MAX98090)  += snd-soc-max98090.o
 obj-$(CONFIG_SND_SOC_MAX98095)  += snd-soc-max98095.o
 obj-$(CONFIG_SND_SOC_MAX9850)   += snd-soc-max9850.o
 obj-$(CONFIG_SND_SOC_MC13783)   += snd-soc-mc13783.o
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
new file mode 100644
index 000000000000..c9772ca3da4f
--- /dev/null
+++ b/sound/soc/codecs/max98090.c
@@ -0,0 +1,577 @@
+/*
+ * max98090.c -- MAX98090 ALSA SoC Audio driver
+ * based on Rev0p8 datasheet
+ *
+ * Copyright (C) 2012 Renesas Solutions Corp.
+ * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * Based on
+ *
+ * max98095.c
+ * Copyright 2011 Maxim Integrated Products
+ *
+ * https://github.com/hardkernel/linux/commit/\
+ *      3417d7166b17113b3b33b0a337c74d1c7cc313df#sound/soc/codecs/max98090.c
+ * Copyright 2011 Maxim Integrated Products
+ *
+ * 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.
+ */
+
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+
+/*
+ *
+ * MAX98090 Registers Definition
+ *
+ */
+
+/* RESET / STATUS / INTERRUPT REGISTERS */
+#define MAX98090_0x00_SW_RESET          0x00
+#define MAX98090_0x01_INT_STS           0x01
+#define MAX98090_0x02_JACK_STS          0x02
+#define MAX98090_0x03_INT_MASK          0x03
+
+/* QUICK SETUP REGISTERS */
+#define MAX98090_0x04_SYS_CLK           0x04
+#define MAX98090_0x05_SAMPLE_RATE       0x05
+#define MAX98090_0x06_DAI_IF            0x06
+#define MAX98090_0x07_DAC_PATH          0x07
+#define MAX98090_0x08_MIC_TO_ADC        0x08
+#define MAX98090_0x09_LINE_TO_ADC       0x09
+#define MAX98090_0x0A_ANALOG_MIC_LOOP   0x0A
+#define MAX98090_0x0B_ANALOG_LINE_LOOP  0x0B
+
+/* ANALOG INPUT CONFIGURATION REGISTERS */
+#define MAX98090_0x0D_INPUT_CONFIG      0x0D
+#define MAX98090_0x0E_LINE_IN_LVL       0x0E
+#define MAX98090_0x0F_LINI_IN_CFG       0x0F
+#define MAX98090_0x10_MIC1_IN_LVL       0x10
+#define MAX98090_0x11_MIC2_IN_LVL       0x11
+
+/* MICROPHONE CONFIGURATION REGISTERS  */
+#define MAX98090_0x12_MIC_BIAS_VOL      0x12
+#define MAX98090_0x13_DIGITAL_MIC_CFG   0x13
+#define MAX98090_0x14_DIGITAL_MIC_MODE  0x14
+
+/* ADC PATH AND CONFIGURATION REGISTERS */
+#define MAX98090_0x15_L_ADC_MIX         0x15
+#define MAX98090_0x16_R_ADC_MIX         0x16
+#define MAX98090_0x17_L_ADC_LVL         0x17
+#define MAX98090_0x18_R_ADC_LVL         0x18
+#define MAX98090_0x19_ADC_BIQUAD_LVL    0x19
+#define MAX98090_0x1A_ADC_SIDETONE      0x1A
+
+/* CLOCK CONFIGURATION REGISTERS */
+#define MAX98090_0x1B_SYS_CLK           0x1B
+#define MAX98090_0x1C_CLK_MODE          0x1C
+#define MAX98090_0x1D_ANY_CLK1          0x1D
+#define MAX98090_0x1E_ANY_CLK2          0x1E
+#define MAX98090_0x1F_ANY_CLK3          0x1F
+#define MAX98090_0x20_ANY_CLK4          0x20
+#define MAX98090_0x21_MASTER_MODE       0x21
+
+/* INTERFACE CONTROL REGISTERS */
+#define MAX98090_0x22_DAI_IF_FMT        0x22
+#define MAX98090_0x23_DAI_TDM_FMT1      0x23
+#define MAX98090_0x24_DAI_TDM_FMT2      0x24
+#define MAX98090_0x25_DAI_IO_CFG        0x25
+#define MAX98090_0x26_FILTER_CFG        0x26
+#define MAX98090_0x27_DAI_PLAYBACK_LVL  0x27
+#define MAX98090_0x28_EQ_PLAYBACK_LVL   0x28
+
+/* HEADPHONE CONTROL REGISTERS */
+#define MAX98090_0x29_L_HP_MIX          0x29
+#define MAX98090_0x2A_R_HP_MIX          0x2A
+#define MAX98090_0x2B_HP_CTR            0x2B
+#define MAX98090_0x2C_L_HP_VOL          0x2C
+#define MAX98090_0x2D_R_HP_VOL          0x2D
+
+/* SPEAKER CONFIGURATION REGISTERS */
+#define MAX98090_0x2E_L_SPK_MIX         0x2E
+#define MAX98090_0x2F_R_SPK_MIX         0x2F
+#define MAX98090_0x30_SPK_CTR           0x30
+#define MAX98090_0x31_L_SPK_VOL         0x31
+#define MAX98090_0x32_R_SPK_VOL         0x32
+
+/* ALC CONFIGURATION REGISTERS */
+#define MAX98090_0x33_ALC_TIMING        0x33
+#define MAX98090_0x34_ALC_COMPRESSOR    0x34
+#define MAX98090_0x35_ALC_EXPANDER      0x35
+#define MAX98090_0x36_ALC_GAIN          0x36
+
+/* RECEIVER AND LINE_OUTPUT REGISTERS */
+#define MAX98090_0x37_RCV_LOUT_L_MIX    0x37
+#define MAX98090_0x38_RCV_LOUT_L_CNTL   0x38
+#define MAX98090_0x39_RCV_LOUT_L_VOL    0x39
+#define MAX98090_0x3A_LOUT_R_MIX        0x3A
+#define MAX98090_0x3B_LOUT_R_CNTL       0x3B
+#define MAX98090_0x3C_LOUT_R_VOL        0x3C
+
+/* JACK DETECT AND ENABLE REGISTERS */
+#define MAX98090_0x3D_JACK_DETECT       0x3D
+#define MAX98090_0x3E_IN_ENABLE         0x3E
+#define MAX98090_0x3F_OUT_ENABLE        0x3F
+#define MAX98090_0x40_LVL_CTR           0x40
+#define MAX98090_0x41_DSP_FILTER_ENABLE 0x41
+
+/* BIAS AND POWER MODE CONFIGURATION REGISTERS */
+#define MAX98090_0x42_BIAS_CTR          0x42
+#define MAX98090_0x43_DAC_CTR           0x43
+#define MAX98090_0x44_ADC_CTR           0x44
+#define MAX98090_0x45_DEV_SHUTDOWN      0x45
+
+/* REVISION ID REGISTER */
+#define MAX98090_0xFF_REV_ID            0xFF
+
+#define MAX98090_REG_MAX_CACHED         0x45
+#define MAX98090_REG_END                0xFF
+
+/*
+ *
+ * MAX98090 Registers Bit Fields
+ *
+ */
+
+/* MAX98090_0x06_DAI_IF */
+#define MAX98090_DAI_IF_MASK            0x3F
+#define MAX98090_RJ_M                   (1 << 5)
+#define MAX98090_RJ_S                   (1 << 4)
+#define MAX98090_LJ_M                   (1 << 3)
+#define MAX98090_LJ_S                   (1 << 2)
+#define MAX98090_I2S_M                  (1 << 1)
+#define MAX98090_I2S_S                  (1 << 0)
+
+/* MAX98090_0x45_DEV_SHUTDOWN */
+#define MAX98090_SHDNRUN                (1 << 7)