Skip to content

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

ASoC: da7218: 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
Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 254 deletions
sound/soc/codecs/da7218.c
View file @ bc596c42
...@@ -291,7 +291,7 @@ static const struct soc_enum da7218_cp_tau_delay = ...@@ -291,7 +291,7 @@ static const struct soc_enum da7218_cp_tau_delay =
*/ */
/* ALC */ /* ALC */
static void da7218_alc_calib(struct snd_soc_codec *codec) static void da7218_alc_calib(struct snd_soc_component *component)
{ {
u8 mic_1_ctrl, mic_2_ctrl; u8 mic_1_ctrl, mic_2_ctrl;
u8 mixin_1_ctrl, mixin_2_ctrl; u8 mixin_1_ctrl, mixin_2_ctrl;
...@@ -302,59 +302,59 @@ static void da7218_alc_calib(struct snd_soc_codec *codec) ...@@ -302,59 +302,59 @@ static void da7218_alc_calib(struct snd_soc_codec *codec)
bool calibrated = false; bool calibrated = false;
/* Save current state of MIC control registers */ /* Save current state of MIC control registers */
mic_1_ctrl = snd_soc_read(codec, DA7218_MIC_1_CTRL); mic_1_ctrl = snd_soc_component_read32(component, DA7218_MIC_1_CTRL);
mic_2_ctrl = snd_soc_read(codec, DA7218_MIC_2_CTRL); mic_2_ctrl = snd_soc_component_read32(component, DA7218_MIC_2_CTRL);
/* Save current state of input mixer control registers */ /* Save current state of input mixer control registers */
mixin_1_ctrl = snd_soc_read(codec, DA7218_MIXIN_1_CTRL); mixin_1_ctrl = snd_soc_component_read32(component, DA7218_MIXIN_1_CTRL);
mixin_2_ctrl = snd_soc_read(codec, DA7218_MIXIN_2_CTRL); mixin_2_ctrl = snd_soc_component_read32(component, DA7218_MIXIN_2_CTRL);
/* Save current state of input filter control registers */ /* Save current state of input filter control registers */
in_1l_filt_ctrl = snd_soc_read(codec, DA7218_IN_1L_FILTER_CTRL); in_1l_filt_ctrl = snd_soc_component_read32(component, DA7218_IN_1L_FILTER_CTRL);
in_1r_filt_ctrl = snd_soc_read(codec, DA7218_IN_1R_FILTER_CTRL); in_1r_filt_ctrl = snd_soc_component_read32(component, DA7218_IN_1R_FILTER_CTRL);
in_2l_filt_ctrl = snd_soc_read(codec, DA7218_IN_2L_FILTER_CTRL); in_2l_filt_ctrl = snd_soc_component_read32(component, DA7218_IN_2L_FILTER_CTRL);
in_2r_filt_ctrl = snd_soc_read(codec, DA7218_IN_2R_FILTER_CTRL); in_2r_filt_ctrl = snd_soc_component_read32(component, DA7218_IN_2R_FILTER_CTRL);
/* Save current state of input HPF control registers */ /* Save current state of input HPF control registers */
in_1_hpf_ctrl = snd_soc_read(codec, DA7218_IN_1_HPF_FILTER_CTRL); in_1_hpf_ctrl = snd_soc_component_read32(component, DA7218_IN_1_HPF_FILTER_CTRL);
in_2_hpf_ctrl = snd_soc_read(codec, DA7218_IN_2_HPF_FILTER_CTRL); in_2_hpf_ctrl = snd_soc_component_read32(component, DA7218_IN_2_HPF_FILTER_CTRL);
/* Enable then Mute MIC PGAs */ /* Enable then Mute MIC PGAs */
snd_soc_update_bits(codec, DA7218_MIC_1_CTRL, DA7218_MIC_1_AMP_EN_MASK, snd_soc_component_update_bits(component, DA7218_MIC_1_CTRL, DA7218_MIC_1_AMP_EN_MASK,
DA7218_MIC_1_AMP_EN_MASK); DA7218_MIC_1_AMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_MIC_2_CTRL, DA7218_MIC_2_AMP_EN_MASK, snd_soc_component_update_bits(component, DA7218_MIC_2_CTRL, DA7218_MIC_2_AMP_EN_MASK,
DA7218_MIC_2_AMP_EN_MASK); DA7218_MIC_2_AMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_MIC_1_CTRL, snd_soc_component_update_bits(component, DA7218_MIC_1_CTRL,
DA7218_MIC_1_AMP_MUTE_EN_MASK, DA7218_MIC_1_AMP_MUTE_EN_MASK,
DA7218_MIC_1_AMP_MUTE_EN_MASK); DA7218_MIC_1_AMP_MUTE_EN_MASK);
snd_soc_update_bits(codec, DA7218_MIC_2_CTRL, snd_soc_component_update_bits(component, DA7218_MIC_2_CTRL,
DA7218_MIC_2_AMP_MUTE_EN_MASK, DA7218_MIC_2_AMP_MUTE_EN_MASK,
DA7218_MIC_2_AMP_MUTE_EN_MASK); DA7218_MIC_2_AMP_MUTE_EN_MASK);
/* Enable input mixers unmuted */ /* Enable input mixers unmuted */
snd_soc_update_bits(codec, DA7218_MIXIN_1_CTRL, snd_soc_component_update_bits(component, DA7218_MIXIN_1_CTRL,
DA7218_MIXIN_1_AMP_EN_MASK | DA7218_MIXIN_1_AMP_EN_MASK |
DA7218_MIXIN_1_AMP_MUTE_EN_MASK, DA7218_MIXIN_1_AMP_MUTE_EN_MASK,
DA7218_MIXIN_1_AMP_EN_MASK); DA7218_MIXIN_1_AMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_MIXIN_2_CTRL, snd_soc_component_update_bits(component, DA7218_MIXIN_2_CTRL,
DA7218_MIXIN_2_AMP_EN_MASK | DA7218_MIXIN_2_AMP_EN_MASK |
DA7218_MIXIN_2_AMP_MUTE_EN_MASK, DA7218_MIXIN_2_AMP_MUTE_EN_MASK,
DA7218_MIXIN_2_AMP_EN_MASK); DA7218_MIXIN_2_AMP_EN_MASK);
/* Enable input filters unmuted */ /* Enable input filters unmuted */
snd_soc_update_bits(codec, DA7218_IN_1L_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_1L_FILTER_CTRL,
DA7218_IN_1L_FILTER_EN_MASK | DA7218_IN_1L_FILTER_EN_MASK |
DA7218_IN_1L_MUTE_EN_MASK, DA7218_IN_1L_MUTE_EN_MASK,
DA7218_IN_1L_FILTER_EN_MASK); DA7218_IN_1L_FILTER_EN_MASK);
snd_soc_update_bits(codec, DA7218_IN_1R_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_1R_FILTER_CTRL,
DA7218_IN_1R_FILTER_EN_MASK | DA7218_IN_1R_FILTER_EN_MASK |
DA7218_IN_1R_MUTE_EN_MASK, DA7218_IN_1R_MUTE_EN_MASK,
DA7218_IN_1R_FILTER_EN_MASK); DA7218_IN_1R_FILTER_EN_MASK);
snd_soc_update_bits(codec, DA7218_IN_2L_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_2L_FILTER_CTRL,
DA7218_IN_2L_FILTER_EN_MASK | DA7218_IN_2L_FILTER_EN_MASK |
DA7218_IN_2L_MUTE_EN_MASK, DA7218_IN_2L_MUTE_EN_MASK,
DA7218_IN_2L_FILTER_EN_MASK); DA7218_IN_2L_FILTER_EN_MASK);
snd_soc_update_bits(codec, DA7218_IN_2R_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_2R_FILTER_CTRL,
DA7218_IN_2R_FILTER_EN_MASK | DA7218_IN_2R_FILTER_EN_MASK |
DA7218_IN_2R_MUTE_EN_MASK, DA7218_IN_2R_MUTE_EN_MASK,
DA7218_IN_2R_FILTER_EN_MASK); DA7218_IN_2R_FILTER_EN_MASK);
...@@ -364,16 +364,16 @@ static void da7218_alc_calib(struct snd_soc_codec *codec) ...@@ -364,16 +364,16 @@ static void da7218_alc_calib(struct snd_soc_codec *codec)
* rates above 32KHz the ADC signals will be stopped and will cause * rates above 32KHz the ADC signals will be stopped and will cause
* calibration to lock up. * calibration to lock up.
*/ */
snd_soc_update_bits(codec, DA7218_IN_1_HPF_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_1_HPF_FILTER_CTRL,
DA7218_IN_1_VOICE_EN_MASK, 0); DA7218_IN_1_VOICE_EN_MASK, 0);
snd_soc_update_bits(codec, DA7218_IN_2_HPF_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_2_HPF_FILTER_CTRL,
DA7218_IN_2_VOICE_EN_MASK, 0); DA7218_IN_2_VOICE_EN_MASK, 0);
/* Perform auto calibration */ /* Perform auto calibration */
snd_soc_update_bits(codec, DA7218_CALIB_CTRL, DA7218_CALIB_AUTO_EN_MASK, snd_soc_component_update_bits(component, DA7218_CALIB_CTRL, DA7218_CALIB_AUTO_EN_MASK,
DA7218_CALIB_AUTO_EN_MASK); DA7218_CALIB_AUTO_EN_MASK);
do { do {
calib_ctrl = snd_soc_read(codec, DA7218_CALIB_CTRL); calib_ctrl = snd_soc_component_read32(component, DA7218_CALIB_CTRL);
if (calib_ctrl & DA7218_CALIB_AUTO_EN_MASK) { if (calib_ctrl & DA7218_CALIB_AUTO_EN_MASK) {
++i; ++i;
usleep_range(DA7218_ALC_CALIB_DELAY_MIN, usleep_range(DA7218_ALC_CALIB_DELAY_MIN,
...@@ -386,51 +386,51 @@ static void da7218_alc_calib(struct snd_soc_codec *codec) ...@@ -386,51 +386,51 @@ static void da7218_alc_calib(struct snd_soc_codec *codec)
/* If auto calibration fails, disable DC offset, hybrid ALC */ /* If auto calibration fails, disable DC offset, hybrid ALC */
if ((!calibrated) || (calib_ctrl & DA7218_CALIB_OVERFLOW_MASK)) { if ((!calibrated) || (calib_ctrl & DA7218_CALIB_OVERFLOW_MASK)) {
dev_warn(codec->dev, dev_warn(component->dev,
"ALC auto calibration failed - %s\n", "ALC auto calibration failed - %s\n",
(calibrated) ? "overflow" : "timeout"); (calibrated) ? "overflow" : "timeout");
snd_soc_update_bits(codec, DA7218_CALIB_CTRL, snd_soc_component_update_bits(component, DA7218_CALIB_CTRL,
DA7218_CALIB_OFFSET_EN_MASK, 0); DA7218_CALIB_OFFSET_EN_MASK, 0);
snd_soc_update_bits(codec, DA7218_ALC_CTRL1, snd_soc_component_update_bits(component, DA7218_ALC_CTRL1,
DA7218_ALC_SYNC_MODE_MASK, 0); DA7218_ALC_SYNC_MODE_MASK, 0);
} else { } else {
/* Enable DC offset cancellation */ /* Enable DC offset cancellation */
snd_soc_update_bits(codec, DA7218_CALIB_CTRL, snd_soc_component_update_bits(component, DA7218_CALIB_CTRL,
DA7218_CALIB_OFFSET_EN_MASK, DA7218_CALIB_OFFSET_EN_MASK,
DA7218_CALIB_OFFSET_EN_MASK); DA7218_CALIB_OFFSET_EN_MASK);
/* Enable ALC hybrid mode */ /* Enable ALC hybrid mode */
snd_soc_update_bits(codec, DA7218_ALC_CTRL1, snd_soc_component_update_bits(component, DA7218_ALC_CTRL1,
DA7218_ALC_SYNC_MODE_MASK, DA7218_ALC_SYNC_MODE_MASK,
DA7218_ALC_SYNC_MODE_CH1 | DA7218_ALC_SYNC_MODE_CH1 |
DA7218_ALC_SYNC_MODE_CH2); DA7218_ALC_SYNC_MODE_CH2);
} }
/* Restore input HPF control registers to original states */ /* Restore input HPF control registers to original states */
snd_soc_write(codec, DA7218_IN_1_HPF_FILTER_CTRL, in_1_hpf_ctrl); snd_soc_component_write(component, DA7218_IN_1_HPF_FILTER_CTRL, in_1_hpf_ctrl);
snd_soc_write(codec, DA7218_IN_2_HPF_FILTER_CTRL, in_2_hpf_ctrl); snd_soc_component_write(component, DA7218_IN_2_HPF_FILTER_CTRL, in_2_hpf_ctrl);
/* Restore input filter control registers to original states */ /* Restore input filter control registers to original states */
snd_soc_write(codec, DA7218_IN_1L_FILTER_CTRL, in_1l_filt_ctrl); snd_soc_component_write(component, DA7218_IN_1L_FILTER_CTRL, in_1l_filt_ctrl);
snd_soc_write(codec, DA7218_IN_1R_FILTER_CTRL, in_1r_filt_ctrl); snd_soc_component_write(component, DA7218_IN_1R_FILTER_CTRL, in_1r_filt_ctrl);
snd_soc_write(codec, DA7218_IN_2L_FILTER_CTRL, in_2l_filt_ctrl); snd_soc_component_write(component, DA7218_IN_2L_FILTER_CTRL, in_2l_filt_ctrl);
snd_soc_write(codec, DA7218_IN_2R_FILTER_CTRL, in_2r_filt_ctrl); snd_soc_component_write(component, DA7218_IN_2R_FILTER_CTRL, in_2r_filt_ctrl);
/* Restore input mixer control registers to original state */ /* Restore input mixer control registers to original state */
snd_soc_write(codec, DA7218_MIXIN_1_CTRL, mixin_1_ctrl); snd_soc_component_write(component, DA7218_MIXIN_1_CTRL, mixin_1_ctrl);
snd_soc_write(codec, DA7218_MIXIN_2_CTRL, mixin_2_ctrl); snd_soc_component_write(component, DA7218_MIXIN_2_CTRL, mixin_2_ctrl);
/* Restore MIC control registers to original states */ /* Restore MIC control registers to original states */
snd_soc_write(codec, DA7218_MIC_1_CTRL, mic_1_ctrl); snd_soc_component_write(component, DA7218_MIC_1_CTRL, mic_1_ctrl);
snd_soc_write(codec, DA7218_MIC_2_CTRL, mic_2_ctrl); snd_soc_component_write(component, DA7218_MIC_2_CTRL, mic_2_ctrl);
} }
static int da7218_mixin_gain_put(struct snd_kcontrol *kcontrol, static int da7218_mixin_gain_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 da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
int ret; int ret;
ret = snd_soc_put_volsw(kcontrol, ucontrol); ret = snd_soc_put_volsw(kcontrol, ucontrol);
...@@ -440,7 +440,7 @@ static int da7218_mixin_gain_put(struct snd_kcontrol *kcontrol, ...@@ -440,7 +440,7 @@ static int da7218_mixin_gain_put(struct snd_kcontrol *kcontrol,
* make sure calibrated offsets are updated. * make sure calibrated offsets are updated.
*/ */
if ((ret == 1) && (da7218->alc_en)) if ((ret == 1) && (da7218->alc_en))
da7218_alc_calib(codec); da7218_alc_calib(component);
return ret; return ret;
} }
...@@ -450,8 +450,8 @@ static int da7218_alc_sw_put(struct snd_kcontrol *kcontrol, ...@@ -450,8 +450,8 @@ static int da7218_alc_sw_put(struct snd_kcontrol *kcontrol,
{ {
struct soc_mixer_control *mc = struct soc_mixer_control *mc =
(struct soc_mixer_control *) kcontrol->private_value; (struct soc_mixer_control *) kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
unsigned int lvalue = ucontrol->value.integer.value[0]; unsigned int lvalue = ucontrol->value.integer.value[0];
unsigned int rvalue = ucontrol->value.integer.value[1]; unsigned int rvalue = ucontrol->value.integer.value[1];
unsigned int lshift = mc->shift; unsigned int lshift = mc->shift;
...@@ -460,7 +460,7 @@ static int da7218_alc_sw_put(struct snd_kcontrol *kcontrol, ...@@ -460,7 +460,7 @@ static int da7218_alc_sw_put(struct snd_kcontrol *kcontrol,
/* Force ALC offset calibration if enabling ALC */ /* Force ALC offset calibration if enabling ALC */
if ((lvalue || rvalue) && (!da7218->alc_en)) if ((lvalue || rvalue) && (!da7218->alc_en))
da7218_alc_calib(codec); da7218_alc_calib(component);
/* Update bits to detail which channels are enabled/disabled */ /* Update bits to detail which channels are enabled/disabled */
da7218->alc_en &= ~mask; da7218->alc_en &= ~mask;
...@@ -473,8 +473,8 @@ static int da7218_alc_sw_put(struct snd_kcontrol *kcontrol, ...@@ -473,8 +473,8 @@ static int da7218_alc_sw_put(struct snd_kcontrol *kcontrol,
static int da7218_tonegen_freq_get(struct snd_kcontrol *kcontrol, static int da7218_tonegen_freq_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 da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct soc_mixer_control *mixer_ctrl = struct soc_mixer_control *mixer_ctrl =
(struct soc_mixer_control *) kcontrol->private_value; (struct soc_mixer_control *) kcontrol->private_value;
unsigned int reg = mixer_ctrl->reg; unsigned int reg = mixer_ctrl->reg;
...@@ -497,8 +497,8 @@ static int da7218_tonegen_freq_get(struct snd_kcontrol *kcontrol, ...@@ -497,8 +497,8 @@ static int da7218_tonegen_freq_get(struct snd_kcontrol *kcontrol,
static int da7218_tonegen_freq_put(struct snd_kcontrol *kcontrol, static int da7218_tonegen_freq_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 da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct soc_mixer_control *mixer_ctrl = struct soc_mixer_control *mixer_ctrl =
(struct soc_mixer_control *) kcontrol->private_value; (struct soc_mixer_control *) kcontrol->private_value;
unsigned int reg = mixer_ctrl->reg; unsigned int reg = mixer_ctrl->reg;
...@@ -517,8 +517,8 @@ static int da7218_tonegen_freq_put(struct snd_kcontrol *kcontrol, ...@@ -517,8 +517,8 @@ static int da7218_tonegen_freq_put(struct snd_kcontrol *kcontrol,
static int da7218_mic_lvl_det_sw_put(struct snd_kcontrol *kcontrol, static int da7218_mic_lvl_det_sw_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 da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct soc_mixer_control *mixer_ctrl = struct soc_mixer_control *mixer_ctrl =
(struct soc_mixer_control *) kcontrol->private_value; (struct soc_mixer_control *) kcontrol->private_value;
unsigned int lvalue = ucontrol->value.integer.value[0]; unsigned int lvalue = ucontrol->value.integer.value[0];
...@@ -537,15 +537,15 @@ static int da7218_mic_lvl_det_sw_put(struct snd_kcontrol *kcontrol, ...@@ -537,15 +537,15 @@ static int da7218_mic_lvl_det_sw_put(struct snd_kcontrol *kcontrol,
* power the path (IN_FILTER widget events). This handling avoids * power the path (IN_FILTER widget events). This handling avoids
* unwanted level detect events. * unwanted level detect events.
*/ */
return snd_soc_write(codec, mixer_ctrl->reg, return snd_soc_component_write(component, mixer_ctrl->reg,
(da7218->in_filt_en & da7218->mic_lvl_det_en)); (da7218->in_filt_en & da7218->mic_lvl_det_en));
} }
static int da7218_mic_lvl_det_sw_get(struct snd_kcontrol *kcontrol, static int da7218_mic_lvl_det_sw_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 da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct soc_mixer_control *mixer_ctrl = struct soc_mixer_control *mixer_ctrl =
(struct soc_mixer_control *) kcontrol->private_value; (struct soc_mixer_control *) kcontrol->private_value;
unsigned int lshift = mixer_ctrl->shift; unsigned int lshift = mixer_ctrl->shift;
...@@ -564,8 +564,8 @@ static int da7218_mic_lvl_det_sw_get(struct snd_kcontrol *kcontrol, ...@@ -564,8 +564,8 @@ static int da7218_mic_lvl_det_sw_get(struct snd_kcontrol *kcontrol,
static int da7218_biquad_coeff_get(struct snd_kcontrol *kcontrol, static int da7218_biquad_coeff_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 da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct soc_bytes_ext *bytes_ext = struct soc_bytes_ext *bytes_ext =
(struct soc_bytes_ext *) kcontrol->private_value; (struct soc_bytes_ext *) kcontrol->private_value;
...@@ -589,8 +589,8 @@ static int da7218_biquad_coeff_get(struct snd_kcontrol *kcontrol, ...@@ -589,8 +589,8 @@ static int da7218_biquad_coeff_get(struct snd_kcontrol *kcontrol,
static int da7218_biquad_coeff_put(struct snd_kcontrol *kcontrol, static int da7218_biquad_coeff_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 da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct soc_bytes_ext *bytes_ext = struct soc_bytes_ext *bytes_ext =
(struct soc_bytes_ext *) kcontrol->private_value; (struct soc_bytes_ext *) kcontrol->private_value;
u8 reg, out_filt1l; u8 reg, out_filt1l;
...@@ -617,8 +617,8 @@ static int da7218_biquad_coeff_put(struct snd_kcontrol *kcontrol, ...@@ -617,8 +617,8 @@ static int da7218_biquad_coeff_put(struct snd_kcontrol *kcontrol,
} }
/* Make sure at least out filter1 enabled to allow programming */ /* Make sure at least out filter1 enabled to allow programming */
out_filt1l = snd_soc_read(codec, DA7218_OUT_1L_FILTER_CTRL); out_filt1l = snd_soc_component_read32(component, DA7218_OUT_1L_FILTER_CTRL);
snd_soc_write(codec, DA7218_OUT_1L_FILTER_CTRL, snd_soc_component_write(component, DA7218_OUT_1L_FILTER_CTRL,
out_filt1l | DA7218_OUT_1L_FILTER_EN_MASK); out_filt1l | DA7218_OUT_1L_FILTER_EN_MASK);
for (i = 0; i < bytes_ext->max; ++i) { for (i = 0; i < bytes_ext->max; ++i) {
...@@ -628,7 +628,7 @@ static int da7218_biquad_coeff_put(struct snd_kcontrol *kcontrol, ...@@ -628,7 +628,7 @@ static int da7218_biquad_coeff_put(struct snd_kcontrol *kcontrol,
} }
/* Restore filter to previous setting */ /* Restore filter to previous setting */
snd_soc_write(codec, DA7218_OUT_1L_FILTER_CTRL, out_filt1l); snd_soc_component_write(component, DA7218_OUT_1L_FILTER_CTRL, out_filt1l);
return 0; return 0;
} }
...@@ -1349,8 +1349,8 @@ static const struct snd_kcontrol_new da7218_st_out_filtr_mix_controls[] = { ...@@ -1349,8 +1349,8 @@ static const struct snd_kcontrol_new da7218_st_out_filtr_mix_controls[] = {
static int da7218_in_filter_event(struct snd_soc_dapm_widget *w, static int da7218_in_filter_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
u8 mask; u8 mask;
switch (w->reg) { switch (w->reg) {
...@@ -1389,7 +1389,7 @@ static int da7218_in_filter_event(struct snd_soc_dapm_widget *w, ...@@ -1389,7 +1389,7 @@ static int da7218_in_filter_event(struct snd_soc_dapm_widget *w,
} }
/* Enable configured level detection paths */ /* Enable configured level detection paths */
snd_soc_write(codec, DA7218_LVL_DET_CTRL, snd_soc_component_write(component, DA7218_LVL_DET_CTRL,
(da7218->in_filt_en & da7218->mic_lvl_det_en)); (da7218->in_filt_en & da7218->mic_lvl_det_en));
return 0; return 0;
...@@ -1398,8 +1398,8 @@ static int da7218_in_filter_event(struct snd_soc_dapm_widget *w, ...@@ -1398,8 +1398,8 @@ static int da7218_in_filter_event(struct snd_soc_dapm_widget *w,
static int da7218_dai_event(struct snd_soc_dapm_widget *w, static int da7218_dai_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
u8 pll_ctrl, pll_status, refosc_cal; u8 pll_ctrl, pll_status, refosc_cal;
int i; int i;
bool success; bool success;
...@@ -1408,14 +1408,14 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w, ...@@ -1408,14 +1408,14 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w,
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
if (da7218->master) if (da7218->master)
/* Enable DAI clks for master mode */ /* Enable DAI clks for master mode */
snd_soc_update_bits(codec, DA7218_DAI_CLK_MODE, snd_soc_component_update_bits(component, DA7218_DAI_CLK_MODE,
DA7218_DAI_CLK_EN_MASK, DA7218_DAI_CLK_EN_MASK,
DA7218_DAI_CLK_EN_MASK); DA7218_DAI_CLK_EN_MASK);
/* Tune reference oscillator */ /* Tune reference oscillator */
snd_soc_write(codec, DA7218_PLL_REFOSC_CAL, snd_soc_component_write(component, DA7218_PLL_REFOSC_CAL,
DA7218_PLL_REFOSC_CAL_START_MASK); DA7218_PLL_REFOSC_CAL_START_MASK);
snd_soc_write(codec, DA7218_PLL_REFOSC_CAL, snd_soc_component_write(component, DA7218_PLL_REFOSC_CAL,
DA7218_PLL_REFOSC_CAL_START_MASK | DA7218_PLL_REFOSC_CAL_START_MASK |
DA7218_PLL_REFOSC_CAL_EN_MASK); DA7218_PLL_REFOSC_CAL_EN_MASK);
...@@ -1423,7 +1423,7 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w, ...@@ -1423,7 +1423,7 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w,
i = 0; i = 0;
success = false; success = false;
do { do {
refosc_cal = snd_soc_read(codec, DA7218_PLL_REFOSC_CAL); refosc_cal = snd_soc_component_read32(component, DA7218_PLL_REFOSC_CAL);
if (!(refosc_cal & DA7218_PLL_REFOSC_CAL_START_MASK)) { if (!(refosc_cal & DA7218_PLL_REFOSC_CAL_START_MASK)) {
success = true; success = true;
} else { } else {
...@@ -1434,15 +1434,15 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w, ...@@ -1434,15 +1434,15 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w,
} while ((i < DA7218_REF_OSC_CHECK_TRIES) && (!success)); } while ((i < DA7218_REF_OSC_CHECK_TRIES) && (!success));
if (!success) if (!success)
dev_warn(codec->dev, dev_warn(component->dev,
"Reference oscillator failed calibration\n"); "Reference oscillator failed calibration\n");
/* PC synchronised to DAI */ /* PC synchronised to DAI */
snd_soc_write(codec, DA7218_PC_COUNT, snd_soc_component_write(component, DA7218_PC_COUNT,
DA7218_PC_RESYNC_AUTO_MASK); DA7218_PC_RESYNC_AUTO_MASK);
/* If SRM not enabled, we don't need to check status */ /* If SRM not enabled, we don't need to check status */
pll_ctrl = snd_soc_read(codec, DA7218_PLL_CTRL); pll_ctrl = snd_soc_component_read32(component, DA7218_PLL_CTRL);
if ((pll_ctrl & DA7218_PLL_MODE_MASK) != DA7218_PLL_MODE_SRM) if ((pll_ctrl & DA7218_PLL_MODE_MASK) != DA7218_PLL_MODE_SRM)
return 0; return 0;
...@@ -1450,7 +1450,7 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w, ...@@ -1450,7 +1450,7 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w,
i = 0; i = 0;
success = false; success = false;
do { do {
pll_status = snd_soc_read(codec, DA7218_PLL_STATUS); pll_status = snd_soc_component_read32(component, DA7218_PLL_STATUS);
if (pll_status & DA7218_PLL_SRM_STATUS_SRM_LOCK) { if (pll_status & DA7218_PLL_SRM_STATUS_SRM_LOCK) {
success = true; success = true;
} else { } else {
...@@ -1460,16 +1460,16 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w, ...@@ -1460,16 +1460,16 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w,
} while ((i < DA7218_SRM_CHECK_TRIES) && (!success)); } while ((i < DA7218_SRM_CHECK_TRIES) && (!success));
if (!success) if (!success)
dev_warn(codec->dev, "SRM failed to lock\n"); dev_warn(component->dev, "SRM failed to lock\n");
return 0; return 0;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
/* PC free-running */ /* PC free-running */
snd_soc_write(codec, DA7218_PC_COUNT, DA7218_PC_FREERUN_MASK); snd_soc_component_write(component, DA7218_PC_COUNT, DA7218_PC_FREERUN_MASK);
if (da7218->master) if (da7218->master)
/* Disable DAI clks for master mode */ /* Disable DAI clks for master mode */
snd_soc_update_bits(codec, DA7218_DAI_CLK_MODE, snd_soc_component_update_bits(component, DA7218_DAI_CLK_MODE,
DA7218_DAI_CLK_EN_MASK, 0); DA7218_DAI_CLK_EN_MASK, 0);
return 0; return 0;
...@@ -1481,8 +1481,8 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w, ...@@ -1481,8 +1481,8 @@ static int da7218_dai_event(struct snd_soc_dapm_widget *w,
static int da7218_cp_event(struct snd_soc_dapm_widget *w, static int da7218_cp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
/* /*
* If this is DA7217 and we're using single supply for differential * If this is DA7217 and we're using single supply for differential
...@@ -1493,11 +1493,11 @@ static int da7218_cp_event(struct snd_soc_dapm_widget *w, ...@@ -1493,11 +1493,11 @@ static int da7218_cp_event(struct snd_soc_dapm_widget *w,
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
snd_soc_update_bits(codec, DA7218_CP_CTRL, DA7218_CP_EN_MASK, snd_soc_component_update_bits(component, DA7218_CP_CTRL, DA7218_CP_EN_MASK,
DA7218_CP_EN_MASK); DA7218_CP_EN_MASK);
return 0; return 0;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, DA7218_CP_CTRL, DA7218_CP_EN_MASK, snd_soc_component_update_bits(component, DA7218_CP_CTRL, DA7218_CP_EN_MASK,
0); 0);
return 0; return 0;
default: default:
...@@ -1508,17 +1508,17 @@ static int da7218_cp_event(struct snd_soc_dapm_widget *w, ...@@ -1508,17 +1508,17 @@ static int da7218_cp_event(struct snd_soc_dapm_widget *w,
static int da7218_hp_pga_event(struct snd_soc_dapm_widget *w, static int da7218_hp_pga_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
/* Enable headphone output */ /* Enable headphone output */
snd_soc_update_bits(codec, w->reg, DA7218_HP_AMP_OE_MASK, snd_soc_component_update_bits(component, w->reg, DA7218_HP_AMP_OE_MASK,
DA7218_HP_AMP_OE_MASK); DA7218_HP_AMP_OE_MASK);
return 0; return 0;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
/* Headphone output high impedance */ /* Headphone output high impedance */
snd_soc_update_bits(codec, w->reg, DA7218_HP_AMP_OE_MASK, 0); snd_soc_component_update_bits(component, w->reg, DA7218_HP_AMP_OE_MASK, 0);
return 0; return 0;
default: default:
return -EINVAL; return -EINVAL;
...@@ -1813,8 +1813,8 @@ static const struct snd_soc_dapm_route da7218_audio_map[] = { ...@@ -1813,8 +1813,8 @@ static const struct snd_soc_dapm_route da7218_audio_map[] = {
static int da7218_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int da7218_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
int ret; int ret;
if (da7218->mclk_rate == freq) if (da7218->mclk_rate == freq)
...@@ -1828,12 +1828,12 @@ static int da7218_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -1828,12 +1828,12 @@ static int da7218_set_dai_sysclk(struct snd_soc_dai *codec_dai,
switch (clk_id) { switch (clk_id) {
case DA7218_CLKSRC_MCLK_SQR: case DA7218_CLKSRC_MCLK_SQR:
snd_soc_update_bits(codec, DA7218_PLL_CTRL, snd_soc_component_update_bits(component, DA7218_PLL_CTRL,
DA7218_PLL_MCLK_SQR_EN_MASK, DA7218_PLL_MCLK_SQR_EN_MASK,
DA7218_PLL_MCLK_SQR_EN_MASK); DA7218_PLL_MCLK_SQR_EN_MASK);
break; break;
case DA7218_CLKSRC_MCLK: case DA7218_CLKSRC_MCLK:
snd_soc_update_bits(codec, DA7218_PLL_CTRL, snd_soc_component_update_bits(component, DA7218_PLL_CTRL,
DA7218_PLL_MCLK_SQR_EN_MASK, 0); DA7218_PLL_MCLK_SQR_EN_MASK, 0);
break; break;
default: default:
...@@ -1859,8 +1859,8 @@ static int da7218_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -1859,8 +1859,8 @@ static int da7218_set_dai_sysclk(struct snd_soc_dai *codec_dai,
static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
int source, unsigned int fref, unsigned int fout) int source, unsigned int fref, unsigned int fout)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
u8 pll_ctrl, indiv_bits, indiv; u8 pll_ctrl, indiv_bits, indiv;
u8 pll_frac_top, pll_frac_bot, pll_integer; u8 pll_frac_top, pll_frac_bot, pll_integer;
...@@ -1869,7 +1869,7 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, ...@@ -1869,7 +1869,7 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
/* Verify 2MHz - 54MHz MCLK provided, and set input divider */ /* Verify 2MHz - 54MHz MCLK provided, and set input divider */
if (da7218->mclk_rate < 2000000) { if (da7218->mclk_rate < 2000000) {
dev_err(codec->dev, "PLL input clock %d below valid range\n", dev_err(component->dev, "PLL input clock %d below valid range\n",
da7218->mclk_rate); da7218->mclk_rate);
return -EINVAL; return -EINVAL;
} else if (da7218->mclk_rate <= 4500000) { } else if (da7218->mclk_rate <= 4500000) {
...@@ -1888,7 +1888,7 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, ...@@ -1888,7 +1888,7 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
indiv_bits = DA7218_PLL_INDIV_36_TO_54_MHZ; indiv_bits = DA7218_PLL_INDIV_36_TO_54_MHZ;
indiv = DA7218_PLL_INDIV_36_TO_54_MHZ_VAL; indiv = DA7218_PLL_INDIV_36_TO_54_MHZ_VAL;
} else { } else {
dev_err(codec->dev, "PLL input clock %d above valid range\n", dev_err(component->dev, "PLL input clock %d above valid range\n",
da7218->mclk_rate); da7218->mclk_rate);
return -EINVAL; return -EINVAL;
} }
...@@ -1899,7 +1899,7 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, ...@@ -1899,7 +1899,7 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
switch (source) { switch (source) {
case DA7218_SYSCLK_MCLK: case DA7218_SYSCLK_MCLK:
pll_ctrl |= DA7218_PLL_MODE_BYPASS; pll_ctrl |= DA7218_PLL_MODE_BYPASS;
snd_soc_update_bits(codec, DA7218_PLL_CTRL, snd_soc_component_update_bits(component, DA7218_PLL_CTRL,
DA7218_PLL_INDIV_MASK | DA7218_PLL_INDIV_MASK |
DA7218_PLL_MODE_MASK, pll_ctrl); DA7218_PLL_MODE_MASK, pll_ctrl);
return 0; return 0;
...@@ -1910,7 +1910,7 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, ...@@ -1910,7 +1910,7 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
pll_ctrl |= DA7218_PLL_MODE_SRM; pll_ctrl |= DA7218_PLL_MODE_SRM;
break; break;
default: default:
dev_err(codec->dev, "Invalid PLL config\n"); dev_err(component->dev, "Invalid PLL config\n");
return -EINVAL; return -EINVAL;
} }
...@@ -1922,10 +1922,10 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, ...@@ -1922,10 +1922,10 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
pll_frac_bot = (frac_div) & DA7218_BYTE_MASK; pll_frac_bot = (frac_div) & DA7218_BYTE_MASK;
/* Write PLL config & dividers */ /* Write PLL config & dividers */
snd_soc_write(codec, DA7218_PLL_FRAC_TOP, pll_frac_top); snd_soc_component_write(component, DA7218_PLL_FRAC_TOP, pll_frac_top);
snd_soc_write(codec, DA7218_PLL_FRAC_BOT, pll_frac_bot); snd_soc_component_write(component, DA7218_PLL_FRAC_BOT, pll_frac_bot);
snd_soc_write(codec, DA7218_PLL_INTEGER, pll_integer); snd_soc_component_write(component, DA7218_PLL_INTEGER, pll_integer);
snd_soc_update_bits(codec, DA7218_PLL_CTRL, snd_soc_component_update_bits(component, DA7218_PLL_CTRL,
DA7218_PLL_MODE_MASK | DA7218_PLL_INDIV_MASK, DA7218_PLL_MODE_MASK | DA7218_PLL_INDIV_MASK,
pll_ctrl); pll_ctrl);
...@@ -1934,8 +1934,8 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, ...@@ -1934,8 +1934,8 @@ static int da7218_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
static int da7218_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) static int da7218_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
u8 dai_clk_mode = 0, dai_ctrl = 0; u8 dai_clk_mode = 0, dai_ctrl = 0;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
...@@ -2012,8 +2012,8 @@ static int da7218_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -2012,8 +2012,8 @@ static int da7218_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
/* By default 64 BCLKs per WCLK is supported */ /* By default 64 BCLKs per WCLK is supported */
dai_clk_mode |= DA7218_DAI_BCLKS_PER_WCLK_64; dai_clk_mode |= DA7218_DAI_BCLKS_PER_WCLK_64;
snd_soc_write(codec, DA7218_DAI_CLK_MODE, dai_clk_mode); snd_soc_component_write(component, DA7218_DAI_CLK_MODE, dai_clk_mode);
snd_soc_update_bits(codec, DA7218_DAI_CTRL, DA7218_DAI_FORMAT_MASK, snd_soc_component_update_bits(component, DA7218_DAI_CTRL, DA7218_DAI_FORMAT_MASK,
dai_ctrl); dai_ctrl);
return 0; return 0;
...@@ -2023,16 +2023,16 @@ static int da7218_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2023,16 +2023,16 @@ static int da7218_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;
u8 dai_bclks_per_wclk; u8 dai_bclks_per_wclk;
u32 frame_size; u32 frame_size;
/* No channels enabled so disable TDM, revert to 64-bit frames */ /* No channels enabled so disable TDM, revert to 64-bit frames */
if (!tx_mask) { if (!tx_mask) {
snd_soc_update_bits(codec, DA7218_DAI_TDM_CTRL, snd_soc_component_update_bits(component, DA7218_DAI_TDM_CTRL,
DA7218_DAI_TDM_CH_EN_MASK | DA7218_DAI_TDM_CH_EN_MASK |
DA7218_DAI_TDM_MODE_EN_MASK, 0); DA7218_DAI_TDM_MODE_EN_MASK, 0);
snd_soc_update_bits(codec, DA7218_DAI_CLK_MODE, snd_soc_component_update_bits(component, DA7218_DAI_CLK_MODE,
DA7218_DAI_BCLKS_PER_WCLK_MASK, DA7218_DAI_BCLKS_PER_WCLK_MASK,
DA7218_DAI_BCLKS_PER_WCLK_64); DA7218_DAI_BCLKS_PER_WCLK_64);
return 0; return 0;
...@@ -2040,14 +2040,14 @@ static int da7218_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2040,14 +2040,14 @@ static int da7218_set_dai_tdm_slot(struct snd_soc_dai *dai,
/* Check we have valid slots */ /* Check we have valid slots */
if (fls(tx_mask) > DA7218_DAI_TDM_MAX_SLOTS) { if (fls(tx_mask) > DA7218_DAI_TDM_MAX_SLOTS) {
dev_err(codec->dev, "Invalid number of slots, max = %d\n", dev_err(component->dev, "Invalid number of slots, max = %d\n",
DA7218_DAI_TDM_MAX_SLOTS); DA7218_DAI_TDM_MAX_SLOTS);
return -EINVAL; return -EINVAL;
} }
/* Check we have a valid offset given (first 2 bytes of rx_mask) */ /* Check we have a valid offset given (first 2 bytes of rx_mask) */
if (rx_mask >> DA7218_2BYTE_SHIFT) { if (rx_mask >> DA7218_2BYTE_SHIFT) {
dev_err(codec->dev, "Invalid slot offset, max = %d\n", dev_err(component->dev, "Invalid slot offset, max = %d\n",
DA7218_2BYTE_MASK); DA7218_2BYTE_MASK);
return -EINVAL; return -EINVAL;
} }
...@@ -2068,18 +2068,18 @@ static int da7218_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -2068,18 +2068,18 @@ static int da7218_set_dai_tdm_slot(struct snd_soc_dai *dai,
dai_bclks_per_wclk = DA7218_DAI_BCLKS_PER_WCLK_256; dai_bclks_per_wclk = DA7218_DAI_BCLKS_PER_WCLK_256;
break; break;
default: default:
dev_err(codec->dev, "Invalid frame size\n"); dev_err(component->dev, "Invalid frame size\n");
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, DA7218_DAI_CLK_MODE, snd_soc_component_update_bits(component, DA7218_DAI_CLK_MODE,
DA7218_DAI_BCLKS_PER_WCLK_MASK, DA7218_DAI_BCLKS_PER_WCLK_MASK,
dai_bclks_per_wclk); dai_bclks_per_wclk);
snd_soc_write(codec, DA7218_DAI_OFFSET_LOWER, snd_soc_component_write(component, DA7218_DAI_OFFSET_LOWER,
(rx_mask & DA7218_BYTE_MASK)); (rx_mask & DA7218_BYTE_MASK));
snd_soc_write(codec, DA7218_DAI_OFFSET_UPPER, snd_soc_component_write(component, DA7218_DAI_OFFSET_UPPER,
((rx_mask >> DA7218_BYTE_SHIFT) & DA7218_BYTE_MASK)); ((rx_mask >> DA7218_BYTE_SHIFT) & DA7218_BYTE_MASK));
snd_soc_update_bits(codec, DA7218_DAI_TDM_CTRL, snd_soc_component_update_bits(component, DA7218_DAI_TDM_CTRL,
DA7218_DAI_TDM_CH_EN_MASK | DA7218_DAI_TDM_CH_EN_MASK |
DA7218_DAI_TDM_MODE_EN_MASK, DA7218_DAI_TDM_MODE_EN_MASK,
(tx_mask << DA7218_DAI_TDM_CH_EN_SHIFT) | (tx_mask << DA7218_DAI_TDM_CH_EN_SHIFT) |
...@@ -2092,7 +2092,7 @@ static int da7218_hw_params(struct snd_pcm_substream *substream, ...@@ -2092,7 +2092,7 @@ static int da7218_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_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u8 dai_ctrl = 0, fs; u8 dai_ctrl = 0, fs;
unsigned int channels; unsigned int channels;
...@@ -2115,7 +2115,7 @@ static int da7218_hw_params(struct snd_pcm_substream *substream, ...@@ -2115,7 +2115,7 @@ static int da7218_hw_params(struct snd_pcm_substream *substream,
channels = params_channels(params); channels = params_channels(params);
if ((channels < 1) || (channels > DA7218_DAI_CH_NUM_MAX)) { if ((channels < 1) || (channels > DA7218_DAI_CH_NUM_MAX)) {
dev_err(codec->dev, dev_err(component->dev,
"Invalid number of channels, only 1 to %d supported\n", "Invalid number of channels, only 1 to %d supported\n",
DA7218_DAI_CH_NUM_MAX); DA7218_DAI_CH_NUM_MAX);
return -EINVAL; return -EINVAL;
...@@ -2160,11 +2160,11 @@ static int da7218_hw_params(struct snd_pcm_substream *substream, ...@@ -2160,11 +2160,11 @@ static int da7218_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, DA7218_DAI_CTRL, snd_soc_component_update_bits(component, DA7218_DAI_CTRL,
DA7218_DAI_WORD_LENGTH_MASK | DA7218_DAI_CH_NUM_MASK, DA7218_DAI_WORD_LENGTH_MASK | DA7218_DAI_CH_NUM_MASK,
dai_ctrl); dai_ctrl);
/* SRs tied for ADCs and DACs. */ /* SRs tied for ADCs and DACs. */
snd_soc_write(codec, DA7218_SR, snd_soc_component_write(component, DA7218_SR,
(fs << DA7218_SR_DAC_SHIFT) | (fs << DA7218_SR_ADC_SHIFT)); (fs << DA7218_SR_DAC_SHIFT) | (fs << DA7218_SR_ADC_SHIFT));
return 0; return 0;
...@@ -2208,15 +2208,15 @@ static struct snd_soc_dai_driver da7218_dai = { ...@@ -2208,15 +2208,15 @@ static struct snd_soc_dai_driver da7218_dai = {
* HP Detect * HP Detect
*/ */
int da7218_hpldet(struct snd_soc_codec *codec, struct snd_soc_jack *jack) int da7218_hpldet(struct snd_soc_component *component, struct snd_soc_jack *jack)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
if (da7218->dev_id == DA7217_DEV_ID) if (da7218->dev_id == DA7217_DEV_ID)
return -EINVAL; return -EINVAL;
da7218->jack = jack; da7218->jack = jack;
snd_soc_update_bits(codec, DA7218_HPLDET_JACK, snd_soc_component_update_bits(component, DA7218_HPLDET_JACK,
DA7218_HPLDET_JACK_EN_MASK, DA7218_HPLDET_JACK_EN_MASK,
jack ? DA7218_HPLDET_JACK_EN_MASK : 0); jack ? DA7218_HPLDET_JACK_EN_MASK : 0);
...@@ -2224,23 +2224,23 @@ int da7218_hpldet(struct snd_soc_codec *codec, struct snd_soc_jack *jack) ...@@ -2224,23 +2224,23 @@ int da7218_hpldet(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
} }
EXPORT_SYMBOL_GPL(da7218_hpldet); EXPORT_SYMBOL_GPL(da7218_hpldet);
static void da7218_micldet_irq(struct snd_soc_codec *codec) static void da7218_micldet_irq(struct snd_soc_component *component)
{ {
char *envp[] = { char *envp[] = {
"EVENT=MIC_LEVEL_DETECT", "EVENT=MIC_LEVEL_DETECT",
NULL, NULL,
}; };
kobject_uevent_env(&codec->dev->kobj, KOBJ_CHANGE, envp); kobject_uevent_env(&component->dev->kobj, KOBJ_CHANGE, envp);
} }
static void da7218_hpldet_irq(struct snd_soc_codec *codec) static void da7218_hpldet_irq(struct snd_soc_component *component)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
u8 jack_status; u8 jack_status;
int report; int report;
jack_status = snd_soc_read(codec, DA7218_EVENT_STATUS); jack_status = snd_soc_component_read32(component, DA7218_EVENT_STATUS);
if (jack_status & DA7218_HPLDET_JACK_STS_MASK) if (jack_status & DA7218_HPLDET_JACK_STS_MASK)
report = SND_JACK_HEADPHONE; report = SND_JACK_HEADPHONE;
...@@ -2256,24 +2256,24 @@ static void da7218_hpldet_irq(struct snd_soc_codec *codec) ...@@ -2256,24 +2256,24 @@ static void da7218_hpldet_irq(struct snd_soc_codec *codec)
static irqreturn_t da7218_irq_thread(int irq, void *data) static irqreturn_t da7218_irq_thread(int irq, void *data)
{ {
struct snd_soc_codec *codec = data; struct snd_soc_component *component = data;
u8 status; u8 status;
/* Read IRQ status reg */ /* Read IRQ status reg */
status = snd_soc_read(codec, DA7218_EVENT); status = snd_soc_component_read32(component, DA7218_EVENT);
if (!status) if (!status)
return IRQ_NONE; return IRQ_NONE;
/* Mic level detect */ /* Mic level detect */
if (status & DA7218_LVL_DET_EVENT_MASK) if (status & DA7218_LVL_DET_EVENT_MASK)
da7218_micldet_irq(codec); da7218_micldet_irq(component);
/* HP detect */ /* HP detect */
if (status & DA7218_HPLDET_JACK_EVENT_MASK) if (status & DA7218_HPLDET_JACK_EVENT_MASK)
da7218_hpldet_irq(codec); da7218_hpldet_irq(component);
/* Clear interrupts */ /* Clear interrupts */
snd_soc_write(codec, DA7218_EVENT, status); snd_soc_component_write(component, DA7218_EVENT, status);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -2300,7 +2300,7 @@ static inline int da7218_of_get_id(struct device *dev) ...@@ -2300,7 +2300,7 @@ static inline int da7218_of_get_id(struct device *dev)
} }
static enum da7218_micbias_voltage static enum da7218_micbias_voltage
da7218_of_micbias_lvl(struct snd_soc_codec *codec, u32 val) da7218_of_micbias_lvl(struct snd_soc_component *component, u32 val)
{ {
switch (val) { switch (val) {
case 1200: case 1200:
...@@ -2322,13 +2322,13 @@ static enum da7218_micbias_voltage ...@@ -2322,13 +2322,13 @@ static enum da7218_micbias_voltage
case 3000: case 3000:
return DA7218_MICBIAS_3_0V; return DA7218_MICBIAS_3_0V;
default: default:
dev_warn(codec->dev, "Invalid micbias level"); dev_warn(component->dev, "Invalid micbias level");
return DA7218_MICBIAS_1_6V; return DA7218_MICBIAS_1_6V;
} }
} }
static enum da7218_mic_amp_in_sel static enum da7218_mic_amp_in_sel
da7218_of_mic_amp_in_sel(struct snd_soc_codec *codec, const char *str) da7218_of_mic_amp_in_sel(struct snd_soc_component *component, const char *str)
{ {
if (!strcmp(str, "diff")) { if (!strcmp(str, "diff")) {
return DA7218_MIC_AMP_IN_SEL_DIFF; return DA7218_MIC_AMP_IN_SEL_DIFF;
...@@ -2337,39 +2337,39 @@ static enum da7218_mic_amp_in_sel ...@@ -2337,39 +2337,39 @@ static enum da7218_mic_amp_in_sel
} else if (!strcmp(str, "se_n")) { } else if (!strcmp(str, "se_n")) {
return DA7218_MIC_AMP_IN_SEL_SE_N; return DA7218_MIC_AMP_IN_SEL_SE_N;
} else { } else {
dev_warn(codec->dev, "Invalid mic input type selection"); dev_warn(component->dev, "Invalid mic input type selection");
return DA7218_MIC_AMP_IN_SEL_DIFF; return DA7218_MIC_AMP_IN_SEL_DIFF;
} }
} }
static enum da7218_dmic_data_sel static enum da7218_dmic_data_sel
da7218_of_dmic_data_sel(struct snd_soc_codec *codec, const char *str) da7218_of_dmic_data_sel(struct snd_soc_component *component, const char *str)
{ {
if (!strcmp(str, "lrise_rfall")) { if (!strcmp(str, "lrise_rfall")) {
return DA7218_DMIC_DATA_LRISE_RFALL; return DA7218_DMIC_DATA_LRISE_RFALL;
} else if (!strcmp(str, "lfall_rrise")) { } else if (!strcmp(str, "lfall_rrise")) {
return DA7218_DMIC_DATA_LFALL_RRISE; return DA7218_DMIC_DATA_LFALL_RRISE;
} else { } else {
dev_warn(codec->dev, "Invalid DMIC data type selection"); dev_warn(component->dev, "Invalid DMIC data type selection");
return DA7218_DMIC_DATA_LRISE_RFALL; return DA7218_DMIC_DATA_LRISE_RFALL;
} }
} }
static enum da7218_dmic_samplephase static enum da7218_dmic_samplephase
da7218_of_dmic_samplephase(struct snd_soc_codec *codec, const char *str) da7218_of_dmic_samplephase(struct snd_soc_component *component, const char *str)
{ {
if (!strcmp(str, "on_clkedge")) { if (!strcmp(str, "on_clkedge")) {
return DA7218_DMIC_SAMPLE_ON_CLKEDGE; return DA7218_DMIC_SAMPLE_ON_CLKEDGE;
} else if (!strcmp(str, "between_clkedge")) { } else if (!strcmp(str, "between_clkedge")) {
return DA7218_DMIC_SAMPLE_BETWEEN_CLKEDGE; return DA7218_DMIC_SAMPLE_BETWEEN_CLKEDGE;
} else { } else {
dev_warn(codec->dev, "Invalid DMIC sample phase"); dev_warn(component->dev, "Invalid DMIC sample phase");
return DA7218_DMIC_SAMPLE_ON_CLKEDGE; return DA7218_DMIC_SAMPLE_ON_CLKEDGE;
} }
} }
static enum da7218_dmic_clk_rate static enum da7218_dmic_clk_rate
da7218_of_dmic_clkrate(struct snd_soc_codec *codec, u32 val) da7218_of_dmic_clkrate(struct snd_soc_component *component, u32 val)
{ {
switch (val) { switch (val) {
case 1500000: case 1500000:
...@@ -2377,13 +2377,13 @@ static enum da7218_dmic_clk_rate ...@@ -2377,13 +2377,13 @@ static enum da7218_dmic_clk_rate
case 3000000: case 3000000:
return DA7218_DMIC_CLK_3_0MHZ; return DA7218_DMIC_CLK_3_0MHZ;
default: default:
dev_warn(codec->dev, "Invalid DMIC clock rate"); dev_warn(component->dev, "Invalid DMIC clock rate");
return DA7218_DMIC_CLK_3_0MHZ; return DA7218_DMIC_CLK_3_0MHZ;
} }
} }
static enum da7218_hpldet_jack_rate static enum da7218_hpldet_jack_rate
da7218_of_jack_rate(struct snd_soc_codec *codec, u32 val) da7218_of_jack_rate(struct snd_soc_component *component, u32 val)
{ {
switch (val) { switch (val) {
case 5: case 5:
...@@ -2403,13 +2403,13 @@ static enum da7218_hpldet_jack_rate ...@@ -2403,13 +2403,13 @@ static enum da7218_hpldet_jack_rate
case 640: case 640:
return DA7218_HPLDET_JACK_RATE_640US; return DA7218_HPLDET_JACK_RATE_640US;
default: default:
dev_warn(codec->dev, "Invalid jack detect rate"); dev_warn(component->dev, "Invalid jack detect rate");
return DA7218_HPLDET_JACK_RATE_40US; return DA7218_HPLDET_JACK_RATE_40US;
} }
} }
static enum da7218_hpldet_jack_debounce static enum da7218_hpldet_jack_debounce
da7218_of_jack_debounce(struct snd_soc_codec *codec, u32 val) da7218_of_jack_debounce(struct snd_soc_component *component, u32 val)
{ {
switch (val) { switch (val) {
case 0: case 0:
...@@ -2421,13 +2421,13 @@ static enum da7218_hpldet_jack_debounce ...@@ -2421,13 +2421,13 @@ static enum da7218_hpldet_jack_debounce
case 4: case 4:
return DA7218_HPLDET_JACK_DEBOUNCE_4; return DA7218_HPLDET_JACK_DEBOUNCE_4;
default: default:
dev_warn(codec->dev, "Invalid jack debounce"); dev_warn(component->dev, "Invalid jack debounce");
return DA7218_HPLDET_JACK_DEBOUNCE_2; return DA7218_HPLDET_JACK_DEBOUNCE_2;
} }
} }
static enum da7218_hpldet_jack_thr static enum da7218_hpldet_jack_thr
da7218_of_jack_thr(struct snd_soc_codec *codec, u32 val) da7218_of_jack_thr(struct snd_soc_component *component, u32 val)
{ {
switch (val) { switch (val) {
case 84: case 84:
...@@ -2439,76 +2439,76 @@ static enum da7218_hpldet_jack_thr ...@@ -2439,76 +2439,76 @@ static enum da7218_hpldet_jack_thr
case 96: case 96:
return DA7218_HPLDET_JACK_THR_96PCT; return DA7218_HPLDET_JACK_THR_96PCT;
default: default:
dev_warn(codec->dev, "Invalid jack threshold level"); dev_warn(component->dev, "Invalid jack threshold level");
return DA7218_HPLDET_JACK_THR_84PCT; return DA7218_HPLDET_JACK_THR_84PCT;
} }
} }
static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_component *component)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct device_node *np = codec->dev->of_node; struct device_node *np = component->dev->of_node;
struct device_node *hpldet_np; struct device_node *hpldet_np;
struct da7218_pdata *pdata; struct da7218_pdata *pdata;
struct da7218_hpldet_pdata *hpldet_pdata; struct da7218_hpldet_pdata *hpldet_pdata;
const char *of_str; const char *of_str;
u32 of_val32; u32 of_val32;
pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(component->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) if (!pdata)
return NULL; return NULL;
if (of_property_read_u32(np, "dlg,micbias1-lvl-millivolt", &of_val32) >= 0) if (of_property_read_u32(np, "dlg,micbias1-lvl-millivolt", &of_val32) >= 0)
pdata->micbias1_lvl = da7218_of_micbias_lvl(codec, of_val32); pdata->micbias1_lvl = da7218_of_micbias_lvl(component, of_val32);
else else
pdata->micbias1_lvl = DA7218_MICBIAS_1_6V; pdata->micbias1_lvl = DA7218_MICBIAS_1_6V;
if (of_property_read_u32(np, "dlg,micbias2-lvl-millivolt", &of_val32) >= 0) if (of_property_read_u32(np, "dlg,micbias2-lvl-millivolt", &of_val32) >= 0)
pdata->micbias2_lvl = da7218_of_micbias_lvl(codec, of_val32); pdata->micbias2_lvl = da7218_of_micbias_lvl(component, of_val32);
else else
pdata->micbias2_lvl = DA7218_MICBIAS_1_6V; pdata->micbias2_lvl = DA7218_MICBIAS_1_6V;
if (!of_property_read_string(np, "dlg,mic1-amp-in-sel", &of_str)) if (!of_property_read_string(np, "dlg,mic1-amp-in-sel", &of_str))
pdata->mic1_amp_in_sel = pdata->mic1_amp_in_sel =
da7218_of_mic_amp_in_sel(codec, of_str); da7218_of_mic_amp_in_sel(component, of_str);
else else
pdata->mic1_amp_in_sel = DA7218_MIC_AMP_IN_SEL_DIFF; pdata->mic1_amp_in_sel = DA7218_MIC_AMP_IN_SEL_DIFF;
if (!of_property_read_string(np, "dlg,mic2-amp-in-sel", &of_str)) if (!of_property_read_string(np, "dlg,mic2-amp-in-sel", &of_str))
pdata->mic2_amp_in_sel = pdata->mic2_amp_in_sel =
da7218_of_mic_amp_in_sel(codec, of_str); da7218_of_mic_amp_in_sel(component, of_str);
else else
pdata->mic2_amp_in_sel = DA7218_MIC_AMP_IN_SEL_DIFF; pdata->mic2_amp_in_sel = DA7218_MIC_AMP_IN_SEL_DIFF;
if (!of_property_read_string(np, "dlg,dmic1-data-sel", &of_str)) if (!of_property_read_string(np, "dlg,dmic1-data-sel", &of_str))
pdata->dmic1_data_sel = da7218_of_dmic_data_sel(codec, of_str); pdata->dmic1_data_sel = da7218_of_dmic_data_sel(component, of_str);
else else
pdata->dmic1_data_sel = DA7218_DMIC_DATA_LRISE_RFALL; pdata->dmic1_data_sel = DA7218_DMIC_DATA_LRISE_RFALL;
if (!of_property_read_string(np, "dlg,dmic1-samplephase", &of_str)) if (!of_property_read_string(np, "dlg,dmic1-samplephase", &of_str))
pdata->dmic1_samplephase = pdata->dmic1_samplephase =
da7218_of_dmic_samplephase(codec, of_str); da7218_of_dmic_samplephase(component, of_str);
else else
pdata->dmic1_samplephase = DA7218_DMIC_SAMPLE_ON_CLKEDGE; pdata->dmic1_samplephase = DA7218_DMIC_SAMPLE_ON_CLKEDGE;
if (of_property_read_u32(np, "dlg,dmic1-clkrate-hz", &of_val32) >= 0) if (of_property_read_u32(np, "dlg,dmic1-clkrate-hz", &of_val32) >= 0)
pdata->dmic1_clk_rate = da7218_of_dmic_clkrate(codec, of_val32); pdata->dmic1_clk_rate = da7218_of_dmic_clkrate(component, of_val32);
else else
pdata->dmic1_clk_rate = DA7218_DMIC_CLK_3_0MHZ; pdata->dmic1_clk_rate = DA7218_DMIC_CLK_3_0MHZ;
if (!of_property_read_string(np, "dlg,dmic2-data-sel", &of_str)) if (!of_property_read_string(np, "dlg,dmic2-data-sel", &of_str))
pdata->dmic2_data_sel = da7218_of_dmic_data_sel(codec, of_str); pdata->dmic2_data_sel = da7218_of_dmic_data_sel(component, of_str);
else else
pdata->dmic2_data_sel = DA7218_DMIC_DATA_LRISE_RFALL; pdata->dmic2_data_sel = DA7218_DMIC_DATA_LRISE_RFALL;
if (!of_property_read_string(np, "dlg,dmic2-samplephase", &of_str)) if (!of_property_read_string(np, "dlg,dmic2-samplephase", &of_str))
pdata->dmic2_samplephase = pdata->dmic2_samplephase =
da7218_of_dmic_samplephase(codec, of_str); da7218_of_dmic_samplephase(component, of_str);
else else
pdata->dmic2_samplephase = DA7218_DMIC_SAMPLE_ON_CLKEDGE; pdata->dmic2_samplephase = DA7218_DMIC_SAMPLE_ON_CLKEDGE;
if (of_property_read_u32(np, "dlg,dmic2-clkrate-hz", &of_val32) >= 0) if (of_property_read_u32(np, "dlg,dmic2-clkrate-hz", &of_val32) >= 0)
pdata->dmic2_clk_rate = da7218_of_dmic_clkrate(codec, of_val32); pdata->dmic2_clk_rate = da7218_of_dmic_clkrate(component, of_val32);
else else
pdata->dmic2_clk_rate = DA7218_DMIC_CLK_3_0MHZ; pdata->dmic2_clk_rate = DA7218_DMIC_CLK_3_0MHZ;
...@@ -2522,7 +2522,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) ...@@ -2522,7 +2522,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec)
if (!hpldet_np) if (!hpldet_np)
return pdata; return pdata;
hpldet_pdata = devm_kzalloc(codec->dev, sizeof(*hpldet_pdata), hpldet_pdata = devm_kzalloc(component->dev, sizeof(*hpldet_pdata),
GFP_KERNEL); GFP_KERNEL);
if (!hpldet_pdata) { if (!hpldet_pdata) {
of_node_put(hpldet_np); of_node_put(hpldet_np);
...@@ -2533,14 +2533,14 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) ...@@ -2533,14 +2533,14 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec)
if (of_property_read_u32(hpldet_np, "dlg,jack-rate-us", if (of_property_read_u32(hpldet_np, "dlg,jack-rate-us",
&of_val32) >= 0) &of_val32) >= 0)
hpldet_pdata->jack_rate = hpldet_pdata->jack_rate =
da7218_of_jack_rate(codec, of_val32); da7218_of_jack_rate(component, of_val32);
else else
hpldet_pdata->jack_rate = DA7218_HPLDET_JACK_RATE_40US; hpldet_pdata->jack_rate = DA7218_HPLDET_JACK_RATE_40US;
if (of_property_read_u32(hpldet_np, "dlg,jack-debounce", if (of_property_read_u32(hpldet_np, "dlg,jack-debounce",
&of_val32) >= 0) &of_val32) >= 0)
hpldet_pdata->jack_debounce = hpldet_pdata->jack_debounce =
da7218_of_jack_debounce(codec, of_val32); da7218_of_jack_debounce(component, of_val32);
else else
hpldet_pdata->jack_debounce = hpldet_pdata->jack_debounce =
DA7218_HPLDET_JACK_DEBOUNCE_2; DA7218_HPLDET_JACK_DEBOUNCE_2;
...@@ -2548,7 +2548,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) ...@@ -2548,7 +2548,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec)
if (of_property_read_u32(hpldet_np, "dlg,jack-threshold-pct", if (of_property_read_u32(hpldet_np, "dlg,jack-threshold-pct",
&of_val32) >= 0) &of_val32) >= 0)
hpldet_pdata->jack_thr = hpldet_pdata->jack_thr =
da7218_of_jack_thr(codec, of_val32); da7218_of_jack_thr(component, of_val32);
else else
hpldet_pdata->jack_thr = DA7218_HPLDET_JACK_THR_84PCT; hpldet_pdata->jack_thr = DA7218_HPLDET_JACK_THR_84PCT;
...@@ -2572,10 +2572,10 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) ...@@ -2572,10 +2572,10 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec)
* Codec driver functions * Codec driver functions
*/ */
static int da7218_set_bias_level(struct snd_soc_codec *codec, static int da7218_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
int ret; int ret;
switch (level) { switch (level) {
...@@ -2583,11 +2583,11 @@ static int da7218_set_bias_level(struct snd_soc_codec *codec, ...@@ -2583,11 +2583,11 @@ static int da7218_set_bias_level(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
/* Enable MCLK for transition to ON state */ /* Enable MCLK for transition to ON state */
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_STANDBY) { if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) {
if (da7218->mclk) { if (da7218->mclk) {
ret = clk_prepare_enable(da7218->mclk); ret = clk_prepare_enable(da7218->mclk);
if (ret) { if (ret) {
dev_err(codec->dev, "Failed to enable mclk\n"); dev_err(component->dev, "Failed to enable mclk\n");
return ret; return ret;
} }
} }
...@@ -2595,14 +2595,14 @@ static int da7218_set_bias_level(struct snd_soc_codec *codec, ...@@ -2595,14 +2595,14 @@ static int da7218_set_bias_level(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
/* Master bias */ /* Master bias */
snd_soc_update_bits(codec, DA7218_REFERENCES, snd_soc_component_update_bits(component, DA7218_REFERENCES,
DA7218_BIAS_EN_MASK, DA7218_BIAS_EN_MASK,
DA7218_BIAS_EN_MASK); DA7218_BIAS_EN_MASK);
/* Internal LDO */ /* Internal LDO */
snd_soc_update_bits(codec, DA7218_LDO_CTRL, snd_soc_component_update_bits(component, DA7218_LDO_CTRL,
DA7218_LDO_EN_MASK, DA7218_LDO_EN_MASK,
DA7218_LDO_EN_MASK); DA7218_LDO_EN_MASK);
} else { } else {
...@@ -2615,11 +2615,11 @@ static int da7218_set_bias_level(struct snd_soc_codec *codec, ...@@ -2615,11 +2615,11 @@ static int da7218_set_bias_level(struct snd_soc_codec *codec,
/* Only disable if jack detection disabled */ /* Only disable if jack detection disabled */
if (!da7218->jack) { if (!da7218->jack) {
/* Internal LDO */ /* Internal LDO */
snd_soc_update_bits(codec, DA7218_LDO_CTRL, snd_soc_component_update_bits(component, DA7218_LDO_CTRL,
DA7218_LDO_EN_MASK, 0); DA7218_LDO_EN_MASK, 0);
/* Master bias */ /* Master bias */
snd_soc_update_bits(codec, DA7218_REFERENCES, snd_soc_component_update_bits(component, DA7218_REFERENCES,
DA7218_BIAS_EN_MASK, 0); DA7218_BIAS_EN_MASK, 0);
} }
break; break;
...@@ -2634,9 +2634,9 @@ static const char *da7218_supply_names[DA7218_NUM_SUPPLIES] = { ...@@ -2634,9 +2634,9 @@ static const char *da7218_supply_names[DA7218_NUM_SUPPLIES] = {
[DA7218_SUPPLY_VDDIO] = "VDDIO", [DA7218_SUPPLY_VDDIO] = "VDDIO",
}; };
static int da7218_handle_supplies(struct snd_soc_codec *codec) static int da7218_handle_supplies(struct snd_soc_component *component)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct regulator *vddio; struct regulator *vddio;
u8 io_voltage_lvl = DA7218_IO_VOLTAGE_LEVEL_2_5V_3_6V; u8 io_voltage_lvl = DA7218_IO_VOLTAGE_LEVEL_2_5V_3_6V;
int i, ret; int i, ret;
...@@ -2645,10 +2645,10 @@ static int da7218_handle_supplies(struct snd_soc_codec *codec) ...@@ -2645,10 +2645,10 @@ static int da7218_handle_supplies(struct snd_soc_codec *codec)
for (i = 0; i < DA7218_NUM_SUPPLIES; ++i) for (i = 0; i < DA7218_NUM_SUPPLIES; ++i)
da7218->supplies[i].supply = da7218_supply_names[i]; da7218->supplies[i].supply = da7218_supply_names[i];
ret = devm_regulator_bulk_get(codec->dev, DA7218_NUM_SUPPLIES, ret = devm_regulator_bulk_get(component->dev, DA7218_NUM_SUPPLIES,
da7218->supplies); da7218->supplies);
if (ret) { if (ret) {
dev_err(codec->dev, "Failed to get supplies\n"); dev_err(component->dev, "Failed to get supplies\n");
return ret; return ret;
} }
...@@ -2656,29 +2656,29 @@ static int da7218_handle_supplies(struct snd_soc_codec *codec) ...@@ -2656,29 +2656,29 @@ static int da7218_handle_supplies(struct snd_soc_codec *codec)
vddio = da7218->supplies[DA7218_SUPPLY_VDDIO].consumer; vddio = da7218->supplies[DA7218_SUPPLY_VDDIO].consumer;
ret = regulator_get_voltage(vddio); ret = regulator_get_voltage(vddio);
if (ret < 1500000) if (ret < 1500000)
dev_warn(codec->dev, "Invalid VDDIO voltage\n"); dev_warn(component->dev, "Invalid VDDIO voltage\n");
else if (ret < 2500000) else if (ret < 2500000)
io_voltage_lvl = DA7218_IO_VOLTAGE_LEVEL_1_5V_2_5V; io_voltage_lvl = DA7218_IO_VOLTAGE_LEVEL_1_5V_2_5V;
/* Enable main supplies */ /* Enable main supplies */
ret = regulator_bulk_enable(DA7218_NUM_SUPPLIES, da7218->supplies); ret = regulator_bulk_enable(DA7218_NUM_SUPPLIES, da7218->supplies);
if (ret) { if (ret) {
dev_err(codec->dev, "Failed to enable supplies\n"); dev_err(component->dev, "Failed to enable supplies\n");
return ret; return ret;
} }
/* Ensure device in active mode */ /* Ensure device in active mode */
snd_soc_write(codec, DA7218_SYSTEM_ACTIVE, DA7218_SYSTEM_ACTIVE_MASK); snd_soc_component_write(component, DA7218_SYSTEM_ACTIVE, DA7218_SYSTEM_ACTIVE_MASK);
/* Update IO voltage level range */ /* Update IO voltage level range */
snd_soc_write(codec, DA7218_IO_CTRL, io_voltage_lvl); snd_soc_component_write(component, DA7218_IO_CTRL, io_voltage_lvl);
return 0; return 0;
} }
static void da7218_handle_pdata(struct snd_soc_codec *codec) static void da7218_handle_pdata(struct snd_soc_component *component)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
struct da7218_pdata *pdata = da7218->pdata; struct da7218_pdata *pdata = da7218->pdata;
if (pdata) { if (pdata) {
...@@ -2719,14 +2719,14 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) ...@@ -2719,14 +2719,14 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec)
break; break;
} }
snd_soc_write(codec, DA7218_MICBIAS_CTRL, micbias_lvl); snd_soc_component_write(component, DA7218_MICBIAS_CTRL, micbias_lvl);
/* Mic */ /* Mic */
switch (pdata->mic1_amp_in_sel) { switch (pdata->mic1_amp_in_sel) {
case DA7218_MIC_AMP_IN_SEL_DIFF: case DA7218_MIC_AMP_IN_SEL_DIFF:
case DA7218_MIC_AMP_IN_SEL_SE_P: case DA7218_MIC_AMP_IN_SEL_SE_P:
case DA7218_MIC_AMP_IN_SEL_SE_N: case DA7218_MIC_AMP_IN_SEL_SE_N:
snd_soc_write(codec, DA7218_MIC_1_SELECT, snd_soc_component_write(component, DA7218_MIC_1_SELECT,
pdata->mic1_amp_in_sel); pdata->mic1_amp_in_sel);
break; break;
} }
...@@ -2735,7 +2735,7 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) ...@@ -2735,7 +2735,7 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec)
case DA7218_MIC_AMP_IN_SEL_DIFF: case DA7218_MIC_AMP_IN_SEL_DIFF:
case DA7218_MIC_AMP_IN_SEL_SE_P: case DA7218_MIC_AMP_IN_SEL_SE_P:
case DA7218_MIC_AMP_IN_SEL_SE_N: case DA7218_MIC_AMP_IN_SEL_SE_N:
snd_soc_write(codec, DA7218_MIC_2_SELECT, snd_soc_component_write(component, DA7218_MIC_2_SELECT,
pdata->mic2_amp_in_sel); pdata->mic2_amp_in_sel);
break; break;
} }
...@@ -2765,7 +2765,7 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) ...@@ -2765,7 +2765,7 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec)
break; break;
} }
snd_soc_update_bits(codec, DA7218_DMIC_1_CTRL, snd_soc_component_update_bits(component, DA7218_DMIC_1_CTRL,
DA7218_DMIC_1_DATA_SEL_MASK | DA7218_DMIC_1_DATA_SEL_MASK |
DA7218_DMIC_1_SAMPLEPHASE_MASK | DA7218_DMIC_1_SAMPLEPHASE_MASK |
DA7218_DMIC_1_CLK_RATE_MASK, dmic_cfg); DA7218_DMIC_1_CLK_RATE_MASK, dmic_cfg);
...@@ -2795,7 +2795,7 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) ...@@ -2795,7 +2795,7 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec)
break; break;
} }
snd_soc_update_bits(codec, DA7218_DMIC_2_CTRL, snd_soc_component_update_bits(component, DA7218_DMIC_2_CTRL,
DA7218_DMIC_2_DATA_SEL_MASK | DA7218_DMIC_2_DATA_SEL_MASK |
DA7218_DMIC_2_SAMPLEPHASE_MASK | DA7218_DMIC_2_SAMPLEPHASE_MASK |
DA7218_DMIC_2_CLK_RATE_MASK, dmic_cfg); DA7218_DMIC_2_CLK_RATE_MASK, dmic_cfg);
...@@ -2806,9 +2806,9 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) ...@@ -2806,9 +2806,9 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec)
pdata->hp_diff_single_supply; pdata->hp_diff_single_supply;
if (da7218->hp_single_supply) { if (da7218->hp_single_supply) {
snd_soc_write(codec, DA7218_HP_DIFF_UNLOCK, snd_soc_component_write(component, DA7218_HP_DIFF_UNLOCK,
DA7218_HP_DIFF_UNLOCK_VAL); DA7218_HP_DIFF_UNLOCK_VAL);
snd_soc_update_bits(codec, DA7218_HP_DIFF_CTRL, snd_soc_component_update_bits(component, DA7218_HP_DIFF_CTRL,
DA7218_HP_AMP_SINGLE_SUPPLY_EN_MASK, DA7218_HP_AMP_SINGLE_SUPPLY_EN_MASK,
DA7218_HP_AMP_SINGLE_SUPPLY_EN_MASK); DA7218_HP_AMP_SINGLE_SUPPLY_EN_MASK);
} }
...@@ -2857,7 +2857,7 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) ...@@ -2857,7 +2857,7 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec)
DA7218_HPLDET_JACK_THR_SHIFT); DA7218_HPLDET_JACK_THR_SHIFT);
break; break;
} }
snd_soc_update_bits(codec, DA7218_HPLDET_JACK, snd_soc_component_update_bits(component, DA7218_HPLDET_JACK,
DA7218_HPLDET_JACK_RATE_MASK | DA7218_HPLDET_JACK_RATE_MASK |
DA7218_HPLDET_JACK_DEBOUNCE_MASK | DA7218_HPLDET_JACK_DEBOUNCE_MASK |
DA7218_HPLDET_JACK_THR_MASK, DA7218_HPLDET_JACK_THR_MASK,
...@@ -2873,31 +2873,31 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) ...@@ -2873,31 +2873,31 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec)
if (hpldet_pdata->discharge) if (hpldet_pdata->discharge)
hpldet_cfg |= DA7218_HPLDET_DISCHARGE_EN_MASK; hpldet_cfg |= DA7218_HPLDET_DISCHARGE_EN_MASK;
snd_soc_write(codec, DA7218_HPLDET_CTRL, hpldet_cfg); snd_soc_component_write(component, DA7218_HPLDET_CTRL, hpldet_cfg);
} }
} }
} }
static int da7218_probe(struct snd_soc_codec *codec) static int da7218_probe(struct snd_soc_component *component)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
int ret; int ret;
/* Regulator configuration */ /* Regulator configuration */
ret = da7218_handle_supplies(codec); ret = da7218_handle_supplies(component);
if (ret) if (ret)
return ret; return ret;
/* Handle DT/Platform data */ /* Handle DT/Platform data */
if (codec->dev->of_node) if (component->dev->of_node)
da7218->pdata = da7218_of_to_pdata(codec); da7218->pdata = da7218_of_to_pdata(component);
else else
da7218->pdata = dev_get_platdata(codec->dev); da7218->pdata = dev_get_platdata(component->dev);
da7218_handle_pdata(codec); da7218_handle_pdata(component);
/* Check if MCLK provided, if not the clock is NULL */ /* Check if MCLK provided, if not the clock is NULL */
da7218->mclk = devm_clk_get(codec->dev, "mclk"); da7218->mclk = devm_clk_get(component->dev, "mclk");
if (IS_ERR(da7218->mclk)) { if (IS_ERR(da7218->mclk)) {
if (PTR_ERR(da7218->mclk) != -ENOENT) { if (PTR_ERR(da7218->mclk) != -ENOENT) {
ret = PTR_ERR(da7218->mclk); ret = PTR_ERR(da7218->mclk);
...@@ -2908,74 +2908,74 @@ static int da7218_probe(struct snd_soc_codec *codec) ...@@ -2908,74 +2908,74 @@ static int da7218_probe(struct snd_soc_codec *codec)
} }
/* Default PC to free-running */ /* Default PC to free-running */
snd_soc_write(codec, DA7218_PC_COUNT, DA7218_PC_FREERUN_MASK); snd_soc_component_write(component, DA7218_PC_COUNT, DA7218_PC_FREERUN_MASK);
/* /*
* Default Output Filter mixers to off otherwise DAPM will power * Default Output Filter mixers to off otherwise DAPM will power
* Mic to HP passthrough paths by default at startup. * Mic to HP passthrough paths by default at startup.
*/ */
snd_soc_write(codec, DA7218_DROUTING_OUTFILT_1L, 0); snd_soc_component_write(component, DA7218_DROUTING_OUTFILT_1L, 0);
snd_soc_write(codec, DA7218_DROUTING_OUTFILT_1R, 0); snd_soc_component_write(component, DA7218_DROUTING_OUTFILT_1R, 0);
/* Default CP to normal load, power mode */ /* Default CP to normal load, power mode */
snd_soc_update_bits(codec, DA7218_CP_CTRL, snd_soc_component_update_bits(component, DA7218_CP_CTRL,
DA7218_CP_SMALL_SWITCH_FREQ_EN_MASK, 0); DA7218_CP_SMALL_SWITCH_FREQ_EN_MASK, 0);
/* Default gain ramping */ /* Default gain ramping */
snd_soc_update_bits(codec, DA7218_MIXIN_1_CTRL, snd_soc_component_update_bits(component, DA7218_MIXIN_1_CTRL,
DA7218_MIXIN_1_AMP_RAMP_EN_MASK, DA7218_MIXIN_1_AMP_RAMP_EN_MASK,
DA7218_MIXIN_1_AMP_RAMP_EN_MASK); DA7218_MIXIN_1_AMP_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_MIXIN_2_CTRL, snd_soc_component_update_bits(component, DA7218_MIXIN_2_CTRL,
DA7218_MIXIN_2_AMP_RAMP_EN_MASK, DA7218_MIXIN_2_AMP_RAMP_EN_MASK,
DA7218_MIXIN_2_AMP_RAMP_EN_MASK); DA7218_MIXIN_2_AMP_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_IN_1L_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_1L_FILTER_CTRL,
DA7218_IN_1L_RAMP_EN_MASK, DA7218_IN_1L_RAMP_EN_MASK,
DA7218_IN_1L_RAMP_EN_MASK); DA7218_IN_1L_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_IN_1R_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_1R_FILTER_CTRL,
DA7218_IN_1R_RAMP_EN_MASK, DA7218_IN_1R_RAMP_EN_MASK,
DA7218_IN_1R_RAMP_EN_MASK); DA7218_IN_1R_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_IN_2L_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_2L_FILTER_CTRL,
DA7218_IN_2L_RAMP_EN_MASK, DA7218_IN_2L_RAMP_EN_MASK,
DA7218_IN_2L_RAMP_EN_MASK); DA7218_IN_2L_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_IN_2R_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_IN_2R_FILTER_CTRL,
DA7218_IN_2R_RAMP_EN_MASK, DA7218_IN_2R_RAMP_EN_MASK,
DA7218_IN_2R_RAMP_EN_MASK); DA7218_IN_2R_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_DGS_GAIN_CTRL, snd_soc_component_update_bits(component, DA7218_DGS_GAIN_CTRL,
DA7218_DGS_RAMP_EN_MASK, DA7218_DGS_RAMP_EN_MASK); DA7218_DGS_RAMP_EN_MASK, DA7218_DGS_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_OUT_1L_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_OUT_1L_FILTER_CTRL,
DA7218_OUT_1L_RAMP_EN_MASK, DA7218_OUT_1L_RAMP_EN_MASK,
DA7218_OUT_1L_RAMP_EN_MASK); DA7218_OUT_1L_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_OUT_1R_FILTER_CTRL, snd_soc_component_update_bits(component, DA7218_OUT_1R_FILTER_CTRL,
DA7218_OUT_1R_RAMP_EN_MASK, DA7218_OUT_1R_RAMP_EN_MASK,
DA7218_OUT_1R_RAMP_EN_MASK); DA7218_OUT_1R_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_HP_L_CTRL, snd_soc_component_update_bits(component, DA7218_HP_L_CTRL,
DA7218_HP_L_AMP_RAMP_EN_MASK, DA7218_HP_L_AMP_RAMP_EN_MASK,
DA7218_HP_L_AMP_RAMP_EN_MASK); DA7218_HP_L_AMP_RAMP_EN_MASK);
snd_soc_update_bits(codec, DA7218_HP_R_CTRL, snd_soc_component_update_bits(component, DA7218_HP_R_CTRL,
DA7218_HP_R_AMP_RAMP_EN_MASK, DA7218_HP_R_AMP_RAMP_EN_MASK,
DA7218_HP_R_AMP_RAMP_EN_MASK); DA7218_HP_R_AMP_RAMP_EN_MASK);
/* Default infinite tone gen, start/stop by Kcontrol */ /* Default infinite tone gen, start/stop by Kcontrol */
snd_soc_write(codec, DA7218_TONE_GEN_CYCLES, DA7218_BEEP_CYCLES_MASK); snd_soc_component_write(component, DA7218_TONE_GEN_CYCLES, DA7218_BEEP_CYCLES_MASK);
/* DA7217 specific config */ /* DA7217 specific config */
if (da7218->dev_id == DA7217_DEV_ID) { if (da7218->dev_id == DA7217_DEV_ID) {
snd_soc_update_bits(codec, DA7218_HP_DIFF_CTRL, snd_soc_component_update_bits(component, DA7218_HP_DIFF_CTRL,
DA7218_HP_AMP_DIFF_MODE_EN_MASK, DA7218_HP_AMP_DIFF_MODE_EN_MASK,
DA7218_HP_AMP_DIFF_MODE_EN_MASK); DA7218_HP_AMP_DIFF_MODE_EN_MASK);
/* Only DA7218 supports HP detect, mask off for DA7217 */ /* Only DA7218 supports HP detect, mask off for DA7217 */
snd_soc_write(codec, DA7218_EVENT_MASK, snd_soc_component_write(component, DA7218_EVENT_MASK,
DA7218_HPLDET_JACK_EVENT_IRQ_MSK_MASK); DA7218_HPLDET_JACK_EVENT_IRQ_MSK_MASK);
} }
if (da7218->irq) { if (da7218->irq) {
ret = devm_request_threaded_irq(codec->dev, da7218->irq, NULL, ret = devm_request_threaded_irq(component->dev, da7218->irq, NULL,
da7218_irq_thread, da7218_irq_thread,
IRQF_TRIGGER_LOW | IRQF_ONESHOT, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
"da7218", codec); "da7218", component);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to request IRQ %d: %d\n", dev_err(component->dev, "Failed to request IRQ %d: %d\n",
da7218->irq, ret); da7218->irq, ret);
goto err_disable_reg; goto err_disable_reg;
} }
...@@ -2990,39 +2990,37 @@ static int da7218_probe(struct snd_soc_codec *codec) ...@@ -2990,39 +2990,37 @@ static int da7218_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
static int da7218_remove(struct snd_soc_codec *codec) static void da7218_remove(struct snd_soc_component *component)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
regulator_bulk_disable(DA7218_NUM_SUPPLIES, da7218->supplies); regulator_bulk_disable(DA7218_NUM_SUPPLIES, da7218->supplies);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int da7218_suspend(struct snd_soc_codec *codec) static int da7218_suspend(struct snd_soc_component *component)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
da7218_set_bias_level(codec, SND_SOC_BIAS_OFF); da7218_set_bias_level(component, SND_SOC_BIAS_OFF);
/* Put device into standby mode if jack detection disabled */ /* Put device into standby mode if jack detection disabled */
if (!da7218->jack) if (!da7218->jack)
snd_soc_write(codec, DA7218_SYSTEM_ACTIVE, 0); snd_soc_component_write(component, DA7218_SYSTEM_ACTIVE, 0);
return 0; return 0;
} }
static int da7218_resume(struct snd_soc_codec *codec) static int da7218_resume(struct snd_soc_component *component)
{ {
struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
/* Put device into active mode if previously moved to standby */ /* Put device into active mode if previously moved to standby */
if (!da7218->jack) if (!da7218->jack)
snd_soc_write(codec, DA7218_SYSTEM_ACTIVE, snd_soc_component_write(component, DA7218_SYSTEM_ACTIVE,
DA7218_SYSTEM_ACTIVE_MASK); DA7218_SYSTEM_ACTIVE_MASK);
da7218_set_bias_level(codec, SND_SOC_BIAS_STANDBY); da7218_set_bias_level(component, SND_SOC_BIAS_STANDBY);
return 0; return 0;
} }
...@@ -3031,21 +3029,22 @@ static int da7218_resume(struct snd_soc_codec *codec) ...@@ -3031,21 +3029,22 @@ static int da7218_resume(struct snd_soc_codec *codec)
#define da7218_resume NULL #define da7218_resume NULL
#endif #endif
static const struct snd_soc_codec_driver soc_codec_dev_da7218 = { static const struct snd_soc_component_driver soc_component_dev_da7218 = {
.probe = da7218_probe, .probe = da7218_probe,
.remove = da7218_remove, .remove = da7218_remove,
.suspend = da7218_suspend, .suspend = da7218_suspend,
.resume = da7218_resume, .resume = da7218_resume,
.set_bias_level = da7218_set_bias_level, .set_bias_level = da7218_set_bias_level,
.controls = da7218_snd_controls,
.component_driver = { .num_controls = ARRAY_SIZE(da7218_snd_controls),
.controls = da7218_snd_controls, .dapm_widgets = da7218_dapm_widgets,
.num_controls = ARRAY_SIZE(da7218_snd_controls), .num_dapm_widgets = ARRAY_SIZE(da7218_dapm_widgets),
.dapm_widgets = da7218_dapm_widgets, .dapm_routes = da7218_audio_map,
.num_dapm_widgets = ARRAY_SIZE(da7218_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(da7218_audio_map),
.dapm_routes = da7218_audio_map, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(da7218_audio_map), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
...@@ -3295,21 +3294,15 @@ static int da7218_i2c_probe(struct i2c_client *i2c, ...@@ -3295,21 +3294,15 @@ static int da7218_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
} }
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_da7218, &da7218_dai, 1); &soc_component_dev_da7218, &da7218_dai, 1);
if (ret < 0) { if (ret < 0) {
dev_err(&i2c->dev, "Failed to register da7218 codec: %d\n", dev_err(&i2c->dev, "Failed to register da7218 component: %d\n",
ret); ret);
} }
return ret; return ret;
} }
static int da7218_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id da7218_i2c_id[] = { static const struct i2c_device_id da7218_i2c_id[] = {
{ "da7217", DA7217_DEV_ID }, { "da7217", DA7217_DEV_ID },
{ "da7218", DA7218_DEV_ID }, { "da7218", DA7218_DEV_ID },
...@@ -3323,7 +3316,6 @@ static struct i2c_driver da7218_i2c_driver = { ...@@ -3323,7 +3316,6 @@ static struct i2c_driver da7218_i2c_driver = {
.of_match_table = of_match_ptr(da7218_of_match), .of_match_table = of_match_ptr(da7218_of_match),
}, },
.probe = da7218_i2c_probe, .probe = da7218_i2c_probe,
.remove = da7218_i2c_remove,
.id_table = da7218_i2c_id, .id_table = da7218_i2c_id,
}; };
......
sound/soc/codecs/da7218.h
View file @ bc596c42
...@@ -1410,6 +1410,6 @@ struct da7218_priv { ...@@ -1410,6 +1410,6 @@ struct da7218_priv {
}; };
/* HP detect control */ /* HP detect control */
int da7218_hpldet(struct snd_soc_codec *codec, struct snd_soc_jack *jack); int da7218_hpldet(struct snd_soc_component *component, struct snd_soc_jack *jack);
#endif /* _DA7218_H */ #endif /* _DA7218_H */
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