5 files changed, 107 insertions, 2 deletions

diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
index 9a9631f0559e..fc91082d4c35 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -2791,6 +2791,100 @@ struct ec_response_battery_vendor_param {
 } __packed;
 
 /*****************************************************************************/
+/* Commands for I2S recording on audio codec. */
+
+#define EC_CMD_CODEC_I2S 0x00BC
+
+enum ec_codec_i2s_subcmd {
+        EC_CODEC_SET_SAMPLE_DEPTH = 0x0,
+        EC_CODEC_SET_GAIN = 0x1,
+        EC_CODEC_GET_GAIN = 0x2,
+        EC_CODEC_I2S_ENABLE = 0x3,
+        EC_CODEC_I2S_SET_CONFIG = 0x4,
+        EC_CODEC_I2S_SET_TDM_CONFIG = 0x5,
+        EC_CODEC_I2S_SET_BCLK = 0x6,
+};
+
+enum ec_sample_depth_value {
+        EC_CODEC_SAMPLE_DEPTH_16 = 0,
+        EC_CODEC_SAMPLE_DEPTH_24 = 1,
+};
+
+enum ec_i2s_config {
+        EC_DAI_FMT_I2S = 0,
+        EC_DAI_FMT_RIGHT_J = 1,
+        EC_DAI_FMT_LEFT_J = 2,
+        EC_DAI_FMT_PCM_A = 3,
+        EC_DAI_FMT_PCM_B = 4,
+        EC_DAI_FMT_PCM_TDM = 5,
+};
+
+struct ec_param_codec_i2s {
+        /*
+         * enum ec_codec_i2s_subcmd
+         */
+        uint8_t cmd;
+        union {
+                /*
+                 * EC_CODEC_SET_SAMPLE_DEPTH
+                 * Value should be one of ec_sample_depth_value.
+                 */
+                uint8_t depth;
+
+                /*
+                 * EC_CODEC_SET_GAIN
+                 * Value should be 0~43 for both channels.
+                 */
+                struct ec_param_codec_i2s_set_gain {
+                        uint8_t left;
+                        uint8_t right;
+                } __packed gain;
+
+                /*
+                 * EC_CODEC_I2S_ENABLE
+                 * 1 to enable, 0 to disable.
+                 */
+                uint8_t i2s_enable;
+
+                /*
+                 * EC_CODEC_I2S_SET_COFNIG
+                 * Value should be one of ec_i2s_config.
+                 */
+                uint8_t i2s_config;
+
+                /*
+                 * EC_CODEC_I2S_SET_TDM_CONFIG
+                 * Value should be one of ec_i2s_config.
+                 */
+                struct ec_param_codec_i2s_tdm {
+                        /*
+                         * 0 to 496
+                         */
+                        int16_t ch0_delay;
+                        /*
+                         * -1 to 496
+                         */
+                        int16_t ch1_delay;
+                        uint8_t adjacent_to_ch0;
+                        uint8_t adjacent_to_ch1;
+                } __packed tdm_param;
+
+                /*
+                 * EC_CODEC_I2S_SET_BCLK
+                 */
+                uint32_t bclk;
+        };
+} __packed;
+
+/*
+ * For subcommand EC_CODEC_GET_GAIN.
+ */
+struct ec_response_codec_gain {
+        uint8_t left;
+        uint8_t right;
+} __packed;
+
+/*****************************************************************************/
 /* System commands */
 
 /*
diff --git a/include/linux/mfd/ingenic-tcu.h b/include/linux/mfd/ingenic-tcu.h
index ab16ad283def..2083fa20821d 100644
--- a/include/linux/mfd/ingenic-tcu.h
+++ b/include/linux/mfd/ingenic-tcu.h
@@ -41,7 +41,7 @@
 #define TCU_TCSR_PRESCALE_LSB           3
 #define TCU_TCSR_PRESCALE_MASK          0x38
 
-#define TCU_TCSR_PWM_SD         BIT(9)  /* 0: Shutdown abruptly 1: gracefully */
+#define TCU_TCSR_PWM_SD         BIT(9)  /* 0: Shutdown gracefully 1: abruptly */
 #define TCU_TCSR_PWM_INITL_HIGH BIT(8)  /* Sets the initial output level */
 #define TCU_TCSR_PWM_EN         BIT(7)  /* PWM pin output enable */
 
diff --git a/include/linux/mfd/madera/core.h b/include/linux/mfd/madera/core.h
index fe69c0f4398f..4d5d51a9c8a6 100644
--- a/include/linux/mfd/madera/core.h
+++ b/include/linux/mfd/madera/core.h
@@ -15,6 +15,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/madera/pdata.h>
+#include <linux/mutex.h>
 #include <linux/notifier.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
@@ -37,6 +38,8 @@ enum madera_type {
 
 #define MADERA_MAX_MICBIAS              4
 
+#define MADERA_MAX_HP_OUTPUT            3
+
 /* Notifier events */
 #define MADERA_NOTIFY_VOICE_TRIGGER     0x1
 #define MADERA_NOTIFY_HPDET             0x2
@@ -183,6 +186,10 @@ struct madera {
         unsigned int num_childbias[MADERA_MAX_MICBIAS];
 
         struct snd_soc_dapm_context *dapm;
+        struct mutex dapm_ptr_lock;
+        unsigned int hp_ena;
+        bool out_clamp[MADERA_MAX_HP_OUTPUT];
+        bool out_shorted[MADERA_MAX_HP_OUTPUT];
 
         struct blocking_notifier_head notifier;
 };
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index b9a53e013bff..483168403ae5 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -78,6 +78,8 @@
 #define STEPCONFIG_YNN          BIT(8)
 #define STEPCONFIG_XNP          BIT(9)
 #define STEPCONFIG_YPN          BIT(10)
+#define STEPCONFIG_RFP(val)     ((val) << 12)
+#define STEPCONFIG_RFP_VREFP    (0x3 << 12)
 #define STEPCONFIG_INM_MASK     (0xF << 15)
 #define STEPCONFIG_INM(val)     ((val) << 15)
 #define STEPCONFIG_INM_ADCREFM  STEPCONFIG_INM(8)
@@ -86,6 +88,8 @@
 #define STEPCONFIG_INP_AN4      STEPCONFIG_INP(4)
 #define STEPCONFIG_INP_ADCREFM  STEPCONFIG_INP(8)
 #define STEPCONFIG_FIFO1        BIT(26)
+#define STEPCONFIG_RFM(val)     ((val) << 23)
+#define STEPCONFIG_RFM_VREFN    (0x3 << 23)
 
 /* Delay register */
 #define STEPDELAY_OPEN_MASK     (0x3FFFF << 0)
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index e2687a30e5a1..739b7bf37eaa 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -79,7 +79,7 @@
 /* Some controllers have a CBSY bit */
 #define TMIO_MMC_HAVE_CBSY              BIT(11)
 
-/* Some controllers that support HS400 use use 4 taps while others use 8. */
+/* Some controllers that support HS400 use 4 taps while others use 8. */
 #define TMIO_MMC_HAVE_4TAP_HS400        BIT(13)
 
 int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);