Skip to content

L
linux
Commit aeb90fd2 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: ab8500: replace codec to component 

Now we can replace Codec to Component. Let's do it.

Note:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 0	->	.idle_bias_on = 1
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 151 deletions
sound/soc/codecs/ab8500-codec.c
View file @ aeb90fd2
...@@ -1037,86 +1037,86 @@ static const struct snd_soc_dapm_route ab8500_dapm_routes_mic2_vamicx[] = { ...@@ -1037,86 +1037,86 @@ static const struct snd_soc_dapm_route ab8500_dapm_routes_mic2_vamicx[] = {
}; };
/* ANC FIR-coefficients configuration sequence */ /* ANC FIR-coefficients configuration sequence */
static void anc_fir(struct snd_soc_codec *codec, static void anc_fir(struct snd_soc_component *component,
unsigned int bnk, unsigned int par, unsigned int val) unsigned int bnk, unsigned int par, unsigned int val)
{ {
if (par == 0 && bnk == 0) if (par == 0 && bnk == 0)
snd_soc_update_bits(codec, AB8500_ANCCONF1, snd_soc_component_update_bits(component, AB8500_ANCCONF1,
BIT(AB8500_ANCCONF1_ANCFIRUPDATE), BIT(AB8500_ANCCONF1_ANCFIRUPDATE),
BIT(AB8500_ANCCONF1_ANCFIRUPDATE)); BIT(AB8500_ANCCONF1_ANCFIRUPDATE));
snd_soc_write(codec, AB8500_ANCCONF5, val >> 8 & 0xff); snd_soc_component_write(component, AB8500_ANCCONF5, val >> 8 & 0xff);
snd_soc_write(codec, AB8500_ANCCONF6, val & 0xff); snd_soc_component_write(component, AB8500_ANCCONF6, val & 0xff);
if (par == AB8500_ANC_FIR_COEFFS - 1 && bnk == 1) if (par == AB8500_ANC_FIR_COEFFS - 1 && bnk == 1)
snd_soc_update_bits(codec, AB8500_ANCCONF1, snd_soc_component_update_bits(component, AB8500_ANCCONF1,
BIT(AB8500_ANCCONF1_ANCFIRUPDATE), 0); BIT(AB8500_ANCCONF1_ANCFIRUPDATE), 0);
} }
/* ANC IIR-coefficients configuration sequence */ /* ANC IIR-coefficients configuration sequence */
static void anc_iir(struct snd_soc_codec *codec, unsigned int bnk, static void anc_iir(struct snd_soc_component *component, unsigned int bnk,
unsigned int par, unsigned int val) unsigned int par, unsigned int val)
{ {
if (par == 0) { if (par == 0) {
if (bnk == 0) { if (bnk == 0) {
snd_soc_update_bits(codec, AB8500_ANCCONF1, snd_soc_component_update_bits(component, AB8500_ANCCONF1,
BIT(AB8500_ANCCONF1_ANCIIRINIT), BIT(AB8500_ANCCONF1_ANCIIRINIT),
BIT(AB8500_ANCCONF1_ANCIIRINIT)); BIT(AB8500_ANCCONF1_ANCIIRINIT));
usleep_range(AB8500_ANC_SM_DELAY, AB8500_ANC_SM_DELAY); usleep_range(AB8500_ANC_SM_DELAY, AB8500_ANC_SM_DELAY);
snd_soc_update_bits(codec, AB8500_ANCCONF1, snd_soc_component_update_bits(component, AB8500_ANCCONF1,
BIT(AB8500_ANCCONF1_ANCIIRINIT), 0); BIT(AB8500_ANCCONF1_ANCIIRINIT), 0);
usleep_range(AB8500_ANC_SM_DELAY, AB8500_ANC_SM_DELAY); usleep_range(AB8500_ANC_SM_DELAY, AB8500_ANC_SM_DELAY);
} else { } else {
snd_soc_update_bits(codec, AB8500_ANCCONF1, snd_soc_component_update_bits(component, AB8500_ANCCONF1,
BIT(AB8500_ANCCONF1_ANCIIRUPDATE), BIT(AB8500_ANCCONF1_ANCIIRUPDATE),
BIT(AB8500_ANCCONF1_ANCIIRUPDATE)); BIT(AB8500_ANCCONF1_ANCIIRUPDATE));
} }
} else if (par > 3) { } else if (par > 3) {
snd_soc_write(codec, AB8500_ANCCONF7, 0); snd_soc_component_write(component, AB8500_ANCCONF7, 0);
snd_soc_write(codec, AB8500_ANCCONF8, val >> 16 & 0xff); snd_soc_component_write(component, AB8500_ANCCONF8, val >> 16 & 0xff);
} }
snd_soc_write(codec, AB8500_ANCCONF7, val >> 8 & 0xff); snd_soc_component_write(component, AB8500_ANCCONF7, val >> 8 & 0xff);
snd_soc_write(codec, AB8500_ANCCONF8, val & 0xff); snd_soc_component_write(component, AB8500_ANCCONF8, val & 0xff);
if (par == AB8500_ANC_IIR_COEFFS - 1 && bnk == 1) if (par == AB8500_ANC_IIR_COEFFS - 1 && bnk == 1)
snd_soc_update_bits(codec, AB8500_ANCCONF1, snd_soc_component_update_bits(component, AB8500_ANCCONF1,
BIT(AB8500_ANCCONF1_ANCIIRUPDATE), 0); BIT(AB8500_ANCCONF1_ANCIIRUPDATE), 0);
} }
/* ANC IIR-/FIR-coefficients configuration sequence */ /* ANC IIR-/FIR-coefficients configuration sequence */
static void anc_configure(struct snd_soc_codec *codec, static void anc_configure(struct snd_soc_component *component,
bool apply_fir, bool apply_iir) bool apply_fir, bool apply_iir)
{ {
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev); struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
unsigned int bnk, par, val; unsigned int bnk, par, val;
dev_dbg(codec->dev, "%s: Enter.\n", __func__); dev_dbg(component->dev, "%s: Enter.\n", __func__);
if (apply_fir) if (apply_fir)
snd_soc_update_bits(codec, AB8500_ANCCONF1, snd_soc_component_update_bits(component, AB8500_ANCCONF1,
BIT(AB8500_ANCCONF1_ENANC), 0); BIT(AB8500_ANCCONF1_ENANC), 0);
snd_soc_update_bits(codec, AB8500_ANCCONF1, snd_soc_component_update_bits(component, AB8500_ANCCONF1,
BIT(AB8500_ANCCONF1_ENANC), BIT(AB8500_ANCCONF1_ENANC)); BIT(AB8500_ANCCONF1_ENANC), BIT(AB8500_ANCCONF1_ENANC));
if (apply_fir) if (apply_fir)
for (bnk = 0; bnk < AB8500_NR_OF_ANC_COEFF_BANKS; bnk++) for (bnk = 0; bnk < AB8500_NR_OF_ANC_COEFF_BANKS; bnk++)
for (par = 0; par < AB8500_ANC_FIR_COEFFS; par++) { for (par = 0; par < AB8500_ANC_FIR_COEFFS; par++) {
val = snd_soc_read(codec, val = snd_soc_component_read32(component,
drvdata->anc_fir_values[par]); drvdata->anc_fir_values[par]);
anc_fir(codec, bnk, par, val); anc_fir(component, bnk, par, val);
} }
if (apply_iir) if (apply_iir)
for (bnk = 0; bnk < AB8500_NR_OF_ANC_COEFF_BANKS; bnk++) for (bnk = 0; bnk < AB8500_NR_OF_ANC_COEFF_BANKS; bnk++)
for (par = 0; par < AB8500_ANC_IIR_COEFFS; par++) { for (par = 0; par < AB8500_ANC_IIR_COEFFS; par++) {
val = snd_soc_read(codec, val = snd_soc_component_read32(component,
drvdata->anc_iir_values[par]); drvdata->anc_iir_values[par]);
anc_iir(codec, bnk, par, val); anc_iir(component, bnk, par, val);
} }
dev_dbg(codec->dev, "%s: Exit.\n", __func__); dev_dbg(component->dev, "%s: Exit.\n", __func__);
} }
/* /*
...@@ -1126,8 +1126,8 @@ static void anc_configure(struct snd_soc_codec *codec, ...@@ -1126,8 +1126,8 @@ static void anc_configure(struct snd_soc_codec *codec,
static int sid_status_control_get(struct snd_kcontrol *kcontrol, static int sid_status_control_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev); struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
mutex_lock(&drvdata->ctrl_lock); mutex_lock(&drvdata->ctrl_lock);
ucontrol->value.enumerated.item[0] = drvdata->sid_status; ucontrol->value.enumerated.item[0] = drvdata->sid_status;
...@@ -1140,15 +1140,15 @@ static int sid_status_control_get(struct snd_kcontrol *kcontrol, ...@@ -1140,15 +1140,15 @@ static int sid_status_control_get(struct snd_kcontrol *kcontrol,
static int sid_status_control_put(struct snd_kcontrol *kcontrol, static int sid_status_control_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev); struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
unsigned int param, sidconf, val; unsigned int param, sidconf, val;
int status = 1; int status = 1;
dev_dbg(codec->dev, "%s: Enter\n", __func__); dev_dbg(component->dev, "%s: Enter\n", __func__);
if (ucontrol->value.enumerated.item[0] != SID_APPLY_FIR) { if (ucontrol->value.enumerated.item[0] != SID_APPLY_FIR) {
dev_err(codec->dev, dev_err(component->dev,
"%s: ERROR: This control supports '%s' only!\n", "%s: ERROR: This control supports '%s' only!\n",
__func__, enum_sid_state[SID_APPLY_FIR]); __func__, enum_sid_state[SID_APPLY_FIR]);
return -EIO; return -EIO;
...@@ -1156,10 +1156,10 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol, ...@@ -1156,10 +1156,10 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol,
mutex_lock(&drvdata->ctrl_lock); mutex_lock(&drvdata->ctrl_lock);
sidconf = snd_soc_read(codec, AB8500_SIDFIRCONF); sidconf = snd_soc_component_read32(component, AB8500_SIDFIRCONF);
if (((sidconf & BIT(AB8500_SIDFIRCONF_FIRSIDBUSY)) != 0)) { if (((sidconf & BIT(AB8500_SIDFIRCONF_FIRSIDBUSY)) != 0)) {
if ((sidconf & BIT(AB8500_SIDFIRCONF_ENFIRSIDS)) == 0) { if ((sidconf & BIT(AB8500_SIDFIRCONF_ENFIRSIDS)) == 0) {
dev_err(codec->dev, "%s: Sidetone busy while off!\n", dev_err(component->dev, "%s: Sidetone busy while off!\n",
__func__); __func__);
status = -EPERM; status = -EPERM;
} else { } else {
...@@ -1168,18 +1168,18 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol, ...@@ -1168,18 +1168,18 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol,
goto out; goto out;
} }
snd_soc_write(codec, AB8500_SIDFIRADR, 0); snd_soc_component_write(component, AB8500_SIDFIRADR, 0);
for (param = 0; param < AB8500_SID_FIR_COEFFS; param++) { for (param = 0; param < AB8500_SID_FIR_COEFFS; param++) {
val = snd_soc_read(codec, drvdata->sid_fir_values[param]); val = snd_soc_component_read32(component, drvdata->sid_fir_values[param]);
snd_soc_write(codec, AB8500_SIDFIRCOEF1, val >> 8 & 0xff); snd_soc_component_write(component, AB8500_SIDFIRCOEF1, val >> 8 & 0xff);
snd_soc_write(codec, AB8500_SIDFIRCOEF2, val & 0xff); snd_soc_component_write(component, AB8500_SIDFIRCOEF2, val & 0xff);
} }
snd_soc_update_bits(codec, AB8500_SIDFIRADR, snd_soc_component_update_bits(component, AB8500_SIDFIRADR,
BIT(AB8500_SIDFIRADR_FIRSIDSET), BIT(AB8500_SIDFIRADR_FIRSIDSET),
BIT(AB8500_SIDFIRADR_FIRSIDSET)); BIT(AB8500_SIDFIRADR_FIRSIDSET));
snd_soc_update_bits(codec, AB8500_SIDFIRADR, snd_soc_component_update_bits(component, AB8500_SIDFIRADR,
BIT(AB8500_SIDFIRADR_FIRSIDSET), 0); BIT(AB8500_SIDFIRADR_FIRSIDSET), 0);
drvdata->sid_status = SID_FIR_CONFIGURED; drvdata->sid_status = SID_FIR_CONFIGURED;
...@@ -1187,7 +1187,7 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol, ...@@ -1187,7 +1187,7 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol,
out: out:
mutex_unlock(&drvdata->ctrl_lock); mutex_unlock(&drvdata->ctrl_lock);
dev_dbg(codec->dev, "%s: Exit\n", __func__); dev_dbg(component->dev, "%s: Exit\n", __func__);
return status; return status;
} }
...@@ -1195,8 +1195,8 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol, ...@@ -1195,8 +1195,8 @@ static int sid_status_control_put(struct snd_kcontrol *kcontrol,
static int anc_status_control_get(struct snd_kcontrol *kcontrol, static int anc_status_control_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev); struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
mutex_lock(&drvdata->ctrl_lock); mutex_lock(&drvdata->ctrl_lock);
ucontrol->value.enumerated.item[0] = drvdata->anc_status; ucontrol->value.enumerated.item[0] = drvdata->anc_status;
...@@ -1208,10 +1208,10 @@ static int anc_status_control_get(struct snd_kcontrol *kcontrol, ...@@ -1208,10 +1208,10 @@ static int anc_status_control_get(struct snd_kcontrol *kcontrol,
static int anc_status_control_put(struct snd_kcontrol *kcontrol, static int anc_status_control_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev); struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
struct device *dev = codec->dev; struct device *dev = component->dev;
bool apply_fir, apply_iir; bool apply_fir, apply_iir;
unsigned int req; unsigned int req;
int status; int status;
...@@ -1244,7 +1244,7 @@ static int anc_status_control_put(struct snd_kcontrol *kcontrol, ...@@ -1244,7 +1244,7 @@ static int anc_status_control_put(struct snd_kcontrol *kcontrol,
} }
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
anc_configure(codec, apply_fir, apply_iir); anc_configure(component, apply_fir, apply_iir);
if (apply_fir) { if (apply_fir) {
if (drvdata->anc_status == ANC_IIR_CONFIGURED) if (drvdata->anc_status == ANC_IIR_CONFIGURED)
...@@ -1291,8 +1291,8 @@ static int filter_control_info(struct snd_kcontrol *kcontrol, ...@@ -1291,8 +1291,8 @@ static int filter_control_info(struct snd_kcontrol *kcontrol,
static int filter_control_get(struct snd_kcontrol *kcontrol, static int filter_control_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct ab8500_codec_drvdata *drvdata = snd_soc_codec_get_drvdata(codec); struct ab8500_codec_drvdata *drvdata = snd_soc_component_get_drvdata(component);
struct filter_control *fc = struct filter_control *fc =
(struct filter_control *)kcontrol->private_value; (struct filter_control *)kcontrol->private_value;
unsigned int i; unsigned int i;
...@@ -1308,8 +1308,8 @@ static int filter_control_get(struct snd_kcontrol *kcontrol, ...@@ -1308,8 +1308,8 @@ static int filter_control_get(struct snd_kcontrol *kcontrol,
static int filter_control_put(struct snd_kcontrol *kcontrol, static int filter_control_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct ab8500_codec_drvdata *drvdata = snd_soc_codec_get_drvdata(codec); struct ab8500_codec_drvdata *drvdata = snd_soc_component_get_drvdata(component);
struct filter_control *fc = struct filter_control *fc =
(struct filter_control *)kcontrol->private_value; (struct filter_control *)kcontrol->private_value;
unsigned int i; unsigned int i;
...@@ -1926,11 +1926,11 @@ enum ab8500_filter { ...@@ -1926,11 +1926,11 @@ enum ab8500_filter {
* Extended interface for codec-driver * Extended interface for codec-driver
*/ */
static int ab8500_audio_init_audioblock(struct snd_soc_codec *codec) static int ab8500_audio_init_audioblock(struct snd_soc_component *component)
{ {
int status; int status;
dev_dbg(codec->dev, "%s: Enter.\n", __func__); dev_dbg(component->dev, "%s: Enter.\n", __func__);
/* Reset audio-registers and disable 32kHz-clock output 2 */ /* Reset audio-registers and disable 32kHz-clock output 2 */
status = ab8500_sysctrl_write(AB8500_STW4500CTRL3, status = ab8500_sysctrl_write(AB8500_STW4500CTRL3,
...@@ -1943,26 +1943,26 @@ static int ab8500_audio_init_audioblock(struct snd_soc_codec *codec) ...@@ -1943,26 +1943,26 @@ static int ab8500_audio_init_audioblock(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int ab8500_audio_setup_mics(struct snd_soc_codec *codec, static int ab8500_audio_setup_mics(struct snd_soc_component *component,
struct amic_settings *amics) struct amic_settings *amics)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
u8 value8; u8 value8;
unsigned int value; unsigned int value;
int status; int status;
const struct snd_soc_dapm_route *route; const struct snd_soc_dapm_route *route;
dev_dbg(codec->dev, "%s: Enter.\n", __func__); dev_dbg(component->dev, "%s: Enter.\n", __func__);
/* Set DMic-clocks to outputs */ /* Set DMic-clocks to outputs */
status = abx500_get_register_interruptible(codec->dev, AB8500_MISC, status = abx500_get_register_interruptible(component->dev, AB8500_MISC,
AB8500_GPIO_DIR4_REG, AB8500_GPIO_DIR4_REG,
&value8); &value8);
if (status < 0) if (status < 0)
return status; return status;
value = value8 | GPIO27_DIR_OUTPUT | GPIO29_DIR_OUTPUT | value = value8 | GPIO27_DIR_OUTPUT | GPIO29_DIR_OUTPUT |
GPIO31_DIR_OUTPUT; GPIO31_DIR_OUTPUT;
status = abx500_set_register_interruptible(codec->dev, status = abx500_set_register_interruptible(component->dev,
AB8500_MISC, AB8500_MISC,
AB8500_GPIO_DIR4_REG, AB8500_GPIO_DIR4_REG,
value); value);
...@@ -1970,41 +1970,41 @@ static int ab8500_audio_setup_mics(struct snd_soc_codec *codec, ...@@ -1970,41 +1970,41 @@ static int ab8500_audio_setup_mics(struct snd_soc_codec *codec,
return status; return status;
/* Attach regulators to AMic DAPM-paths */ /* Attach regulators to AMic DAPM-paths */
dev_dbg(codec->dev, "%s: Mic 1a regulator: %s\n", __func__, dev_dbg(component->dev, "%s: Mic 1a regulator: %s\n", __func__,
amic_micbias_str(amics->mic1a_micbias)); amic_micbias_str(amics->mic1a_micbias));
route = &ab8500_dapm_routes_mic1a_vamicx[amics->mic1a_micbias]; route = &ab8500_dapm_routes_mic1a_vamicx[amics->mic1a_micbias];
status = snd_soc_dapm_add_routes(dapm, route, 1); status = snd_soc_dapm_add_routes(dapm, route, 1);
dev_dbg(codec->dev, "%s: Mic 1b regulator: %s\n", __func__, dev_dbg(component->dev, "%s: Mic 1b regulator: %s\n", __func__,
amic_micbias_str(amics->mic1b_micbias)); amic_micbias_str(amics->mic1b_micbias));
route = &ab8500_dapm_routes_mic1b_vamicx[amics->mic1b_micbias]; route = &ab8500_dapm_routes_mic1b_vamicx[amics->mic1b_micbias];
status |= snd_soc_dapm_add_routes(dapm, route, 1); status |= snd_soc_dapm_add_routes(dapm, route, 1);
dev_dbg(codec->dev, "%s: Mic 2 regulator: %s\n", __func__, dev_dbg(component->dev, "%s: Mic 2 regulator: %s\n", __func__,
amic_micbias_str(amics->mic2_micbias)); amic_micbias_str(amics->mic2_micbias));
route = &ab8500_dapm_routes_mic2_vamicx[amics->mic2_micbias]; route = &ab8500_dapm_routes_mic2_vamicx[amics->mic2_micbias];
status |= snd_soc_dapm_add_routes(dapm, route, 1); status |= snd_soc_dapm_add_routes(dapm, route, 1);
if (status < 0) { if (status < 0) {
dev_err(codec->dev, dev_err(component->dev,
"%s: Failed to add AMic-regulator DAPM-routes (%d).\n", "%s: Failed to add AMic-regulator DAPM-routes (%d).\n",
__func__, status); __func__, status);
return status; return status;
} }
/* Set AMic-configuration */ /* Set AMic-configuration */
dev_dbg(codec->dev, "%s: Mic 1 mic-type: %s\n", __func__, dev_dbg(component->dev, "%s: Mic 1 mic-type: %s\n", __func__,
amic_type_str(amics->mic1_type)); amic_type_str(amics->mic1_type));
snd_soc_update_bits(codec, AB8500_ANAGAIN1, AB8500_ANAGAINX_ENSEMICX, snd_soc_component_update_bits(component, AB8500_ANAGAIN1, AB8500_ANAGAINX_ENSEMICX,
amics->mic1_type == AMIC_TYPE_DIFFERENTIAL ? amics->mic1_type == AMIC_TYPE_DIFFERENTIAL ?
0 : AB8500_ANAGAINX_ENSEMICX); 0 : AB8500_ANAGAINX_ENSEMICX);
dev_dbg(codec->dev, "%s: Mic 2 mic-type: %s\n", __func__, dev_dbg(component->dev, "%s: Mic 2 mic-type: %s\n", __func__,
amic_type_str(amics->mic2_type)); amic_type_str(amics->mic2_type));
snd_soc_update_bits(codec, AB8500_ANAGAIN2, AB8500_ANAGAINX_ENSEMICX, snd_soc_component_update_bits(component, AB8500_ANAGAIN2, AB8500_ANAGAINX_ENSEMICX,
amics->mic2_type == AMIC_TYPE_DIFFERENTIAL ? amics->mic2_type == AMIC_TYPE_DIFFERENTIAL ?
0 : AB8500_ANAGAINX_ENSEMICX); 0 : AB8500_ANAGAINX_ENSEMICX);
return 0; return 0;
} }
static int ab8500_audio_set_ear_cmv(struct snd_soc_codec *codec, static int ab8500_audio_set_ear_cmv(struct snd_soc_component *component,
enum ear_cm_voltage ear_cmv) enum ear_cm_voltage ear_cmv)
{ {
char *cmv_str; char *cmv_str;
...@@ -2023,14 +2023,14 @@ static int ab8500_audio_set_ear_cmv(struct snd_soc_codec *codec, ...@@ -2023,14 +2023,14 @@ static int ab8500_audio_set_ear_cmv(struct snd_soc_codec *codec,
cmv_str = "1.58V"; cmv_str = "1.58V";
break; break;
default: default:
dev_err(codec->dev, dev_err(component->dev,
"%s: Unknown earpiece CM-voltage (%d)!\n", "%s: Unknown earpiece CM-voltage (%d)!\n",
__func__, (int)ear_cmv); __func__, (int)ear_cmv);
return -EINVAL; return -EINVAL;
} }
dev_dbg(codec->dev, "%s: Earpiece CM-voltage: %s\n", __func__, dev_dbg(component->dev, "%s: Earpiece CM-voltage: %s\n", __func__,
cmv_str); cmv_str);
snd_soc_update_bits(codec, AB8500_ANACONF1, AB8500_ANACONF1_EARSELCM, snd_soc_component_update_bits(component, AB8500_ANACONF1, AB8500_ANACONF1_EARSELCM,
ear_cmv); ear_cmv);
return 0; return 0;
...@@ -2040,7 +2040,7 @@ static int ab8500_audio_set_bit_delay(struct snd_soc_dai *dai, ...@@ -2040,7 +2040,7 @@ static int ab8500_audio_set_bit_delay(struct snd_soc_dai *dai,
unsigned int delay) unsigned int delay)
{ {
unsigned int mask, val; unsigned int mask, val;
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
mask = BIT(AB8500_DIGIFCONF2_IF0DEL); mask = BIT(AB8500_DIGIFCONF2_IF0DEL);
val = 0; val = 0;
...@@ -2052,21 +2052,21 @@ static int ab8500_audio_set_bit_delay(struct snd_soc_dai *dai, ...@@ -2052,21 +2052,21 @@ static int ab8500_audio_set_bit_delay(struct snd_soc_dai *dai,
val |= BIT(AB8500_DIGIFCONF2_IF0DEL); val |= BIT(AB8500_DIGIFCONF2_IF0DEL);
break; break;
default: default:
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: ERROR: Unsupported bit-delay (0x%x)!\n", "%s: ERROR: Unsupported bit-delay (0x%x)!\n",
__func__, delay); __func__, delay);
return -EINVAL; return -EINVAL;
} }
dev_dbg(dai->codec->dev, "%s: IF0 Bit-delay: %d bits.\n", dev_dbg(dai->component->dev, "%s: IF0 Bit-delay: %d bits.\n",
__func__, delay); __func__, delay);
snd_soc_update_bits(codec, AB8500_DIGIFCONF2, mask, val); snd_soc_component_update_bits(component, AB8500_DIGIFCONF2, mask, val);
return 0; return 0;
} }
/* Gates clocking according format mask */ /* Gates clocking according format mask */
static int ab8500_codec_set_dai_clock_gate(struct snd_soc_codec *codec, static int ab8500_codec_set_dai_clock_gate(struct snd_soc_component *component,
unsigned int fmt) unsigned int fmt)
{ {
unsigned int mask; unsigned int mask;
...@@ -2079,22 +2079,22 @@ static int ab8500_codec_set_dai_clock_gate(struct snd_soc_codec *codec, ...@@ -2079,22 +2079,22 @@ static int ab8500_codec_set_dai_clock_gate(struct snd_soc_codec *codec,
switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) { switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) {
case SND_SOC_DAIFMT_CONT: /* continuous clock */ case SND_SOC_DAIFMT_CONT: /* continuous clock */
dev_dbg(codec->dev, "%s: IF0 Clock is continuous.\n", dev_dbg(component->dev, "%s: IF0 Clock is continuous.\n",
__func__); __func__);
val |= BIT(AB8500_DIGIFCONF1_ENFSBITCLK0); val |= BIT(AB8500_DIGIFCONF1_ENFSBITCLK0);
break; break;
case SND_SOC_DAIFMT_GATED: /* clock is gated */ case SND_SOC_DAIFMT_GATED: /* clock is gated */
dev_dbg(codec->dev, "%s: IF0 Clock is gated.\n", dev_dbg(component->dev, "%s: IF0 Clock is gated.\n",
__func__); __func__);
break; break;
default: default:
dev_err(codec->dev, dev_err(component->dev,
"%s: ERROR: Unsupported clock mask (0x%x)!\n", "%s: ERROR: Unsupported clock mask (0x%x)!\n",
__func__, fmt & SND_SOC_DAIFMT_CLOCK_MASK); __func__, fmt & SND_SOC_DAIFMT_CLOCK_MASK);
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, AB8500_DIGIFCONF1, mask, val); snd_soc_component_update_bits(component, AB8500_DIGIFCONF1, mask, val);
return 0; return 0;
} }
...@@ -2103,10 +2103,10 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -2103,10 +2103,10 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
unsigned int mask; unsigned int mask;
unsigned int val; unsigned int val;
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
int status; int status;
dev_dbg(codec->dev, "%s: Enter (fmt = 0x%x)\n", __func__, fmt); dev_dbg(component->dev, "%s: Enter (fmt = 0x%x)\n", __func__, fmt);
mask = BIT(AB8500_DIGIFCONF3_IF1DATOIF0AD) | mask = BIT(AB8500_DIGIFCONF3_IF1DATOIF0AD) |
BIT(AB8500_DIGIFCONF3_IF1CLKTOIF0CLK) | BIT(AB8500_DIGIFCONF3_IF1CLKTOIF0CLK) |
...@@ -2116,32 +2116,32 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -2116,32 +2116,32 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBM_CFM: /* codec clk & FRM master */ case SND_SOC_DAIFMT_CBM_CFM: /* codec clk & FRM master */
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: IF0 Master-mode: AB8500 master.\n", __func__); "%s: IF0 Master-mode: AB8500 master.\n", __func__);
val |= BIT(AB8500_DIGIFCONF3_IF0MASTER); val |= BIT(AB8500_DIGIFCONF3_IF0MASTER);
break; break;
case SND_SOC_DAIFMT_CBS_CFS: /* codec clk & FRM slave */ case SND_SOC_DAIFMT_CBS_CFS: /* codec clk & FRM slave */
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: IF0 Master-mode: AB8500 slave.\n", __func__); "%s: IF0 Master-mode: AB8500 slave.\n", __func__);
break; break;
case SND_SOC_DAIFMT_CBS_CFM: /* codec clk slave & FRM master */ case SND_SOC_DAIFMT_CBS_CFM: /* codec clk slave & FRM master */
case SND_SOC_DAIFMT_CBM_CFS: /* codec clk master & frame slave */ case SND_SOC_DAIFMT_CBM_CFS: /* codec clk master & frame slave */
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: ERROR: The device is either a master or a slave.\n", "%s: ERROR: The device is either a master or a slave.\n",
__func__); __func__);
default: default:
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: ERROR: Unsupporter master mask 0x%x\n", "%s: ERROR: Unsupporter master mask 0x%x\n",
__func__, fmt & SND_SOC_DAIFMT_MASTER_MASK); __func__, fmt & SND_SOC_DAIFMT_MASTER_MASK);
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, AB8500_DIGIFCONF3, mask, val); snd_soc_component_update_bits(component, AB8500_DIGIFCONF3, mask, val);
/* Set clock gating */ /* Set clock gating */
status = ab8500_codec_set_dai_clock_gate(codec, fmt); status = ab8500_codec_set_dai_clock_gate(component, fmt);
if (status) { if (status) {
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: ERROR: Failed to set clock gate (%d).\n", "%s: ERROR: Failed to set clock gate (%d).\n",
__func__, status); __func__, status);
return status; return status;
...@@ -2157,27 +2157,27 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -2157,27 +2157,27 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S: /* I2S mode */ case SND_SOC_DAIFMT_I2S: /* I2S mode */
dev_dbg(dai->codec->dev, "%s: IF0 Protocol: I2S\n", __func__); dev_dbg(dai->component->dev, "%s: IF0 Protocol: I2S\n", __func__);
val |= BIT(AB8500_DIGIFCONF2_IF0FORMAT1); val |= BIT(AB8500_DIGIFCONF2_IF0FORMAT1);
ab8500_audio_set_bit_delay(dai, 0); ab8500_audio_set_bit_delay(dai, 0);
break; break;
case SND_SOC_DAIFMT_DSP_A: /* L data MSB after FRM LRC */ case SND_SOC_DAIFMT_DSP_A: /* L data MSB after FRM LRC */
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: IF0 Protocol: DSP A (TDM)\n", __func__); "%s: IF0 Protocol: DSP A (TDM)\n", __func__);
val |= BIT(AB8500_DIGIFCONF2_IF0FORMAT0); val |= BIT(AB8500_DIGIFCONF2_IF0FORMAT0);
ab8500_audio_set_bit_delay(dai, 1); ab8500_audio_set_bit_delay(dai, 1);
break; break;
case SND_SOC_DAIFMT_DSP_B: /* L data MSB during FRM LRC */ case SND_SOC_DAIFMT_DSP_B: /* L data MSB during FRM LRC */
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: IF0 Protocol: DSP B (TDM)\n", __func__); "%s: IF0 Protocol: DSP B (TDM)\n", __func__);
val |= BIT(AB8500_DIGIFCONF2_IF0FORMAT0); val |= BIT(AB8500_DIGIFCONF2_IF0FORMAT0);
ab8500_audio_set_bit_delay(dai, 0); ab8500_audio_set_bit_delay(dai, 0);
break; break;
default: default:
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: ERROR: Unsupported format (0x%x)!\n", "%s: ERROR: Unsupported format (0x%x)!\n",
__func__, fmt & SND_SOC_DAIFMT_FORMAT_MASK); __func__, fmt & SND_SOC_DAIFMT_FORMAT_MASK);
return -EINVAL; return -EINVAL;
...@@ -2185,37 +2185,37 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -2185,37 +2185,37 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (fmt & SND_SOC_DAIFMT_INV_MASK) { switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
case SND_SOC_DAIFMT_NB_NF: /* normal bit clock + frame */ case SND_SOC_DAIFMT_NB_NF: /* normal bit clock + frame */
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: IF0: Normal bit clock, normal frame\n", "%s: IF0: Normal bit clock, normal frame\n",
__func__); __func__);
break; break;
case SND_SOC_DAIFMT_NB_IF: /* normal BCLK + inv FRM */ case SND_SOC_DAIFMT_NB_IF: /* normal BCLK + inv FRM */
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: IF0: Normal bit clock, inverted frame\n", "%s: IF0: Normal bit clock, inverted frame\n",
__func__); __func__);
val |= BIT(AB8500_DIGIFCONF2_FSYNC0P); val |= BIT(AB8500_DIGIFCONF2_FSYNC0P);
break; break;
case SND_SOC_DAIFMT_IB_NF: /* invert BCLK + nor FRM */ case SND_SOC_DAIFMT_IB_NF: /* invert BCLK + nor FRM */
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: IF0: Inverted bit clock, normal frame\n", "%s: IF0: Inverted bit clock, normal frame\n",
__func__); __func__);
val |= BIT(AB8500_DIGIFCONF2_BITCLK0P); val |= BIT(AB8500_DIGIFCONF2_BITCLK0P);
break; break;
case SND_SOC_DAIFMT_IB_IF: /* invert BCLK + FRM */ case SND_SOC_DAIFMT_IB_IF: /* invert BCLK + FRM */
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: IF0: Inverted bit clock, inverted frame\n", "%s: IF0: Inverted bit clock, inverted frame\n",
__func__); __func__);
val |= BIT(AB8500_DIGIFCONF2_FSYNC0P); val |= BIT(AB8500_DIGIFCONF2_FSYNC0P);
val |= BIT(AB8500_DIGIFCONF2_BITCLK0P); val |= BIT(AB8500_DIGIFCONF2_BITCLK0P);
break; break;
default: default:
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: ERROR: Unsupported INV mask 0x%x\n", "%s: ERROR: Unsupported INV mask 0x%x\n",
__func__, fmt & SND_SOC_DAIFMT_INV_MASK); __func__, fmt & SND_SOC_DAIFMT_INV_MASK);
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, AB8500_DIGIFCONF2, mask, val); snd_soc_component_update_bits(component, AB8500_DIGIFCONF2, mask, val);
return 0; return 0;
} }
...@@ -2224,7 +2224,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2224,7 +2224,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
unsigned int tx_mask, unsigned int rx_mask, unsigned int tx_mask, unsigned int rx_mask,
int slots, int slot_width) int slots, int slot_width)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
unsigned int val, mask, slot, slots_active; unsigned int val, mask, slot, slots_active;
mask = BIT(AB8500_DIGIFCONF2_IF0WL0) | mask = BIT(AB8500_DIGIFCONF2_IF0WL0) |
...@@ -2245,17 +2245,17 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2245,17 +2245,17 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
BIT(AB8500_DIGIFCONF2_IF0WL0); BIT(AB8500_DIGIFCONF2_IF0WL0);
break; break;
default: default:
dev_err(dai->codec->dev, "%s: Unsupported slot-width 0x%x\n", dev_err(dai->component->dev, "%s: Unsupported slot-width 0x%x\n",
__func__, slot_width); __func__, slot_width);
return -EINVAL; return -EINVAL;
} }
dev_dbg(dai->codec->dev, "%s: IF0 slot-width: %d bits.\n", dev_dbg(dai->component->dev, "%s: IF0 slot-width: %d bits.\n",
__func__, slot_width); __func__, slot_width);
snd_soc_update_bits(codec, AB8500_DIGIFCONF2, mask, val); snd_soc_component_update_bits(component, AB8500_DIGIFCONF2, mask, val);
/* Setup TDM clocking according to slot count */ /* Setup TDM clocking according to slot count */
dev_dbg(dai->codec->dev, "%s: Slots, total: %d\n", __func__, slots); dev_dbg(dai->component->dev, "%s: Slots, total: %d\n", __func__, slots);
mask = BIT(AB8500_DIGIFCONF1_IF0BITCLKOS0) | mask = BIT(AB8500_DIGIFCONF1_IF0BITCLKOS0) |
BIT(AB8500_DIGIFCONF1_IF0BITCLKOS1); BIT(AB8500_DIGIFCONF1_IF0BITCLKOS1);
switch (slots) { switch (slots) {
...@@ -2273,12 +2273,12 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2273,12 +2273,12 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
BIT(AB8500_DIGIFCONF1_IF0BITCLKOS1); BIT(AB8500_DIGIFCONF1_IF0BITCLKOS1);
break; break;
default: default:
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: ERROR: Unsupported number of slots (%d)!\n", "%s: ERROR: Unsupported number of slots (%d)!\n",
__func__, slots); __func__, slots);
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, AB8500_DIGIFCONF1, mask, val); snd_soc_component_update_bits(component, AB8500_DIGIFCONF1, mask, val);
/* Setup TDM DA according to active tx slots */ /* Setup TDM DA according to active tx slots */
...@@ -2289,7 +2289,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2289,7 +2289,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
tx_mask = tx_mask << AB8500_DA_DATA0_OFFSET; tx_mask = tx_mask << AB8500_DA_DATA0_OFFSET;
slots_active = hweight32(tx_mask); slots_active = hweight32(tx_mask);
dev_dbg(dai->codec->dev, "%s: Slots, active, TX: %d\n", __func__, dev_dbg(dai->component->dev, "%s: Slots, active, TX: %d\n", __func__,
slots_active); slots_active);
switch (slots_active) { switch (slots_active) {
...@@ -2297,26 +2297,26 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2297,26 +2297,26 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
break; break;
case 1: case 1:
slot = ffs(tx_mask); slot = ffs(tx_mask);
snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, slot); snd_soc_component_update_bits(component, AB8500_DASLOTCONF1, mask, slot);
snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, slot); snd_soc_component_update_bits(component, AB8500_DASLOTCONF3, mask, slot);
snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, slot); snd_soc_component_update_bits(component, AB8500_DASLOTCONF2, mask, slot);
snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, slot); snd_soc_component_update_bits(component, AB8500_DASLOTCONF4, mask, slot);
break; break;
case 2: case 2:
slot = ffs(tx_mask); slot = ffs(tx_mask);
snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, slot); snd_soc_component_update_bits(component, AB8500_DASLOTCONF1, mask, slot);
snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, slot); snd_soc_component_update_bits(component, AB8500_DASLOTCONF3, mask, slot);
slot = fls(tx_mask); slot = fls(tx_mask);
snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, slot); snd_soc_component_update_bits(component, AB8500_DASLOTCONF2, mask, slot);
snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, slot); snd_soc_component_update_bits(component, AB8500_DASLOTCONF4, mask, slot);
break; break;
case 8: case 8:
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: In 8-channel mode DA-from-slot mapping is set manually.", "%s: In 8-channel mode DA-from-slot mapping is set manually.",
__func__); __func__);
break; break;
default: default:
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: Unsupported number of active TX-slots (%d)!\n", "%s: Unsupported number of active TX-slots (%d)!\n",
__func__, slots_active); __func__, slots_active);
return -EINVAL; return -EINVAL;
...@@ -2330,7 +2330,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2330,7 +2330,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
rx_mask = rx_mask << AB8500_AD_DATA0_OFFSET; rx_mask = rx_mask << AB8500_AD_DATA0_OFFSET;
slots_active = hweight32(rx_mask); slots_active = hweight32(rx_mask);
dev_dbg(dai->codec->dev, "%s: Slots, active, RX: %d\n", __func__, dev_dbg(dai->component->dev, "%s: Slots, active, RX: %d\n", __func__,
slots_active); slots_active);
switch (slots_active) { switch (slots_active) {
...@@ -2338,29 +2338,29 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2338,29 +2338,29 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
break; break;
case 1: case 1:
slot = ffs(rx_mask); slot = ffs(rx_mask);
snd_soc_update_bits(codec, AB8500_ADSLOTSEL(slot), snd_soc_component_update_bits(component, AB8500_ADSLOTSEL(slot),
AB8500_MASK_SLOT(slot), AB8500_MASK_SLOT(slot),
AB8500_ADSLOTSELX_AD_OUT_TO_SLOT(AB8500_AD_OUT3, slot)); AB8500_ADSLOTSELX_AD_OUT_TO_SLOT(AB8500_AD_OUT3, slot));
break; break;
case 2: case 2:
slot = ffs(rx_mask); slot = ffs(rx_mask);
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
AB8500_ADSLOTSEL(slot), AB8500_ADSLOTSEL(slot),
AB8500_MASK_SLOT(slot), AB8500_MASK_SLOT(slot),
AB8500_ADSLOTSELX_AD_OUT_TO_SLOT(AB8500_AD_OUT3, slot)); AB8500_ADSLOTSELX_AD_OUT_TO_SLOT(AB8500_AD_OUT3, slot));
slot = fls(rx_mask); slot = fls(rx_mask);
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
AB8500_ADSLOTSEL(slot), AB8500_ADSLOTSEL(slot),
AB8500_MASK_SLOT(slot), AB8500_MASK_SLOT(slot),
AB8500_ADSLOTSELX_AD_OUT_TO_SLOT(AB8500_AD_OUT2, slot)); AB8500_ADSLOTSELX_AD_OUT_TO_SLOT(AB8500_AD_OUT2, slot));
break; break;
case 8: case 8:
dev_dbg(dai->codec->dev, dev_dbg(dai->component->dev,
"%s: In 8-channel mode AD-to-slot mapping is set manually.", "%s: In 8-channel mode AD-to-slot mapping is set manually.",
__func__); __func__);
break; break;
default: default:
dev_err(dai->codec->dev, dev_err(dai->component->dev,
"%s: Unsupported number of active RX-slots (%d)!\n", "%s: Unsupported number of active RX-slots (%d)!\n",
__func__, slots_active); __func__, slots_active);
return -EINVAL; return -EINVAL;
...@@ -2458,10 +2458,10 @@ static void ab8500_codec_of_probe(struct device *dev, struct device_node *np, ...@@ -2458,10 +2458,10 @@ static void ab8500_codec_of_probe(struct device *dev, struct device_node *np,
} }
} }
static int ab8500_codec_probe(struct snd_soc_codec *codec) static int ab8500_codec_probe(struct snd_soc_component *component)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
struct device *dev = codec->dev; struct device *dev = component->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(dev); struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(dev);
struct ab8500_codec_platform_data codec_pdata; struct ab8500_codec_platform_data codec_pdata;
...@@ -2472,19 +2472,19 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) ...@@ -2472,19 +2472,19 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
ab8500_codec_of_probe(dev, np, &codec_pdata); ab8500_codec_of_probe(dev, np, &codec_pdata);
status = ab8500_audio_setup_mics(codec, &codec_pdata.amics); status = ab8500_audio_setup_mics(component, &codec_pdata.amics);
if (status < 0) { if (status < 0) {
pr_err("%s: Failed to setup mics (%d)!\n", __func__, status); pr_err("%s: Failed to setup mics (%d)!\n", __func__, status);
return status; return status;
} }
status = ab8500_audio_set_ear_cmv(codec, codec_pdata.ear_cmv); status = ab8500_audio_set_ear_cmv(component, codec_pdata.ear_cmv);
if (status < 0) { if (status < 0) {
pr_err("%s: Failed to set earpiece CM-voltage (%d)!\n", pr_err("%s: Failed to set earpiece CM-voltage (%d)!\n",
__func__, status); __func__, status);
return status; return status;
} }
status = ab8500_audio_init_audioblock(codec); status = ab8500_audio_init_audioblock(component);
if (status < 0) { if (status < 0) {
dev_err(dev, "%s: failed to init audio-block (%d)!\n", dev_err(dev, "%s: failed to init audio-block (%d)!\n",
__func__, status); __func__, status);
...@@ -2492,13 +2492,13 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) ...@@ -2492,13 +2492,13 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
} }
/* Override HW-defaults */ /* Override HW-defaults */
snd_soc_write(codec, AB8500_ANACONF5, snd_soc_component_write(component, AB8500_ANACONF5,
BIT(AB8500_ANACONF5_HSAUTOEN)); BIT(AB8500_ANACONF5_HSAUTOEN));
snd_soc_write(codec, AB8500_SHORTCIRCONF, snd_soc_component_write(component, AB8500_SHORTCIRCONF,
BIT(AB8500_SHORTCIRCONF_HSZCDDIS)); BIT(AB8500_SHORTCIRCONF_HSZCDDIS));
/* Add filter controls */ /* Add filter controls */
status = snd_soc_add_codec_controls(codec, ab8500_filter_controls, status = snd_soc_add_component_controls(component, ab8500_filter_controls,
ARRAY_SIZE(ab8500_filter_controls)); ARRAY_SIZE(ab8500_filter_controls));
if (status < 0) { if (status < 0) {
dev_err(dev, dev_err(dev,
...@@ -2523,16 +2523,18 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) ...@@ -2523,16 +2523,18 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
return status; return status;
} }
static const struct snd_soc_codec_driver ab8500_codec_driver = { static const struct snd_soc_component_driver ab8500_component_driver = {
.probe = ab8500_codec_probe, .probe = ab8500_codec_probe,
.component_driver = {
.controls = ab8500_ctrls, .controls = ab8500_ctrls,
.num_controls = ARRAY_SIZE(ab8500_ctrls), .num_controls = ARRAY_SIZE(ab8500_ctrls),
.dapm_widgets = ab8500_dapm_widgets, .dapm_widgets = ab8500_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(ab8500_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(ab8500_dapm_widgets),
.dapm_routes = ab8500_dapm_routes, .dapm_routes = ab8500_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(ab8500_dapm_routes), .num_dapm_routes = ARRAY_SIZE(ab8500_dapm_routes),
}, .idle_bias_on = 1,
.use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static int ab8500_codec_driver_probe(struct platform_device *pdev) static int ab8500_codec_driver_probe(struct platform_device *pdev)
...@@ -2561,7 +2563,8 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev) ...@@ -2561,7 +2563,8 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev)
} }
dev_dbg(&pdev->dev, "%s: Register codec.\n", __func__); dev_dbg(&pdev->dev, "%s: Register codec.\n", __func__);
status = snd_soc_register_codec(&pdev->dev, &ab8500_codec_driver, status = devm_snd_soc_register_component(&pdev->dev,
&ab8500_component_driver,
ab8500_codec_dai, ab8500_codec_dai,
ARRAY_SIZE(ab8500_codec_dai)); ARRAY_SIZE(ab8500_codec_dai));
if (status < 0) if (status < 0)
...@@ -2572,21 +2575,11 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev) ...@@ -2572,21 +2575,11 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev)
return status; return status;
} }
static int ab8500_codec_driver_remove(struct platform_device *pdev)
{
dev_dbg(&pdev->dev, "%s Enter.\n", __func__);
snd_soc_unregister_codec(&pdev->dev);
return 0;
}
static struct platform_driver ab8500_codec_platform_driver = { static struct platform_driver ab8500_codec_platform_driver = {
.driver = { .driver = {
.name = "ab8500-codec", .name = "ab8500-codec",
}, },
.probe = ab8500_codec_driver_probe, .probe = ab8500_codec_driver_probe,
.remove = ab8500_codec_driver_remove,
}; };
module_platform_driver(ab8500_codec_platform_driver); module_platform_driver(ab8500_codec_platform_driver);
......
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