openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: cros_ec_codec: read max DMIC gain from EC codec 

Read max DMIC gain from EC codec instead of DTS.  Also removes the
dt-binding of max-dmic-gain.

Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20191017213539.05.Id4657c864d544634f2b5c1c9b34fa8232ecba44d@changeid
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tzung-Bi Shih 2019-10-17 22:00:10 +08:00 committed by Mark Brown
parent 104c6f8f7f
commit f3e82ad43c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 73 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
View File

@ -1,4 +1,4 @@
* Audio codec controlled by ChromeOS EC Audio codec controlled by ChromeOS EC
Google's ChromeOS EC codec is a digital mic codec provided by the Google's ChromeOS EC codec is a digital mic codec provided by the
Embedded Controller (EC) and is controlled via a host-command interface. Embedded Controller (EC) and is controlled via a host-command interface.
@ -9,7 +9,6 @@ Documentation/devicetree/bindings/mfd/cros-ec.txt).
Required properties: Required properties:
- compatible: Must contain "google,cros-ec-codec" - compatible: Must contain "google,cros-ec-codec"
- #sound-dai-cells: Should be 1. The cell specifies number of DAIs. - #sound-dai-cells: Should be 1. The cell specifies number of DAIs.
- max-dmic-gain: A number for maximum gain in dB on digital microphone.
Example: Example:
@ -21,6 +20,5 @@ cros-ec@0 {
cros_ec_codec: ec-codec { cros_ec_codec: ec-codec {
compatible = "google,cros-ec-codec"; compatible = "google,cros-ec-codec";
#sound-dai-cells = <1>; #sound-dai-cells = <1>;
max-dmic-gain = <43>;
}; };
}; };

43
include/linux/platform_data/cros_ec_commands.h
View File

