ASoC: cros_ec_codec: extract DMIC EC command from I2S RX

Extract DMIC EC command from I2S RX.  Setting and getting
microphone gains is common features.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Acked-By: Benson Leung <bleung@chromium.org>
Link: https://lore.kernel.org/r/20191014180059.03.I93d9c65964f3c30f85a36d228e31150ff1917706@changeid
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/platform/chrome/cros_ec_trace.c b/drivers/platform/chrome/cros_ec_trace.c
index 901850004b2bcd5281cadfb24677190e2916617b..e73bb6a8b00e73b0faeacf6168773981b24746e9 100644 (file)
--- a/drivers/platform/chrome/cros_ec_trace.c
+++ b/drivers/platform/chrome/cros_ec_trace.c
@@ -98,6 +98,7 @@
        TRACE_SYMBOL(EC_CMD_SB_READ_BLOCK), \
        TRACE_SYMBOL(EC_CMD_SB_WRITE_BLOCK), \
        TRACE_SYMBOL(EC_CMD_BATTERY_VENDOR_PARAM), \
+       TRACE_SYMBOL(EC_CMD_EC_CODEC_DMIC), \
        TRACE_SYMBOL(EC_CMD_EC_CODEC_I2S_RX), \
        TRACE_SYMBOL(EC_CMD_REBOOT_EC), \
        TRACE_SYMBOL(EC_CMD_GET_PANIC_INFO), \

diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
index 261ac83bd00726bb744d81f60a63b153f19ad553..58e460c015efdfdf1062e52363232f1c3712d636 100644 (file)
--- a/include/linux/platform_data/cros_ec_commands.h
+++ b/include/linux/platform_data/cros_ec_commands.h
@@ -4466,18 +4466,48 @@ enum mkbp_cec_event {
 
 /*****************************************************************************/
 
+/* Commands for DMIC on audio codec. */
+#define EC_CMD_EC_CODEC_DMIC 0x00BC
+
+enum ec_codec_dmic_subcmd {
+       EC_CODEC_DMIC_SET_GAIN = 0x0,
+       EC_CODEC_DMIC_GET_GAIN = 0x1,
+       EC_CODEC_DMIC_SUBCMD_COUNT,
+};
+
+struct __ec_align1 ec_param_ec_codec_dmic_set_gain {
+       uint8_t left;
+       uint8_t right;
+       uint8_t reserved[2];
+};
+
+struct __ec_align4 ec_param_ec_codec_dmic {
+       uint8_t cmd; /* enum ec_codec_dmic_subcmd */
+       uint8_t reserved[3];
+
+       union {
+               struct ec_param_ec_codec_dmic_set_gain
+                               set_gain_param;
+       };
+};
+
+struct __ec_align1 ec_response_ec_codec_dmic_get_gain {
+       uint8_t left;
+       uint8_t right;
+};
+
+/*****************************************************************************/
+
 /* Commands for I2S RX on audio codec. */
 
-#define EC_CMD_EC_CODEC_I2S_RX 0x00BC
+#define EC_CMD_EC_CODEC_I2S_RX 0x00BD
 
 enum ec_codec_i2s_rx_subcmd {
        EC_CODEC_I2S_RX_ENABLE = 0x0,
        EC_CODEC_I2S_RX_DISABLE = 0x1,
-       EC_CODEC_I2S_RX_SET_GAIN = 0x2,
-       EC_CODEC_I2S_RX_GET_GAIN = 0x3,
-       EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH = 0x4,
-       EC_CODEC_I2S_RX_SET_DAIFMT = 0x5,
-       EC_CODEC_I2S_RX_SET_BCLK = 0x6,
+       EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH = 0x2,
+       EC_CODEC_I2S_RX_SET_DAIFMT = 0x3,
+       EC_CODEC_I2S_RX_SET_BCLK = 0x4,
        EC_CODEC_I2S_RX_SUBCMD_COUNT,
 };
 
@@ -4521,8 +4551,6 @@ struct __ec_align4 ec_param_ec_codec_i2s_rx {
        union {
                struct ec_param_ec_codec_i2s_rx_set_sample_depth
                                set_sample_depth_param;
-               struct ec_param_ec_codec_i2s_rx_set_gain
-                               set_gain_param;
                struct ec_param_ec_codec_i2s_rx_set_daifmt
                                set_daifmt_param;
                struct ec_param_ec_codec_i2s_rx_set_bclk
@@ -4530,11 +4558,6 @@ struct __ec_align4 ec_param_ec_codec_i2s_rx {
        };
 };
 
-struct __ec_align1 ec_response_ec_codec_i2s_rx_get_gain {
-       uint8_t left;
-       uint8_t right;
-};
-
 /*****************************************************************************/
 /* System commands */
 

diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c
index 179fa77291cdcc15cc1f5f637757d46f0ba76607..c19c7fe42e2eef1e90877dfd4efcad3e2de1cde5 100644 (file)
--- a/sound/soc/codecs/cros_ec_codec.c
+++ b/sound/soc/codecs/cros_ec_codec.c
@@ -64,12 +64,12 @@ static int dmic_get_gain(struct snd_kcontrol *kcontrol,
                snd_soc_kcontrol_component(kcontrol);
        struct cros_ec_codec_priv *priv =
                snd_soc_component_get_drvdata(component);
-       struct ec_param_ec_codec_i2s_rx p;
-       struct ec_response_ec_codec_i2s_rx_get_gain r;
+       struct ec_param_ec_codec_dmic p;
+       struct ec_response_ec_codec_dmic_get_gain r;
        int ret;
 
-       p.cmd = EC_CODEC_I2S_RX_GET_GAIN;
-       ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
+       p.cmd = EC_CODEC_DMIC_GET_GAIN;
+       ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC,
                                   (uint8_t *)&p, sizeof(p),
                                   (uint8_t *)&r, sizeof(r));
        if (ret < 0)
@@ -93,17 +93,17 @@ static int dmic_put_gain(struct snd_kcontrol *kcontrol,
        int max_dmic_gain = control->max;
        int left = ucontrol->value.integer.value[0];
        int right = ucontrol->value.integer.value[1];
-       struct ec_param_ec_codec_i2s_rx p;
+       struct ec_param_ec_codec_dmic p;
 
        if (left > max_dmic_gain || right > max_dmic_gain)
                return -EINVAL;
 
        dev_dbg(component->dev, "set mic gain to %u, %u\n", left, right);
 
-       p.cmd = EC_CODEC_I2S_RX_SET_GAIN;
+       p.cmd = EC_CODEC_DMIC_SET_GAIN;
        p.set_gain_param.left = left;
        p.set_gain_param.right = right;
-       return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
+       return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC,
                                    (uint8_t *)&p, sizeof(p), NULL, 0);
 }
 
@@ -120,6 +120,29 @@ static struct snd_kcontrol_new dmic_controls[] = {
                                   dmic_gain_tlv),
 };
 
