Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6353a4ab authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/tlv320aic32x4',... 

Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/tlv320dac33', 'asoc/topic/ts3a227e' and 'asoc/topic/twl4030' into asoc-next
parents 37850831 f10c0a71 68f43837 90db15e1 2880fc87 3ec8d203

Documentation/devicetree/bindings/sound/ts3a227e.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Texas Instruments TS3A227E

Autonomous Audio Accessory Detection and Configuration Switch



The TS3A227E detect headsets of 3-ring and 4-ring standards and

switches automatically to route the microphone correctly.  It also

handles key press detection in accordance with the Android audio

headset specification v1.0.



Required properties:



 - compatible:		Should contain "ti,ts3a227e".

 - reg:			The i2c address. Should contain <0x3b>.

 - interrupt-parent:	The parent interrupt controller

 - interrupts:		Interrupt number for /INT pin from the 227e





Examples:



	i2c {

		ts3a227e@3b {

			compatible = "ti,ts3a227e";

			reg = <0x3b>;

			interrupt-parent = <&gpio>;

			interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

		};

	};

sound/soc/codecs/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_TLV320AIC3X if I2C

	select SND_SOC_TPA6130A2 if I2C

	select SND_SOC_TLV320DAC33 if I2C

	select SND_SOC_TS3A227E if I2C

	select SND_SOC_TWL4030 if TWL4030_CORE

	select SND_SOC_TWL6040 if TWL6040_CORE

	select SND_SOC_UDA134X
@@ -633,6 +634,10 @@ config SND_SOC_TLV320AIC3X 
config SND_SOC_TLV320DAC33

	tristate



config SND_SOC_TS3A227E

	tristate "TI Headset/Mic detect and keypress chip"

	depends on I2C



config SND_SOC_TWL4030

	select MFD_TWL4030_AUDIO

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ snd-soc-tlv320aic31xx-objs := tlv320aic31xx.o 
snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o

snd-soc-tlv320aic3x-objs := tlv320aic3x.o

snd-soc-tlv320dac33-objs := tlv320dac33.o

snd-soc-ts3a227e-objs := ts3a227e.o

snd-soc-twl4030-objs := twl4030.o

snd-soc-twl6040-objs := twl6040.o

snd-soc-uda134x-objs := uda134x.o
@@ -290,6 +291,7 @@ obj-$(CONFIG_SND_SOC_TLV320AIC31XX) += snd-soc-tlv320aic31xx.o 
obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.o

obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o

obj-$(CONFIG_SND_SOC_TLV320DAC33)	+= snd-soc-tlv320dac33.o

obj-$(CONFIG_SND_SOC_TS3A227E)	+= snd-soc-ts3a227e.o

obj-$(CONFIG_SND_SOC_TWL4030)	+= snd-soc-twl4030.o

obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o

obj-$(CONFIG_SND_SOC_UDA134X)	+= snd-soc-uda134x.o

sound/soc/codecs/tlv320aic32x4.c

+1 −23
Original line number Diff line number Diff line
@@ -597,18 +597,6 @@ static struct snd_soc_dai_driver aic32x4_dai = { 
	.symmetric_rates = 1,

};



static int aic32x4_suspend(struct snd_soc_codec *codec)