@ -4530,30 +4530,53 @@ struct __ec_align4 ec_response_ec_codec_get_shm_addr {
#define EC_CMD_EC_CODEC_DMIC 0x00BD #define EC_CMD_EC_CODEC_DMIC 0x00BD
enum ec_codec_dmic_subcmd { enum ec_codec_dmic_subcmd {
EC_CODEC_DMIC_SET_GAIN = 0x0, EC_CODEC_DMIC_GET_MAX_GAIN = 0x0,
EC_CODEC_DMIC_GET_GAIN = 0x1, EC_CODEC_DMIC_SET_GAIN_IDX = 0x1,
EC_CODEC_DMIC_GET_GAIN_IDX = 0x2,
EC_CODEC_DMIC_SUBCMD_COUNT, EC_CODEC_DMIC_SUBCMD_COUNT,
}; };
struct __ec_align1 ec_param_ec_codec_dmic_set_gain { enum ec_codec_dmic_channel {
uint8_t left; EC_CODEC_DMIC_CHANNEL_0 = 0x0,
uint8_t right; EC_CODEC_DMIC_CHANNEL_1 = 0x1,
EC_CODEC_DMIC_CHANNEL_2 = 0x2,
EC_CODEC_DMIC_CHANNEL_3 = 0x3,
EC_CODEC_DMIC_CHANNEL_4 = 0x4,
EC_CODEC_DMIC_CHANNEL_5 = 0x5,
EC_CODEC_DMIC_CHANNEL_6 = 0x6,
EC_CODEC_DMIC_CHANNEL_7 = 0x7,
EC_CODEC_DMIC_CHANNEL_COUNT,
};
struct __ec_align1 ec_param_ec_codec_dmic_set_gain_idx {
uint8_t channel; /* enum ec_codec_dmic_channel */
uint8_t gain;
uint8_t reserved[2]; uint8_t reserved[2];
}; };
struct __ec_align1 ec_param_ec_codec_dmic_get_gain_idx {
uint8_t channel; /* enum ec_codec_dmic_channel */
uint8_t reserved[3];
};
struct __ec_align4 ec_param_ec_codec_dmic { struct __ec_align4 ec_param_ec_codec_dmic {
uint8_t cmd; /* enum ec_codec_dmic_subcmd */ uint8_t cmd; /* enum ec_codec_dmic_subcmd */
uint8_t reserved[3]; uint8_t reserved[3];
union { union {
struct ec_param_ec_codec_dmic_set_gain struct ec_param_ec_codec_dmic_set_gain_idx
set_gain_param; set_gain_idx_param;
struct ec_param_ec_codec_dmic_get_gain_idx
get_gain_idx_param;
}; };
}; };
struct __ec_align1 ec_response_ec_codec_dmic_get_gain { struct __ec_align1 ec_response_ec_codec_dmic_get_max_gain {
uint8_t left; uint8_t max_gain;
uint8_t right; };
struct __ec_align1 ec_response_ec_codec_dmic_get_gain_idx {
uint8_t gain;
}; };
/*****************************************************************************/ /*****************************************************************************/

53
sound/soc/codecs/cros_ec_codec.c
View File

@ -65,18 +65,26 @@ static int dmic_get_gain(struct snd_kcontrol *kcontrol,
struct cros_ec_codec_priv *priv = struct cros_ec_codec_priv *priv =
snd_soc_component_get_drvdata(component); snd_soc_component_get_drvdata(component);
struct ec_param_ec_codec_dmic p; struct ec_param_ec_codec_dmic p;
struct ec_response_ec_codec_dmic_get_gain r; struct ec_response_ec_codec_dmic_get_gain_idx r;
int ret; int ret;
p.cmd = EC_CODEC_DMIC_GET_GAIN; p.cmd = EC_CODEC_DMIC_GET_GAIN_IDX;
p.get_gain_idx_param.channel = EC_CODEC_DMIC_CHANNEL_0;
ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC, ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC,
(uint8_t *)&p, sizeof(p), (uint8_t *)&p, sizeof(p),
(uint8_t *)&r, sizeof(r)); (uint8_t *)&r, sizeof(r));
if (ret < 0) if (ret < 0)
return ret; return ret;
ucontrol->value.integer.value[0] = r.gain;
ucontrol->value.integer.value[0] = r.left; p.cmd = EC_CODEC_DMIC_GET_GAIN_IDX;
ucontrol->value.integer.value[1] = r.right; p.get_gain_idx_param.channel = EC_CODEC_DMIC_CHANNEL_1;
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)
return ret;
ucontrol->value.integer.value[1] = r.gain;
return 0; return 0;
} }
@ -94,15 +102,24 @@ static int dmic_put_gain(struct snd_kcontrol *kcontrol,
int left = ucontrol->value.integer.value[0]; int left = ucontrol->value.integer.value[0];
int right = ucontrol->value.integer.value[1]; int right = ucontrol->value.integer.value[1];
struct ec_param_ec_codec_dmic p; struct ec_param_ec_codec_dmic p;
int ret;
if (left > max_dmic_gain || right > max_dmic_gain) if (left > max_dmic_gain || right > max_dmic_gain)
return -EINVAL; return -EINVAL;
dev_dbg(component->dev, "set mic gain to %u, %u\n", left, right); dev_dbg(component->dev, "set mic gain to %u, %u\n", left, right);
p.cmd = EC_CODEC_DMIC_SET_GAIN; p.cmd = EC_CODEC_DMIC_SET_GAIN_IDX;
p.set_gain_param.left = left; p.set_gain_idx_param.channel = EC_CODEC_DMIC_CHANNEL_0;
p.set_gain_param.right = right; p.set_gain_idx_param.gain = left;
ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC,
(uint8_t *)&p, sizeof(p), NULL, 0);
if (ret < 0)
return ret;
p.cmd = EC_CODEC_DMIC_SET_GAIN_IDX;
p.set_gain_idx_param.channel = EC_CODEC_DMIC_CHANNEL_1;
p.set_gain_idx_param.gain = right;
return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC, return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC,
(uint8_t *)&p, sizeof(p), NULL, 0); (uint8_t *)&p, sizeof(p), NULL, 0);
} }
@ -125,19 +142,27 @@ static int dmic_probe(struct snd_soc_component *component)
struct cros_ec_codec_priv *priv = struct cros_ec_codec_priv *priv =
snd_soc_component_get_drvdata(component); snd_soc_component_get_drvdata(component);
struct device *dev = priv->dev; struct device *dev = priv->dev;
int ret, val;
struct soc_mixer_control *control; struct soc_mixer_control *control;
struct ec_param_ec_codec_dmic p;
struct ec_response_ec_codec_dmic_get_max_gain r;
int ret;
ret = device_property_read_u32(dev, "max-dmic-gain", &val); p.cmd = EC_CODEC_DMIC_GET_MAX_GAIN;
if (ret) {
dev_err(dev, "Failed to read 'max-dmic-gain'\n"); ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC,
return ret; (uint8_t *)&p, sizeof(p),
(uint8_t *)&r, sizeof(r));
if (ret < 0) {
dev_warn(dev, "get_max_gain() unsupported\n");
return 0;
} }
dev_dbg(dev, "max gain = %d\n", r.max_gain);
control = (struct soc_mixer_control *) control = (struct soc_mixer_control *)
dmic_controls[DMIC_CTL_GAIN].private_value; dmic_controls[DMIC_CTL_GAIN].private_value;
control->max = val; control->max = r.max_gain;
control->platform_max = val; control->platform_max = r.max_gain;
return snd_soc_add_component_controls(component, return snd_soc_add_component_controls(component,
&dmic_controls[DMIC_CTL_GAIN], 1); &dmic_controls[DMIC_CTL_GAIN], 1);