Skip to content

L
linux
Commit 727f1c71 authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Mark Brown
Browse files
Options

ASoC: cros_ec_codec: refactor I2S RX 

Refactor by the following items:
- reformat copyright declaration
- use more specific name "i2s rx"
- use verbose symbol names to separate namespaces
- make some short functions inline
- remove unused TDM-related code
Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Acked-By: default avatarBenson Leung <bleung@chromium.org>
Link: https://lore.kernel.org/r/20191014180059.02.I43373b9a66dbb70196b3f216b3aa86111c410836@changeidSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 036beb0e
Show whitespace changes
Inline Side-by-side
Showing with 251 additions and 373 deletions
drivers/platform/chrome/cros_ec_trace.c
View file @ 727f1c71
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
TRACE_SYMBOL(EC_CMD_SB_READ_BLOCK), \ TRACE_SYMBOL(EC_CMD_SB_READ_BLOCK), \
TRACE_SYMBOL(EC_CMD_SB_WRITE_BLOCK), \ TRACE_SYMBOL(EC_CMD_SB_WRITE_BLOCK), \
TRACE_SYMBOL(EC_CMD_BATTERY_VENDOR_PARAM), \ TRACE_SYMBOL(EC_CMD_BATTERY_VENDOR_PARAM), \
TRACE_SYMBOL(EC_CMD_CODEC_I2S), \ TRACE_SYMBOL(EC_CMD_EC_CODEC_I2S_RX), \
TRACE_SYMBOL(EC_CMD_REBOOT_EC), \ TRACE_SYMBOL(EC_CMD_REBOOT_EC), \
TRACE_SYMBOL(EC_CMD_GET_PANIC_INFO), \ TRACE_SYMBOL(EC_CMD_GET_PANIC_INFO), \
TRACE_SYMBOL(EC_CMD_ACPI_READ), \ TRACE_SYMBOL(EC_CMD_ACPI_READ), \
......
include/linux/platform_data/cros_ec_commands.h
View file @ 727f1c71
...@@ -4466,92 +4466,74 @@ enum mkbp_cec_event { ...@@ -4466,92 +4466,74 @@ enum mkbp_cec_event {
/*****************************************************************************/ /*****************************************************************************/
/* Commands for I2S recording on audio codec. */ /* Commands for I2S RX on audio codec. */
#define EC_CMD_CODEC_I2S 0x00BC #define EC_CMD_EC_CODEC_I2S_RX 0x00BC
#define EC_WOV_I2S_SAMPLE_RATE 48000
enum ec_codec_i2s_rx_subcmd {
enum ec_codec_i2s_subcmd { EC_CODEC_I2S_RX_ENABLE = 0x0,
EC_CODEC_SET_SAMPLE_DEPTH = 0x0, EC_CODEC_I2S_RX_DISABLE = 0x1,
EC_CODEC_SET_GAIN = 0x1, EC_CODEC_I2S_RX_SET_GAIN = 0x2,
EC_CODEC_GET_GAIN = 0x2, EC_CODEC_I2S_RX_GET_GAIN = 0x3,
EC_CODEC_I2S_ENABLE = 0x3, EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH = 0x4,
EC_CODEC_I2S_SET_CONFIG = 0x4, EC_CODEC_I2S_RX_SET_DAIFMT = 0x5,
EC_CODEC_I2S_SET_TDM_CONFIG = 0x5, EC_CODEC_I2S_RX_SET_BCLK = 0x6,
EC_CODEC_I2S_SET_BCLK = 0x6, EC_CODEC_I2S_RX_SUBCMD_COUNT,
EC_CODEC_I2S_SUBCMD_COUNT = 0x7,
}; };
enum ec_sample_depth_value { enum ec_codec_i2s_rx_sample_depth {
EC_CODEC_SAMPLE_DEPTH_16 = 0, EC_CODEC_I2S_RX_SAMPLE_DEPTH_16 = 0x0,
EC_CODEC_SAMPLE_DEPTH_24 = 1, EC_CODEC_I2S_RX_SAMPLE_DEPTH_24 = 0x1,
EC_CODEC_I2S_RX_SAMPLE_DEPTH_COUNT,
}; };
enum ec_i2s_config { enum ec_codec_i2s_rx_daifmt {
EC_DAI_FMT_I2S = 0, EC_CODEC_I2S_RX_DAIFMT_I2S = 0x0,
EC_DAI_FMT_RIGHT_J = 1, EC_CODEC_I2S_RX_DAIFMT_RIGHT_J = 0x1,
EC_DAI_FMT_LEFT_J = 2, EC_CODEC_I2S_RX_DAIFMT_LEFT_J = 0x2,
EC_DAI_FMT_PCM_A = 3, EC_CODEC_I2S_RX_DAIFMT_COUNT,
EC_DAI_FMT_PCM_B = 4,
EC_DAI_FMT_PCM_TDM = 5,
}; };
/* struct __ec_align1 ec_param_ec_codec_i2s_rx_set_sample_depth {
* For subcommand EC_CODEC_GET_GAIN. uint8_t depth;
*/ uint8_t reserved[3];
struct __ec_align1 ec_codec_i2s_gain { };
struct __ec_align1 ec_param_ec_codec_i2s_rx_set_gain {
uint8_t left; uint8_t left;
uint8_t right; uint8_t right;
uint8_t reserved[2];
}; };
struct __ec_todo_unpacked ec_param_codec_i2s_tdm { struct __ec_align1 ec_param_ec_codec_i2s_rx_set_daifmt {
int16_t ch0_delay; /* 0 to 496 */ uint8_t daifmt;
int16_t ch1_delay; /* -1 to 496 */ uint8_t reserved[3];
uint8_t adjacent_to_ch0;
uint8_t adjacent_to_ch1;
}; };
struct __ec_todo_packed ec_param_codec_i2s { struct __ec_align4 ec_param_ec_codec_i2s_rx_set_bclk {
/* enum ec_codec_i2s_subcmd */ uint32_t bclk;
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_codec_i2s_gain gain;
/*
* EC_CODEC_I2S_ENABLE
* 1 to enable, 0 to disable.
*/
uint8_t i2s_enable;
/*
* EC_CODEC_I2S_SET_CONFIG
* Value should be one of ec_i2s_config.
*/
uint8_t i2s_config;
/* struct __ec_align4 ec_param_ec_codec_i2s_rx {
* EC_CODEC_I2S_SET_TDM_CONFIG uint8_t cmd; /* enum ec_codec_i2s_rx_subcmd */
* Value should be one of ec_i2s_config. uint8_t reserved[3];
*/
struct ec_param_codec_i2s_tdm tdm_param;
/* union {
* EC_CODEC_I2S_SET_BCLK struct ec_param_ec_codec_i2s_rx_set_sample_depth
*/ set_sample_depth_param;
uint32_t bclk; 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
set_bclk_param;
}; };
}; };
struct __ec_align1 ec_response_ec_codec_i2s_rx_get_gain {
uint8_t left;
uint8_t right;
};
/*****************************************************************************/ /*****************************************************************************/
/* System commands */ /* System commands */
......
sound/soc/codecs/cros_ec_codec.c
View file @ 727f1c71
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Driver for ChromeOS Embedded Controller codec. * Copyright 2019 Google, Inc.
*
* ChromeOS Embedded Controller codec driver.
* *
* This driver uses the cros-ec interface to communicate with the ChromeOS * This driver uses the cros-ec interface to communicate with the ChromeOS
* EC for audio function. * EC for audio function.
...@@ -18,403 +20,297 @@ ...@@ -18,403 +20,297 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/tlv.h> #include <sound/tlv.h>
#define DRV_NAME "cros-ec-codec" struct cros_ec_codec_priv {
/**
* struct cros_ec_codec_data - ChromeOS EC codec driver data.
* @dev: Device structure used in sysfs.
* @ec_device: cros_ec_device structure to talk to the physical device.
* @component: Pointer to the component.
* @max_dmic_gain: Maximum gain in dB supported by EC codec.
*/
struct cros_ec_codec_data {
struct device *dev; struct device *dev;
struct cros_ec_device *ec_device; struct cros_ec_device *ec_device;
struct snd_soc_component *component;
unsigned int max_dmic_gain;
}; };
static const DECLARE_TLV_DB_SCALE(ec_mic_gain_tlv, 0, 100, 0); static int send_ec_host_command(struct cros_ec_device *ec_dev, uint32_t cmd,
uint8_t *out, size_t outsize,
static int ec_command_get_gain(struct snd_soc_component *component, uint8_t *in, size_t insize)
struct ec_param_codec_i2s *param,
struct ec_codec_i2s_gain *resp)
{ {
struct cros_ec_codec_data *codec_data =
snd_soc_component_get_drvdata(component);
struct cros_ec_device *ec_device = codec_data->ec_device;
u8 buffer[sizeof(struct cros_ec_command) +
max(sizeof(struct ec_param_codec_i2s),
sizeof(struct ec_codec_i2s_gain))];
struct cros_ec_command *msg = (struct cros_ec_command *)&buffer;
int ret; int ret;
struct cros_ec_command *msg;
msg = kmalloc(sizeof(*msg) + max(outsize, insize), GFP_KERNEL);
if (!msg)
return -ENOMEM;
msg->version = 0; msg->version = 0;
msg->command = EC_CMD_CODEC_I2S; msg->command = cmd;
msg->outsize = sizeof(struct ec_param_codec_i2s); msg->outsize = outsize;
msg->insize = sizeof(struct ec_codec_i2s_gain); msg->insize = insize;
if (outsize)
memcpy(msg->data, out, outsize);
memcpy(msg->data, param, msg->outsize); ret = cros_ec_cmd_xfer_status(ec_dev, msg);
if (ret < 0)
goto error;
ret = cros_ec_cmd_xfer_status(ec_device, msg); if (insize)
if (ret > 0) memcpy(in, msg->data, insize);
memcpy(resp, msg->data, msg->insize);
ret = 0;
error:
kfree(msg);
return ret; return ret;
} }
/* static int dmic_get_gain(struct snd_kcontrol *kcontrol,
* Wrapper for EC command without response. struct snd_ctl_elem_value *ucontrol)
*/
static int ec_command_no_resp(struct snd_soc_component *component,
struct ec_param_codec_i2s *param)
{ {
struct cros_ec_codec_data *codec_data = struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol);
struct cros_ec_codec_priv *priv =
snd_soc_component_get_drvdata(component); snd_soc_component_get_drvdata(component);
struct cros_ec_device *ec_device = codec_data->ec_device; struct ec_param_ec_codec_i2s_rx p;
u8 buffer[sizeof(struct cros_ec_command) + struct ec_response_ec_codec_i2s_rx_get_gain r;
sizeof(struct ec_param_codec_i2s)]; int ret;
struct cros_ec_command *msg = (struct cros_ec_command *)&buffer;
msg->version = 0;
msg->command = EC_CMD_CODEC_I2S;
msg->outsize = sizeof(struct ec_param_codec_i2s);
msg->insize = 0;
memcpy(msg->data, param, msg->outsize);
return cros_ec_cmd_xfer_status(ec_device, msg);
}
static int set_i2s_config(struct snd_soc_component *component,
enum ec_i2s_config i2s_config)
{
struct ec_param_codec_i2s param;
dev_dbg(component->dev, "%s set I2S format to %u\n", __func__, p.cmd = EC_CODEC_I2S_RX_GET_GAIN;
i2s_config); ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
(uint8_t *)&p, sizeof(p),
(uint8_t *)&r, sizeof(r));
if (ret < 0)
return ret;
param.cmd = EC_CODEC_I2S_SET_CONFIG; ucontrol->value.integer.value[0] = r.left;
param.i2s_config = i2s_config; ucontrol->value.integer.value[1] = r.right;
return ec_command_no_resp(component, &param); return 0;
} }
static int cros_ec_i2s_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int dmic_put_gain(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component =
enum ec_i2s_config i2s_config; snd_soc_kcontrol_component(kcontrol);
struct cros_ec_codec_priv *priv =
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { snd_soc_component_get_drvdata(component);
case SND_SOC_DAIFMT_CBS_CFS: struct soc_mixer_control *control =
break; (struct soc_mixer_control *)kcontrol->private_value;
default: int max_dmic_gain = control->max;
return -EINVAL; int left = ucontrol->value.integer.value[0];
} int right = ucontrol->value.integer.value[1];
struct ec_param_ec_codec_i2s_rx p;
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
case SND_SOC_DAIFMT_NB_NF:
break;
default:
return -EINVAL;
}
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
i2s_config = EC_DAI_FMT_I2S;
break;
case SND_SOC_DAIFMT_RIGHT_J:
i2s_config = EC_DAI_FMT_RIGHT_J;
break;
case SND_SOC_DAIFMT_LEFT_J:
i2s_config = EC_DAI_FMT_LEFT_J;
break;
case SND_SOC_DAIFMT_DSP_A:
i2s_config = EC_DAI_FMT_PCM_A;
break;
case SND_SOC_DAIFMT_DSP_B:
i2s_config = EC_DAI_FMT_PCM_B;
break;
default: if (left > max_dmic_gain || right > max_dmic_gain)
return -EINVAL; return -EINVAL;
}
return set_i2s_config(component, i2s_config); dev_dbg(component->dev, "set mic gain to %u, %u\n", left, right);
}
static int set_i2s_sample_depth(struct snd_soc_component *component, p.cmd = EC_CODEC_I2S_RX_SET_GAIN;
enum ec_sample_depth_value depth) p.set_gain_param.left = left;
{ p.set_gain_param.right = right;
struct ec_param_codec_i2s param; return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
(uint8_t *)&p, sizeof(p), NULL, 0);
dev_dbg(component->dev, "%s set depth to %u\n", __func__, depth);
param.cmd = EC_CODEC_SET_SAMPLE_DEPTH;
param.depth = depth;
return ec_command_no_resp(component, &param);
} }
static int set_i2s_bclk(struct snd_soc_component *component, uint32_t bclk) static const DECLARE_TLV_DB_SCALE(dmic_gain_tlv, 0, 100, 0);
{
struct ec_param_codec_i2s param;
dev_dbg(component->dev, "%s set i2s bclk to %u\n", __func__, bclk); enum {
DMIC_CTL_GAIN = 0,
param.cmd = EC_CODEC_I2S_SET_BCLK; };
param.bclk = bclk;
return ec_command_no_resp(component, &param); static struct snd_kcontrol_new dmic_controls[] = {
} [DMIC_CTL_GAIN] =
SOC_DOUBLE_EXT_TLV("EC Mic Gain", SND_SOC_NOPM, SND_SOC_NOPM,
0, 0, 0, dmic_get_gain, dmic_put_gain,
dmic_gain_tlv),
};
static int cros_ec_i2s_hw_params(struct snd_pcm_substream *substream, static int i2s_rx_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
unsigned int rate, bclk; struct cros_ec_codec_priv *priv =
snd_soc_component_get_drvdata(component);
struct ec_param_ec_codec_i2s_rx p;
enum ec_codec_i2s_rx_sample_depth depth;
int ret; int ret;
rate = params_rate(params); if (params_rate(params) != 48000)
if (rate != 48000)
return -EINVAL; return -EINVAL;
switch (params_format(params)) { switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE: case SNDRV_PCM_FORMAT_S16_LE:
ret = set_i2s_sample_depth(component, EC_CODEC_SAMPLE_DEPTH_16); depth = EC_CODEC_I2S_RX_SAMPLE_DEPTH_16;
break; break;
case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_S24_LE:
ret = set_i2s_sample_depth(component, EC_CODEC_SAMPLE_DEPTH_24); depth = EC_CODEC_I2S_RX_SAMPLE_DEPTH_24;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
if (ret < 0)
return ret;
bclk = snd_soc_params_to_bclk(params);
return set_i2s_bclk(component, bclk);
}
static const struct snd_soc_dai_ops cros_ec_i2s_dai_ops = {
.hw_params = cros_ec_i2s_hw_params,
.set_fmt = cros_ec_i2s_set_dai_fmt,
};
static struct snd_soc_dai_driver cros_ec_dai[] = {
{
.name = "cros_ec_codec I2S",
.id = 0,
.capture = {
.stream_name = "I2S Capture",
.channels_min = 2,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S24_LE,
},
.ops = &cros_ec_i2s_dai_ops,
}
};
static int get_ec_mic_gain(struct snd_soc_component *component, dev_dbg(component->dev, "set depth to %u\n", depth);
u8 *left, u8 *right)
{
struct ec_param_codec_i2s param;
struct ec_codec_i2s_gain resp;
int ret;
param.cmd = EC_CODEC_GET_GAIN;
ret = ec_command_get_gain(component, &param, &resp); p.cmd = EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH;
p.set_sample_depth_param.depth = depth;
ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
(uint8_t *)&p, sizeof(p), NULL, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
*left = resp.left; dev_dbg(component->dev, "set bclk to %u\n",
*right = resp.right; snd_soc_params_to_bclk(params));
return 0; p.cmd = EC_CODEC_I2S_RX_SET_BCLK;
p.set_bclk_param.bclk = snd_soc_params_to_bclk(params);
return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
(uint8_t *)&p, sizeof(p), NULL, 0);
} }
static int mic_gain_get(struct snd_kcontrol *kcontrol, static int i2s_rx_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol);
u8 left, right;
int ret;
ret = get_ec_mic_gain(component, &left, &right);
if (ret)
return ret;
ucontrol->value.integer.value[0] = left;
ucontrol->value.integer.value[1] = right;
return 0;
}
static int set_ec_mic_gain(struct snd_soc_component *component,
u8 left, u8 right)
{
struct ec_param_codec_i2s param;
dev_dbg(component->dev, "%s set mic gain to %u, %u\n",
__func__, left, right);
param.cmd = EC_CODEC_SET_GAIN;
param.gain.left = left;
param.gain.right = right;
return ec_command_no_resp(component, &param);
}
static int mic_gain_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_component *component = struct snd_soc_component *component = dai->component;
snd_soc_kcontrol_component(kcontrol); struct cros_ec_codec_priv *priv =
struct cros_ec_codec_data *codec_data =
snd_soc_component_get_drvdata(component); snd_soc_component_get_drvdata(component);
int left = ucontrol->value.integer.value[0]; struct ec_param_ec_codec_i2s_rx p;
int right = ucontrol->value.integer.value[1]; enum ec_codec_i2s_rx_daifmt daifmt;
unsigned int max_dmic_gain = codec_data->max_dmic_gain;
if (left > max_dmic_gain || right > max_dmic_gain) switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS:
break;
default:
return -EINVAL; return -EINVAL;
}
return set_ec_mic_gain(component, (u8)left, (u8)right); switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
} case SND_SOC_DAIFMT_NB_NF:
break;
static struct snd_kcontrol_new mic_gain_control = default:
SOC_DOUBLE_EXT_TLV("EC Mic Gain", SND_SOC_NOPM, SND_SOC_NOPM, 0, 0, 0, return -EINVAL;
mic_gain_get, mic_gain_put, ec_mic_gain_tlv); }
static int enable_i2s(struct snd_soc_component *component, int enable)
{
struct ec_param_codec_i2s param;
dev_dbg(component->dev, "%s set i2s to %u\n", __func__, enable); switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
daifmt = EC_CODEC_I2S_RX_DAIFMT_I2S;
break;
case SND_SOC_DAIFMT_RIGHT_J:
daifmt = EC_CODEC_I2S_RX_DAIFMT_RIGHT_J;
break;
case SND_SOC_DAIFMT_LEFT_J:
daifmt = EC_CODEC_I2S_RX_DAIFMT_LEFT_J;
break;
default:
return -EINVAL;
}
param.cmd = EC_CODEC_I2S_ENABLE; dev_dbg(component->dev, "set format to %u\n", daifmt);
param.i2s_enable = enable;
return ec_command_no_resp(component, &param); p.cmd = EC_CODEC_I2S_RX_SET_DAIFMT;
p.set_daifmt_param.daifmt = daifmt;
return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
(uint8_t *)&p, sizeof(p), NULL, 0);
} }
static int cros_ec_i2s_enable_event(struct snd_soc_dapm_widget *w, static const struct snd_soc_dai_ops i2s_rx_dai_ops = {
.hw_params = i2s_rx_hw_params,
.set_fmt = i2s_rx_set_fmt,
};
static int i2s_rx_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_component *component = struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm); snd_soc_dapm_to_component(w->dapm);
struct cros_ec_codec_priv *priv =
snd_soc_component_get_drvdata(component);
struct ec_param_ec_codec_i2s_rx p;
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
dev_dbg(component->dev, dev_dbg(component->dev, "enable I2S RX\n");
"%s got SND_SOC_DAPM_PRE_PMU event\n", __func__); p.cmd = EC_CODEC_I2S_RX_ENABLE;
return enable_i2s(component, 1); break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
dev_dbg(component->dev, dev_dbg(component->dev, "disable I2S RX\n");
"%s got SND_SOC_DAPM_PRE_PMD event\n", __func__); p.cmd = EC_CODEC_I2S_RX_DISABLE;
return enable_i2s(component, 0); break;
default:
return 0;
} }
return 0; return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
(uint8_t *)&p, sizeof(p), NULL, 0);
} }
/* static struct snd_soc_dapm_widget i2s_rx_dapm_widgets[] = {
* The goal of this DAPM route is to turn on/off I2S using EC
* host command when capture stream is started/stopped.
*/
static const struct snd_soc_dapm_widget cros_ec_codec_dapm_widgets[] = {
SND_SOC_DAPM_INPUT("DMIC"), SND_SOC_DAPM_INPUT("DMIC"),
SND_SOC_DAPM_SUPPLY("I2S RX Enable", SND_SOC_NOPM, 0, 0, i2s_rx_event,
/*
* Control EC to enable/disable I2S.
*/
SND_SOC_DAPM_SUPPLY("I2S Enable", SND_SOC_NOPM,
0, 0, cros_ec_i2s_enable_event,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_AIF_OUT("I2S RX", "I2S Capture", 0, SND_SOC_NOPM, 0, 0),
};
SND_SOC_DAPM_AIF_OUT("I2STX", "I2S Capture", 0, SND_SOC_NOPM, 0, 0), static struct snd_soc_dapm_route i2s_rx_dapm_routes[] = {
{"I2S RX", NULL, "DMIC"},
{"I2S RX", NULL, "I2S RX Enable"},
}; };
static const struct snd_soc_dapm_route cros_ec_codec_dapm_routes[] = { static struct snd_soc_dai_driver i2s_rx_dai_driver = {
{ "I2STX", NULL, "DMIC" }, .name = "EC Codec I2S RX",
{ "I2STX", NULL, "I2S Enable" }, .capture = {
.stream_name = "I2S Capture",
.channels_min = 2,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S24_LE,
},
.ops = &i2s_rx_dai_ops,
}; };
/* static int i2s_rx_probe(struct snd_soc_component *component)
* Read maximum gain from device property and set it to mixer control.
*/
static int cros_ec_set_gain_range(struct device *dev)
{ {
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; struct soc_mixer_control *control;
struct cros_ec_codec_data *codec_data = dev_get_drvdata(dev);
int rc;
rc = device_property_read_u32(dev, "max-dmic-gain", ret = device_property_read_u32(dev, "max-dmic-gain", &val);
&codec_data->max_dmic_gain); if (ret) {
if (rc) dev_err(dev, "Failed to read 'max-dmic-gain'\n");
return rc; return ret;
}
control = (struct soc_mixer_control *) control = (struct soc_mixer_control *)
mic_gain_control.private_value; dmic_controls[DMIC_CTL_GAIN].private_value;
control->max = codec_data->max_dmic_gain; control->max = val;
control->platform_max = codec_data->max_dmic_gain; control->platform_max = val;
return 0; return snd_soc_add_component_controls(component,
&dmic_controls[DMIC_CTL_GAIN], 1);
} }
static int cros_ec_codec_probe(struct snd_soc_component *component) static const struct snd_soc_component_driver i2s_rx_component_driver = {
{ .probe = i2s_rx_probe,
int rc; .dapm_widgets = i2s_rx_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(i2s_rx_dapm_widgets),
struct cros_ec_codec_data *codec_data = .dapm_routes = i2s_rx_dapm_routes,
snd_soc_component_get_drvdata(component); .num_dapm_routes = ARRAY_SIZE(i2s_rx_dapm_routes),
rc = cros_ec_set_gain_range(codec_data->dev);
if (rc)
return rc;
return snd_soc_add_component_controls(component, &mic_gain_control, 1);
}
static const struct snd_soc_component_driver cros_ec_component_driver = {
.probe = cros_ec_codec_probe,
.dapm_widgets = cros_ec_codec_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(cros_ec_codec_dapm_widgets),
.dapm_routes = cros_ec_codec_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(cros_ec_codec_dapm_routes),
}; };
/* static int cros_ec_codec_platform_probe(struct platform_device *pdev)
* Platform device and platform driver fro cros-ec-codec.
*/
static int cros_ec_codec_platform_probe(struct platform_device *pd)
{ {
struct device *dev = &pd->dev; struct device *dev = &pdev->dev;
struct cros_ec_device *ec_device = dev_get_drvdata(pd->dev.parent); struct cros_ec_device *ec_device = dev_get_drvdata(pdev->dev.parent);
struct cros_ec_codec_data *codec_data; struct cros_ec_codec_priv *priv;
codec_data = devm_kzalloc(dev, sizeof(struct cros_ec_codec_data), priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
GFP_KERNEL); if (!priv)
if (!codec_data)
return -ENOMEM; return -ENOMEM;
codec_data->dev = dev; priv->dev = dev;
codec_data->ec_device = ec_device; priv->ec_device = ec_device;
platform_set_drvdata(pd, codec_data); platform_set_drvdata(pdev, priv);
return devm_snd_soc_register_component(dev, &cros_ec_component_driver, return devm_snd_soc_register_component(dev, &i2s_rx_component_driver,
cros_ec_dai, ARRAY_SIZE(cros_ec_dai)); &i2s_rx_dai_driver, 1);
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
...@@ -427,7 +323,7 @@ MODULE_DEVICE_TABLE(of, cros_ec_codec_of_match); ...@@ -427,7 +323,7 @@ MODULE_DEVICE_TABLE(of, cros_ec_codec_of_match);
static struct platform_driver cros_ec_codec_platform_driver = { static struct platform_driver cros_ec_codec_platform_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = "cros-ec-codec",
.of_match_table = of_match_ptr(cros_ec_codec_of_match), .of_match_table = of_match_ptr(cros_ec_codec_of_match),
}, },
.probe = cros_ec_codec_platform_probe, .probe = cros_ec_codec_platform_probe,
...@@ -438,4 +334,4 @@ module_platform_driver(cros_ec_codec_platform_driver); ...@@ -438,4 +334,4 @@ module_platform_driver(cros_ec_codec_platform_driver);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("ChromeOS EC codec driver"); MODULE_DESCRIPTION("ChromeOS EC codec driver");
MODULE_AUTHOR("Cheng-Yi Chiang <cychiang@chromium.org>"); MODULE_AUTHOR("Cheng-Yi Chiang <cychiang@chromium.org>");
MODULE_ALIAS("platform:" DRV_NAME); MODULE_ALIAS("platform:cros-ec-codec");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7