{

	aic32x4_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int aic32x4_resume(struct snd_soc_codec *codec)

{

	aic32x4_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}



static int aic32x4_probe(struct snd_soc_codec *codec)

{

	struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
@@ -654,8 +642,6 @@ static int aic32x4_probe(struct snd_soc_codec *codec) 
		snd_soc_write(codec, AIC32X4_RMICPGANIN,

				AIC32X4_RMICPGANIN_CM1R_10K);



	aic32x4_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	/*

	 * Workaround: for an unknown reason, the ADC needs to be powered up

	 * and down for the first capture to work properly. It seems related to
@@ -669,18 +655,10 @@ static int aic32x4_probe(struct snd_soc_codec *codec) 
	return 0;

}



static int aic32x4_remove(struct snd_soc_codec *codec)

{

	aic32x4_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = {

	.probe = aic32x4_probe,

	.remove = aic32x4_remove,

	.suspend = aic32x4_suspend,

	.resume = aic32x4_resume,

	.set_bias_level = aic32x4_set_bias_level,

	.suspend_bias_off = true,



	.controls = aic32x4_snd_controls,

	.num_controls = ARRAY_SIZE(aic32x4_snd_controls),

sound/soc/codecs/tlv320aic3x.c

+152 −76
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ struct aic3x_priv { 
	struct aic3x_disable_nb disable_nb[AIC3X_NUM_SUPPLIES];

	struct aic3x_setup_data *setup;

	unsigned int sysclk;

	unsigned int dai_fmt;

	unsigned int tdm_delay;

	struct list_head list;

	int master;

	int gpio_reset;
@@ -214,61 +216,78 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



static const char *aic3x_left_dac_mux[] = { "DAC_L1", "DAC_L3", "DAC_L2" };

static const char *aic3x_right_dac_mux[] = { "DAC_R1", "DAC_R3", "DAC_R2" };

static const char *aic3x_left_hpcom_mux[] =

    { "differential of HPLOUT", "constant VCM", "single-ended" };

static const char *aic3x_right_hpcom_mux[] =

    { "differential of HPROUT", "constant VCM", "single-ended",

      "differential of HPLCOM", "external feedback" };

static const char *aic3x_linein_mode_mux[] = { "single-ended", "differential" };

static const char *aic3x_adc_hpf[] =

    { "Disabled", "0.0045xFs", "0.0125xFs", "0.025xFs" };



#define LDAC_ENUM	0

#define RDAC_ENUM	1

#define LHPCOM_ENUM	2

#define RHPCOM_ENUM	3

#define LINE1L_2_L_ENUM	4

#define LINE1L_2_R_ENUM	5

#define LINE1R_2_L_ENUM	6

#define LINE1R_2_R_ENUM	7

#define LINE2L_ENUM	8

#define LINE2R_ENUM	9

#define ADC_HPF_ENUM	10



static const struct soc_enum aic3x_enum[] = {

	SOC_ENUM_SINGLE(DAC_LINE_MUX, 6, 3, aic3x_left_dac_mux),

	SOC_ENUM_SINGLE(DAC_LINE_MUX, 4, 3, aic3x_right_dac_mux),

	SOC_ENUM_SINGLE(HPLCOM_CFG, 4, 3, aic3x_left_hpcom_mux),

	SOC_ENUM_SINGLE(HPRCOM_CFG, 3, 5, aic3x_right_hpcom_mux),

	SOC_ENUM_SINGLE(LINE1L_2_LADC_CTRL, 7, 2, aic3x_linein_mode_mux),

	SOC_ENUM_SINGLE(LINE1L_2_RADC_CTRL, 7, 2, aic3x_linein_mode_mux),

	SOC_ENUM_SINGLE(LINE1R_2_LADC_CTRL, 7, 2, aic3x_linein_mode_mux),

	SOC_ENUM_SINGLE(LINE1R_2_RADC_CTRL, 7, 2, aic3x_linein_mode_mux),

	SOC_ENUM_SINGLE(LINE2L_2_LADC_CTRL, 7, 2, aic3x_linein_mode_mux),

	SOC_ENUM_SINGLE(LINE2R_2_RADC_CTRL, 7, 2, aic3x_linein_mode_mux),

	SOC_ENUM_DOUBLE(AIC3X_CODEC_DFILT_CTRL, 6, 4, 4, aic3x_adc_hpf),

};

static const char * const aic3x_left_dac_mux[] = {

	"DAC_L1", "DAC_L3", "DAC_L2" };

static SOC_ENUM_SINGLE_DECL(aic3x_left_dac_enum, DAC_LINE_MUX, 6,

			    aic3x_left_dac_mux);



static const char *aic3x_agc_level[] =

	{ "-5.5dB", "-8dB", "-10dB", "-12dB", "-14dB", "-17dB", "-20dB", "-24dB" };

static const struct soc_enum aic3x_agc_level_enum[] = {

	SOC_ENUM_SINGLE(LAGC_CTRL_A, 4, 8, aic3x_agc_level),

	SOC_ENUM_SINGLE(RAGC_CTRL_A, 4, 8, aic3x_agc_level),

};

static const char * const aic3x_right_dac_mux[] = {

	"DAC_R1", "DAC_R3", "DAC_R2" };

static SOC_ENUM_SINGLE_DECL(aic3x_right_dac_enum, DAC_LINE_MUX, 4,

			    aic3x_right_dac_mux);



static const char *aic3x_agc_attack[] = { "8ms", "11ms", "16ms", "20ms" };

static const struct soc_enum aic3x_agc_attack_enum[] = {

	SOC_ENUM_SINGLE(LAGC_CTRL_A, 2, 4, aic3x_agc_attack),

	SOC_ENUM_SINGLE(RAGC_CTRL_A, 2, 4, aic3x_agc_attack),

};

static const char * const aic3x_left_hpcom_mux[] = {

	"differential of HPLOUT", "constant VCM", "single-ended" };

static SOC_ENUM_SINGLE_DECL(aic3x_left_hpcom_enum, HPLCOM_CFG, 4,

			    aic3x_left_hpcom_mux);



static const char *aic3x_agc_decay[] = { "100ms", "200ms", "400ms", "500ms" };

static const struct soc_enum aic3x_agc_decay_enum[] = {

	SOC_ENUM_SINGLE(LAGC_CTRL_A, 0, 4, aic3x_agc_decay),

	SOC_ENUM_SINGLE(RAGC_CTRL_A, 0, 4, aic3x_agc_decay),

};

static const char * const aic3x_right_hpcom_mux[] = {

	"differential of HPROUT", "constant VCM", "single-ended",

	"differential of HPLCOM", "external feedback" };

static SOC_ENUM_SINGLE_DECL(aic3x_right_hpcom_enum, HPRCOM_CFG, 3,

			    aic3x_right_hpcom_mux);



static const char * const aic3x_linein_mode_mux[] = {

	"single-ended", "differential" };

static SOC_ENUM_SINGLE_DECL(aic3x_line1l_2_l_enum, LINE1L_2_LADC_CTRL, 7,

			    aic3x_linein_mode_mux);

static SOC_ENUM_SINGLE_DECL(aic3x_line1l_2_r_enum, LINE1L_2_RADC_CTRL, 7,

			    aic3x_linein_mode_mux);

static SOC_ENUM_SINGLE_DECL(aic3x_line1r_2_l_enum, LINE1R_2_LADC_CTRL, 7,

			    aic3x_linein_mode_mux);

static SOC_ENUM_SINGLE_DECL(aic3x_line1r_2_r_enum, LINE1R_2_RADC_CTRL, 7,

			    aic3x_linein_mode_mux);

static SOC_ENUM_SINGLE_DECL(aic3x_line2l_2_ldac_enum, LINE2L_2_LADC_CTRL, 7,

			    aic3x_linein_mode_mux);

static SOC_ENUM_SINGLE_DECL(aic3x_line2r_2_rdac_enum, LINE2R_2_RADC_CTRL, 7,

			    aic3x_linein_mode_mux);



static const char * const aic3x_adc_hpf[] = {

	"Disabled", "0.0045xFs", "0.0125xFs", "0.025xFs" };

static SOC_ENUM_DOUBLE_DECL(aic3x_adc_hpf_enum, AIC3X_CODEC_DFILT_CTRL, 6, 4,

			    aic3x_adc_hpf);



static const char * const aic3x_agc_level[] = {

	"-5.5dB", "-8dB", "-10dB", "-12dB",

	"-14dB", "-17dB", "-20dB", "-24dB" };

static SOC_ENUM_SINGLE_DECL(aic3x_lagc_level_enum, LAGC_CTRL_A, 4,

			    aic3x_agc_level);

static SOC_ENUM_SINGLE_DECL(aic3x_ragc_level_enum, RAGC_CTRL_A, 4,

			    aic3x_agc_level);



static const char * const aic3x_agc_attack[] = {

	"8ms", "11ms", "16ms", "20ms" };

static SOC_ENUM_SINGLE_DECL(aic3x_lagc_attack_enum, LAGC_CTRL_A, 2,

			    aic3x_agc_attack);

static SOC_ENUM_SINGLE_DECL(aic3x_ragc_attack_enum, RAGC_CTRL_A, 2,

			    aic3x_agc_attack);



static const char * const aic3x_agc_decay[] = {

	"100ms", "200ms", "400ms", "500ms" };

static SOC_ENUM_SINGLE_DECL(aic3x_lagc_decay_enum, LAGC_CTRL_A, 0,

			    aic3x_agc_decay);

static SOC_ENUM_SINGLE_DECL(aic3x_ragc_decay_enum, RAGC_CTRL_A, 0,

			    aic3x_agc_decay);



static const char * const aic3x_poweron_time[] = {

	"0us", "10us", "100us", "1ms", "10ms", "50ms",

	"100ms", "200ms", "400ms", "800ms", "2s", "4s" };

static SOC_ENUM_SINGLE_DECL(aic3x_poweron_time_enum, HPOUT_POP_REDUCTION, 4,

			    aic3x_poweron_time);



static const char * const aic3x_rampup_step[] = { "0ms", "1ms", "2ms", "4ms" };

static SOC_ENUM_SINGLE_DECL(aic3x_rampup_step_enum, HPOUT_POP_REDUCTION, 2,

			    aic3x_rampup_step);



/*

 * DAC digital volumes. From -63.5 to 0 dB in 0.5 dB steps
@@ -383,12 +402,12 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { 
	 * adjust PGA to max value when ADC is on and will never go back.

	*/

	SOC_DOUBLE_R("AGC Switch", LAGC_CTRL_A, RAGC_CTRL_A, 7, 0x01, 0),

	SOC_ENUM("Left AGC Target level", aic3x_agc_level_enum[0]),

	SOC_ENUM("Right AGC Target level", aic3x_agc_level_enum[1]),

	SOC_ENUM("Left AGC Attack time", aic3x_agc_attack_enum[0]),

	SOC_ENUM("Right AGC Attack time", aic3x_agc_attack_enum[1]),

	SOC_ENUM("Left AGC Decay time", aic3x_agc_decay_enum[0]),

	SOC_ENUM("Right AGC Decay time", aic3x_agc_decay_enum[1]),

	SOC_ENUM("Left AGC Target level", aic3x_lagc_level_enum),

	SOC_ENUM("Right AGC Target level", aic3x_ragc_level_enum),

	SOC_ENUM("Left AGC Attack time", aic3x_lagc_attack_enum),

	SOC_ENUM("Right AGC Attack time", aic3x_ragc_attack_enum),

	SOC_ENUM("Left AGC Decay time", aic3x_lagc_decay_enum),

	SOC_ENUM("Right AGC Decay time", aic3x_ragc_decay_enum),



	/* De-emphasis */

	SOC_DOUBLE("De-emphasis Switch", AIC3X_CODEC_DFILT_CTRL, 2, 0, 0x01, 0),
@@ -398,7 +417,11 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { 
			 0, 119, 0, adc_tlv),

	SOC_DOUBLE_R("PGA Capture Switch", LADC_VOL, RADC_VOL, 7, 0x01, 1),



	SOC_ENUM("ADC HPF Cut-off", aic3x_enum[ADC_HPF_ENUM]),

	SOC_ENUM("ADC HPF Cut-off", aic3x_adc_hpf_enum),



	/* Pop reduction */

	SOC_ENUM("Output Driver Power-On time", aic3x_poweron_time_enum),

	SOC_ENUM("Output Driver Ramp-up step", aic3x_rampup_step_enum),

};



static const struct snd_kcontrol_new aic3x_mono_controls[] = {
@@ -425,19 +448,19 @@ static const struct snd_kcontrol_new aic3x_classd_amp_gain_ctrl = 


/* Left DAC Mux */

static const struct snd_kcontrol_new aic3x_left_dac_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[LDAC_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_left_dac_enum);



/* Right DAC Mux */

static const struct snd_kcontrol_new aic3x_right_dac_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[RDAC_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_right_dac_enum);



/* Left HPCOM Mux */

static const struct snd_kcontrol_new aic3x_left_hpcom_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[LHPCOM_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_left_hpcom_enum);



/* Right HPCOM Mux */

static const struct snd_kcontrol_new aic3x_right_hpcom_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[RHPCOM_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_right_hpcom_enum);



/* Left Line Mixer */

static const struct snd_kcontrol_new aic3x_left_line_mixer_controls[] = {
@@ -529,23 +552,23 @@ static const struct snd_kcontrol_new aic3x_right_pga_mixer_controls[] = { 


/* Left Line1 Mux */

static const struct snd_kcontrol_new aic3x_left_line1l_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[LINE1L_2_L_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_line1l_2_l_enum);

static const struct snd_kcontrol_new aic3x_right_line1l_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[LINE1L_2_R_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_line1l_2_r_enum);



/* Right Line1 Mux */

static const struct snd_kcontrol_new aic3x_right_line1r_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[LINE1R_2_R_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_line1r_2_r_enum);

static const struct snd_kcontrol_new aic3x_left_line1r_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[LINE1R_2_L_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_line1r_2_l_enum);



/* Left Line2 Mux */

static const struct snd_kcontrol_new aic3x_left_line2_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[LINE2L_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_line2l_2_ldac_enum);



/* Right Line2 Mux */

static const struct snd_kcontrol_new aic3x_right_line2_mux_controls =

SOC_DAPM_ENUM("Route", aic3x_enum[LINE2R_ENUM]);

SOC_DAPM_ENUM("Route", aic3x_line2r_2_rdac_enum);



static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {

	/* Left DAC to Left Outputs */
@@ -1009,6 +1032,25 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int aic3x_prepare(struct snd_pcm_substream *substream,

			 struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);

	int delay = 0;



	/* TDM slot selection only valid in DSP_A/_B mode */

	if (aic3x->dai_fmt == SND_SOC_DAIFMT_DSP_A)

		delay += (aic3x->tdm_delay + 1);

	else if (aic3x->dai_fmt == SND_SOC_DAIFMT_DSP_B)

		delay += aic3x->tdm_delay;



	/* Configure data delay */

	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, aic3x->tdm_delay);



	return 0;

}



static int aic3x_mute(struct snd_soc_dai *dai, int mute)

{

	struct snd_soc_codec *codec = dai->codec;
@@ -1048,7 +1090,6 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	struct snd_soc_codec *codec = codec_dai->codec;

	struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);

	u8 iface_areg, iface_breg;

	int delay = 0;



	iface_areg = snd_soc_read(codec, AIC3X_ASD_INTF_CTRLA) & 0x3f;

	iface_breg = snd_soc_read(codec, AIC3X_ASD_INTF_CTRLB) & 0x3f;
@@ -1076,7 +1117,6 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	case (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF):

		break;

	case (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF):

		delay = 1;

	case (SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF):

		iface_breg |= (0x01 << 6);

		break;
@@ -1090,10 +1130,45 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		return -EINVAL;

	}



	aic3x->dai_fmt = fmt & SND_SOC_DAIFMT_FORMAT_MASK;



	/* set iface */

	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLA, iface_areg);

	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLB, iface_breg);

	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, delay);



	return 0;

}