+static int dmic_probe(struct snd_soc_component *component)
+{
+       struct cros_ec_codec_priv *priv =
+               snd_soc_component_get_drvdata(component);
+       struct device *dev = priv->dev;
+       int ret, val;
+       struct soc_mixer_control *control;
+
+       ret = device_property_read_u32(dev, "max-dmic-gain", &val);
+       if (ret) {
+               dev_err(dev, "Failed to read 'max-dmic-gain'\n");
+               return ret;
+       }
+
+       control = (struct soc_mixer_control *)
+               dmic_controls[DMIC_CTL_GAIN].private_value;
+       control->max = val;
+       control->platform_max = val;
+
+       return snd_soc_add_component_controls(component,
+                       &dmic_controls[DMIC_CTL_GAIN], 1);
+}
+
 static int i2s_rx_hw_params(struct snd_pcm_substream *substream,
                            struct snd_pcm_hw_params *params,
                            struct snd_soc_dai *dai)
@@ -265,25 +288,7 @@ static struct snd_soc_dai_driver i2s_rx_dai_driver = {
 
 static int i2s_rx_probe(struct snd_soc_component *component)
 {
-       struct cros_ec_codec_priv *priv =
-               snd_soc_component_get_drvdata(component);
-       struct device *dev = priv->dev;
-       int ret, val;
-       struct soc_mixer_control *control;
-
-       ret = device_property_read_u32(dev, "max-dmic-gain", &val);
-       if (ret) {
-               dev_err(dev, "Failed to read 'max-dmic-gain'\n");
-               return ret;
-       }
-
-       control = (struct soc_mixer_control *)
-                       dmic_controls[DMIC_CTL_GAIN].private_value;
-       control->max = val;
-       control->platform_max = val;
-
-       return snd_soc_add_component_controls(component,
-                       &dmic_controls[DMIC_CTL_GAIN], 1);
+       return dmic_probe(component);
 }
 
 static const struct snd_soc_component_driver i2s_rx_component_driver = {