static int aic3x_set_dai_tdm_slot(struct snd_soc_dai *codec_dai,

				  unsigned int tx_mask, unsigned int rx_mask,

				  int slots, int slot_width)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);

	unsigned int lsb;



	if (tx_mask != rx_mask) {

		dev_err(codec->dev, "tx and rx masks must be symmetric\n");

		return -EINVAL;

	}



	if (unlikely(!tx_mask)) {

		dev_err(codec->dev, "tx and rx masks need to be non 0\n");

		return -EINVAL;

	}



	/* TDM based on DSP mode requires slots to be adjacent */

	lsb = __ffs(tx_mask);

	if ((lsb + 1) != __fls(tx_mask)) {

		dev_err(codec->dev, "Invalid mask, slots must be adjacent\n");

		return -EINVAL;

	}



	aic3x->tdm_delay = lsb * slot_width;



	/* DOUT in high-impedance on inactive bit clocks */

	snd_soc_update_bits(codec, AIC3X_ASD_INTF_CTRLA,

			    DOUT_TRISTATE, DOUT_TRISTATE);



	return 0;

}
@@ -1212,9 +1287,11 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec, 


static const struct snd_soc_dai_ops aic3x_dai_ops = {

	.hw_params	= aic3x_hw_params,

	.prepare	= aic3x_prepare,

	.digital_mute	= aic3x_mute,

	.set_sysclk	= aic3x_set_dai_sysclk,

	.set_fmt	= aic3x_set_dai_fmt,

	.set_tdm_slot	= aic3x_set_dai_tdm_slot,

};



static struct snd_soc_dai_driver aic3x_dai = {
@@ -1414,7 +1491,6 @@ static int aic3x_remove(struct snd_soc_codec *codec) 
	struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);

	int i;



	aic3x_set_bias_level(codec, SND_SOC_BIAS_OFF);

	list_del(&aic3x->list);

	for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)

		regulator_unregister_notifier(aic3x->supplies[i].consumer,