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

Unverified Commit cce67af3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ab8500',... 

Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ab8500', 'asoc/topic/ac97', 'asoc/topic/ad1836' and 'asoc/topic/ad193x' into asoc-next
parents 848272e9 5783994b aeb90fd2 6aa89ef3 683adc82 89cea5c9

include/sound/soc.h

+10 −3
Original line number Diff line number Diff line
@@ -586,10 +586,17 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg, 
				unsigned int mask, unsigned int value);



#ifdef CONFIG_SND_SOC_AC97_BUS

struct snd_ac97 *snd_soc_alloc_ac97_codec(struct snd_soc_codec *codec);

struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec,

#define snd_soc_alloc_ac97_codec(codec) \

	snd_soc_alloc_ac97_component(&codec->component)

#define snd_soc_new_ac97_codec(codec, id, id_mask) \

	snd_soc_new_ac97_component(&codec->component, id, id_mask)

#define snd_soc_free_ac97_codec(ac97) \

	snd_soc_free_ac97_component(ac97)



struct snd_ac97 *snd_soc_alloc_ac97_component(struct snd_soc_component *component);

struct snd_ac97 *snd_soc_new_ac97_component(struct snd_soc_component *component,

	unsigned int id, unsigned int id_mask);

void snd_soc_free_ac97_codec(struct snd_ac97 *ac97);

void snd_soc_free_ac97_component(struct snd_ac97 *ac97);



int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops);

int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,

sound/soc/codecs/88pm860x-codec.c

+83 −83
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ struct pm860x_priv { 
	unsigned int		pcmclk;

	unsigned int		dir;

	unsigned int		filter;

	struct snd_soc_codec	*codec;

	struct snd_soc_component *component;

	struct i2c_client	*i2c;

	struct regmap		*regmap;

	struct pm860x_chip	*chip;
@@ -272,15 +272,15 @@ static int snd_soc_get_volsw_2r_st(struct snd_kcontrol *kcontrol, 
{

	struct soc_mixer_control *mc =

		(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);

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	int val[2], val2[2], i;



	val[0] = snd_soc_read(codec, reg) & 0x3f;

	val[1] = (snd_soc_read(codec, PM860X_SIDETONE_SHIFT) >> 4) & 0xf;

	val2[0] = snd_soc_read(codec, reg2) & 0x3f;

	val2[1] = (snd_soc_read(codec, PM860X_SIDETONE_SHIFT)) & 0xf;

	val[0] = snd_soc_component_read32(component, reg) & 0x3f;

	val[1] = (snd_soc_component_read32(component, PM860X_SIDETONE_SHIFT) >> 4) & 0xf;

	val2[0] = snd_soc_component_read32(component, reg2) & 0x3f;

	val2[1] = (snd_soc_component_read32(component, PM860X_SIDETONE_SHIFT)) & 0xf;



	for (i = 0; i < ARRAY_SIZE(st_table); i++) {

		if ((st_table[i].m == val[0]) && (st_table[i].n == val[1]))
@@ -296,7 +296,7 @@ static int snd_soc_put_volsw_2r_st(struct snd_kcontrol *kcontrol, 
{

	struct soc_mixer_control *mc =

		(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);

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	int err;
@@ -308,18 +308,18 @@ static int snd_soc_put_volsw_2r_st(struct snd_kcontrol *kcontrol, 
	if (val >= ARRAY_SIZE(st_table) || val2 >= ARRAY_SIZE(st_table))

		return -EINVAL;



	err = snd_soc_update_bits(codec, reg, 0x3f, st_table[val].m);

	err = snd_soc_component_update_bits(component, reg, 0x3f, st_table[val].m);

	if (err < 0)

		return err;

	err = snd_soc_update_bits(codec, PM860X_SIDETONE_SHIFT, 0xf0,

	err = snd_soc_component_update_bits(component, PM860X_SIDETONE_SHIFT, 0xf0,

				  st_table[val].n << 4);

	if (err < 0)

		return err;



	err = snd_soc_update_bits(codec, reg2, 0x3f, st_table[val2].m);

	err = snd_soc_component_update_bits(component, reg2, 0x3f, st_table[val2].m);

	if (err < 0)

		return err;

	err = snd_soc_update_bits(codec, PM860X_SIDETONE_SHIFT, 0x0f,

	err = snd_soc_component_update_bits(component, PM860X_SIDETONE_SHIFT, 0x0f,

				  st_table[val2].n);

	return err;

}
@@ -329,15 +329,15 @@ static int snd_soc_get_volsw_2r_out(struct snd_kcontrol *kcontrol, 
{

	struct soc_mixer_control *mc =

		(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);

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	unsigned int shift = mc->shift;

	int max = mc->max, val, val2;

	unsigned int mask = (1 << fls(max)) - 1;



	val = snd_soc_read(codec, reg) >> shift;

	val2 = snd_soc_read(codec, reg2) >> shift;

	val = snd_soc_component_read32(component, reg) >> shift;

	val2 = snd_soc_component_read32(component, reg2) >> shift;

	ucontrol->value.integer.value[0] = (max - val) & mask;

	ucontrol->value.integer.value[1] = (max - val2) & mask;
@@ -349,7 +349,7 @@ static int snd_soc_put_volsw_2r_out(struct snd_kcontrol *kcontrol, 
{

	struct soc_mixer_control *mc =

		(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);

	unsigned int reg = mc->reg;

	unsigned int reg2 = mc->rreg;

	unsigned int shift = mc->shift;
@@ -365,11 +365,11 @@ static int snd_soc_put_volsw_2r_out(struct snd_kcontrol *kcontrol, 
	val = val << shift;

	val2 = val2 << shift;



	err = snd_soc_update_bits(codec, reg, val_mask, val);

	err = snd_soc_component_update_bits(component, reg, val_mask, val);

	if (err < 0)

		return err;



	err = snd_soc_update_bits(codec, reg2, val_mask, val2);

	err = snd_soc_component_update_bits(component, reg2, val_mask, val2);

	return err;

}
@@ -382,7 +382,7 @@ static int snd_soc_put_volsw_2r_out(struct snd_kcontrol *kcontrol, 
static int pm860x_rsync_event(struct snd_soc_dapm_widget *w,

			      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);



	/*

	 * In order to avoid current on the load, mute power-on and power-off
@@ -390,8 +390,8 @@ static int pm860x_rsync_event(struct snd_soc_dapm_widget *w, 
	 * Unmute by DAC_MUTE. It should be unmuted when DAPM sequence is

	 * finished.

	 */

	snd_soc_update_bits(codec, PM860X_DAC_OFFSET, DAC_MUTE, 0);

	snd_soc_update_bits(codec, PM860X_EAR_CTRL_2,

	snd_soc_component_update_bits(component, PM860X_DAC_OFFSET, DAC_MUTE, 0);

	snd_soc_component_update_bits(component, PM860X_EAR_CTRL_2,

			    RSYNC_CHANGE, RSYNC_CHANGE);

	return 0;

}
@@ -399,7 +399,7 @@ static int pm860x_rsync_event(struct snd_soc_dapm_widget *w, 
static int pm860x_dac_event(struct snd_soc_dapm_widget *w,

			    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);

	unsigned int dac = 0;

	int data;
@@ -412,28 +412,28 @@ static int pm860x_dac_event(struct snd_soc_dapm_widget *w, 
		if (dac) {

			/* Auto mute in power-on sequence. */

			dac |= MODULATOR;

			snd_soc_update_bits(codec, PM860X_DAC_OFFSET,

			snd_soc_component_update_bits(component, PM860X_DAC_OFFSET,

					    DAC_MUTE, DAC_MUTE);

			snd_soc_update_bits(codec, PM860X_EAR_CTRL_2,

			snd_soc_component_update_bits(component, PM860X_EAR_CTRL_2,

					    RSYNC_CHANGE, RSYNC_CHANGE);

			/* update dac */

			snd_soc_update_bits(codec, PM860X_DAC_EN_2,

			snd_soc_component_update_bits(component, PM860X_DAC_EN_2,

					    dac, dac);

		}

		break;

	case SND_SOC_DAPM_PRE_PMD:

		if (dac) {

			/* Auto mute in power-off sequence. */

			snd_soc_update_bits(codec, PM860X_DAC_OFFSET,

			snd_soc_component_update_bits(component, PM860X_DAC_OFFSET,

					    DAC_MUTE, DAC_MUTE);

			snd_soc_update_bits(codec, PM860X_EAR_CTRL_2,

			snd_soc_component_update_bits(component, PM860X_EAR_CTRL_2,

					    RSYNC_CHANGE, RSYNC_CHANGE);

			/* update dac */

			data = snd_soc_read(codec, PM860X_DAC_EN_2);

			data = snd_soc_component_read32(component, PM860X_DAC_EN_2);

			data &= ~dac;

			if (!(data & (DAC_LEFT | DAC_RIGHT)))

				data &= ~MODULATOR;

			snd_soc_write(codec, PM860X_DAC_EN_2, data);

			snd_soc_component_write(component, PM860X_DAC_EN_2, data);

		}

		break;

	}
@@ -922,13 +922,13 @@ static const struct snd_soc_dapm_route pm860x_dapm_routes[] = { 
 */

static int pm860x_digital_mute(struct snd_soc_dai *codec_dai, int mute)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_component *component = codec_dai->component;

	int data = 0, mask = MUTE_LEFT | MUTE_RIGHT;



	if (mute)

		data = mask;

	snd_soc_update_bits(codec, PM860X_DAC_OFFSET, mask, data);

	snd_soc_update_bits(codec, PM860X_EAR_CTRL_2,

	snd_soc_component_update_bits(component, PM860X_DAC_OFFSET, mask, data);

	snd_soc_component_update_bits(component, PM860X_EAR_CTRL_2,

			    RSYNC_CHANGE, RSYNC_CHANGE);

	return 0;

}
@@ -937,7 +937,7 @@ static int pm860x_pcm_hw_params(struct snd_pcm_substream *substream, 
				struct snd_pcm_hw_params *params,

				struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct snd_soc_component *component = dai->component;

	unsigned char inf = 0, mask = 0;



	/* bit size */
@@ -952,7 +952,7 @@ static int pm860x_pcm_hw_params(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}

	mask |= PCM_INF2_18WL;

	snd_soc_update_bits(codec, PM860X_PCM_IFACE_2, mask, inf);

	snd_soc_component_update_bits(component, PM860X_PCM_IFACE_2, mask, inf);



	/* sample rate */

	switch (params_rate(params)) {
@@ -971,7 +971,7 @@ static int pm860x_pcm_hw_params(struct snd_pcm_substream *substream, 
	default:

		return -EINVAL;

	}

	snd_soc_update_bits(codec, PM860X_PCM_RATE, 0x0f, inf);

	snd_soc_component_update_bits(component, PM860X_PCM_RATE, 0x0f, inf);



	return 0;

}
@@ -979,8 +979,8 @@ static int pm860x_pcm_hw_params(struct snd_pcm_substream *substream, 
static int pm860x_pcm_set_dai_fmt(struct snd_soc_dai *codec_dai,

				  unsigned int fmt)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = codec_dai->component;

	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);

	unsigned char inf = 0, mask = 0;

	int ret = -EINVAL;
@@ -1012,15 +1012,15 @@ static int pm860x_pcm_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	mask |= PCM_MODE_MASK;

	if (ret)

		return ret;

	snd_soc_update_bits(codec, PM860X_PCM_IFACE_2, mask, inf);

	snd_soc_component_update_bits(component, PM860X_PCM_IFACE_2, mask, inf);

	return 0;

}



static int pm860x_set_dai_sysclk(struct snd_soc_dai *codec_dai,

				 int clk_id, unsigned int freq, int dir)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = codec_dai->component;

	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);



	if (dir == PM860X_CLK_DIR_OUT)

		pm860x->dir = PM860X_CLK_DIR_OUT;
@@ -1034,7 +1034,7 @@ static int pm860x_i2s_hw_params(struct snd_pcm_substream *substream, 
				struct snd_pcm_hw_params *params,

				struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct snd_soc_component *component = dai->component;

	unsigned char inf;



	/* bit size */
@@ -1048,7 +1048,7 @@ static int pm860x_i2s_hw_params(struct snd_pcm_substream *substream, 
	default:

		return -EINVAL;

	}

	snd_soc_update_bits(codec, PM860X_I2S_IFACE_2, PCM_INF2_18WL, inf);

	snd_soc_component_update_bits(component, PM860X_I2S_IFACE_2, PCM_INF2_18WL, inf);



	/* sample rate */

	switch (params_rate(params)) {
@@ -1076,7 +1076,7 @@ static int pm860x_i2s_hw_params(struct snd_pcm_substream *substream, 
	default:

		return -EINVAL;

	}

	snd_soc_update_bits(codec, PM860X_I2S_IFACE_4, 0xf, inf);

	snd_soc_component_update_bits(component, PM860X_I2S_IFACE_4, 0xf, inf);



	return 0;

}
@@ -1084,8 +1084,8 @@ static int pm860x_i2s_hw_params(struct snd_pcm_substream *substream, 
static int pm860x_i2s_set_dai_fmt(struct snd_soc_dai *codec_dai,

				  unsigned int fmt)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = codec_dai->component;

	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);

	unsigned char inf = 0, mask = 0;



	mask |= PCM_INF2_BCLK | PCM_INF2_FS | PCM_INF2_MASTER;
@@ -1116,14 +1116,14 @@ static int pm860x_i2s_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		return -EINVAL;

	}

	mask |= PCM_MODE_MASK;

	snd_soc_update_bits(codec, PM860X_I2S_IFACE_2, mask, inf);

	snd_soc_component_update_bits(component, PM860X_I2S_IFACE_2, mask, inf);

	return 0;

}



static int pm860x_set_bias_level(struct snd_soc_codec *codec,

static int pm860x_set_bias_level(struct snd_soc_component *component,

				 enum snd_soc_bias_level level)

{

	struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);

	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);

	int data;



	switch (level) {
@@ -1134,7 +1134,7 @@ static int pm860x_set_bias_level(struct snd_soc_codec *codec, 
		break;



	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) {

			/* Enable Audio PLL & Audio section */

			data = AUDIO_PLL | AUDIO_SECTION_ON;

			pm860x_reg_write(pm860x->i2c, REG_MISC2, data);
@@ -1216,7 +1216,7 @@ static struct snd_soc_dai_driver pm860x_dai[] = { 
	},

};



static irqreturn_t pm860x_codec_handler(int irq, void *data)

static irqreturn_t pm860x_component_handler(int irq, void *data)

{

	struct pm860x_priv *pm860x = data;

	int status, shrt, report = 0, mic_report = 0;
@@ -1230,7 +1230,7 @@ static irqreturn_t pm860x_codec_handler(int irq, void *data) 
#ifndef CONFIG_SND_SOC_88PM860X_MODULE

	if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 |

		      SHORT_LO1 | SHORT_LO2))

		trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev));

		trace_snd_soc_jack_irq(dev_name(pm860x->component->dev));

#endif



	if ((pm860x->det.hp_det & SND_JACK_HEADPHONE)
@@ -1256,17 +1256,17 @@ static irqreturn_t pm860x_codec_handler(int irq, void *data) 
		snd_soc_jack_report(pm860x->det.mic_jack, SND_JACK_MICROPHONE,

				    SND_JACK_MICROPHONE);



	dev_dbg(pm860x->codec->dev, "headphone report:0x%x, mask:%x\n",

	dev_dbg(pm860x->component->dev, "headphone report:0x%x, mask:%x\n",

		report, mask);

	dev_dbg(pm860x->codec->dev, "microphone report:0x%x\n", mic_report);

	dev_dbg(pm860x->component->dev, "microphone report:0x%x\n", mic_report);

	return IRQ_HANDLED;

}



int pm860x_hs_jack_detect(struct snd_soc_codec *codec,

int pm860x_hs_jack_detect(struct snd_soc_component *component,

			  struct snd_soc_jack *jack,

			  int det, int hook, int hs_shrt, int lo_shrt)

{

	struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);

	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);

	int data;



	pm860x->det.hp_jack = jack;
@@ -1290,15 +1290,15 @@ int pm860x_hs_jack_detect(struct snd_soc_codec *codec, 
	}



	/* sync status */

	pm860x_codec_handler(0, pm860x);

	pm860x_component_handler(0, pm860x);

	return 0;

}

EXPORT_SYMBOL_GPL(pm860x_hs_jack_detect);



int pm860x_mic_jack_detect(struct snd_soc_codec *codec,

int pm860x_mic_jack_detect(struct snd_soc_component *component,

			   struct snd_soc_jack *jack, int det)

{

	struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);

	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);



	pm860x->det.mic_jack = jack;

	pm860x->det.mic_det = det;
@@ -1308,25 +1308,25 @@ int pm860x_mic_jack_detect(struct snd_soc_codec *codec, 
				MICDET_MASK, MICDET_MASK);



	/* sync status */

	pm860x_codec_handler(0, pm860x);

	pm860x_component_handler(0, pm860x);

	return 0;

}

EXPORT_SYMBOL_GPL(pm860x_mic_jack_detect);



static int pm860x_probe(struct snd_soc_codec *codec)

static int pm860x_probe(struct snd_soc_component *component)

{

	struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);

	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);

	int i, ret;



	pm860x->codec = codec;

	snd_soc_codec_init_regmap(codec,  pm860x->regmap);

	pm860x->component = component;

	snd_soc_component_init_regmap(component,  pm860x->regmap);



	for (i = 0; i < 4; i++) {

		ret = request_threaded_irq(pm860x->irq[i], NULL,

					   pm860x_codec_handler, IRQF_ONESHOT,

					   pm860x_component_handler, IRQF_ONESHOT,

					   pm860x->name[i], pm860x);

		if (ret < 0) {

			dev_err(codec->dev, "Failed to request IRQ!\n");

			dev_err(component->dev, "Failed to request IRQ!\n");

			goto out;

		}

	}
@@ -1339,29 +1339,29 @@ static int pm860x_probe(struct snd_soc_codec *codec) 
	return ret;

}



static int pm860x_remove(struct snd_soc_codec *codec)

static void pm860x_remove(struct snd_soc_component *component)

{

	struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);

	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);

	int i;



	for (i = 3; i >= 0; i--)

		free_irq(pm860x->irq[i], pm860x);

	return 0;

}



static const struct snd_soc_codec_driver soc_codec_dev_pm860x = {

static const struct snd_soc_component_driver soc_component_dev_pm860x = {

	.probe			= pm860x_probe,

	.remove			= pm860x_remove,

	.set_bias_level		= pm860x_set_bias_level,



	.component_driver = {

	.controls		= pm860x_snd_controls,

	.num_controls		= ARRAY_SIZE(pm860x_snd_controls),

	.dapm_widgets		= pm860x_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(pm860x_dapm_widgets),

	.dapm_routes		= pm860x_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(pm860x_dapm_routes),

	},

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static int pm860x_codec_probe(struct platform_device *pdev)
@@ -1393,10 +1393,11 @@ static int pm860x_codec_probe(struct platform_device *pdev) 
		strncpy(pm860x->name[i], res->name, MAX_NAME_LEN);

	}



	ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_pm860x,

	ret = devm_snd_soc_register_component(&pdev->dev,

				     &soc_component_dev_pm860x,

				     pm860x_dai, ARRAY_SIZE(pm860x_dai));

	if (ret) {

		dev_err(&pdev->dev, "Failed to register codec\n");

		dev_err(&pdev->dev, "Failed to register component\n");

		return -EINVAL;

	}

	return ret;
@@ -1404,7 +1405,6 @@ static int pm860x_codec_probe(struct platform_device *pdev) 


static int pm860x_codec_remove(struct platform_device *pdev)

{

	snd_soc_unregister_codec(&pdev->dev);

	return 0;

}

sound/soc/codecs/88pm860x-codec.h

+2 −2
Original line number Diff line number Diff line
@@ -88,9 +88,9 @@ 
#define PM860X_SHORT_LINEOUT		(1 << 4)

#define PM860X_DET_MASK			0x1F



extern int pm860x_hs_jack_detect(struct snd_soc_codec *, struct snd_soc_jack *,

extern int pm860x_hs_jack_detect(struct snd_soc_component *, struct snd_soc_jack *,

				 int, int, int, int);

extern int pm860x_mic_jack_detect(struct snd_soc_codec *, struct snd_soc_jack *,

extern int pm860x_mic_jack_detect(struct snd_soc_component *, struct snd_soc_jack *,

				  int);



#endif	/* __88PM860X_H */

sound/soc/codecs/ab8500-codec.c

+144 −151

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/ac97.c

+23 −23
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ static const struct snd_soc_dapm_route ac97_routes[] = { 
static int ac97_prepare(struct snd_pcm_substream *substream,

			struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct snd_ac97 *ac97 = snd_soc_component_get_drvdata(component);



	int reg = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?

		  AC97_PCM_FRONT_DAC_RATE : AC97_PCM_LR_ADC_RATE;
@@ -65,7 +65,7 @@ static struct snd_soc_dai_driver ac97_dai = { 
	.ops = &ac97_dai_ops,

};



static int ac97_soc_probe(struct snd_soc_codec *codec)

static int ac97_soc_probe(struct snd_soc_component *component)

{

	struct snd_ac97 *ac97;

	struct snd_ac97_bus *ac97_bus;
@@ -73,7 +73,7 @@ static int ac97_soc_probe(struct snd_soc_codec *codec) 
	int ret;



	/* add codec as bus device for standard ac97 */

	ret = snd_ac97_bus(codec->component.card->snd_card, 0, soc_ac97_ops,

	ret = snd_ac97_bus(component->card->snd_card, 0, soc_ac97_ops,

			   NULL, &ac97_bus);

	if (ret < 0)

		return ret;
@@ -83,25 +83,25 @@ static int ac97_soc_probe(struct snd_soc_codec *codec) 
	if (ret < 0)

		return ret;



	snd_soc_codec_set_drvdata(codec, ac97);

	snd_soc_component_set_drvdata(component, ac97);



	return 0;

}



#ifdef CONFIG_PM

static int ac97_soc_suspend(struct snd_soc_codec *codec)

static int ac97_soc_suspend(struct snd_soc_component *component)

{

	struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);

	struct snd_ac97 *ac97 = snd_soc_component_get_drvdata(component);



	snd_ac97_suspend(ac97);



	return 0;

}



static int ac97_soc_resume(struct snd_soc_codec *codec)

static int ac97_soc_resume(struct snd_soc_component *component)

{



	struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);

	struct snd_ac97 *ac97 = snd_soc_component_get_drvdata(component);



	snd_ac97_resume(ac97);
@@ -112,28 +112,28 @@ static int ac97_soc_resume(struct snd_soc_codec *codec) 
#define ac97_soc_resume NULL

#endif



static const struct snd_soc_codec_driver soc_codec_dev_ac97 = {

static const struct snd_soc_component_driver soc_component_dev_ac97 = {

	.probe			= ac97_soc_probe,

	.suspend		= ac97_soc_suspend,

	.resume			= ac97_soc_resume,



	.component_driver = {

	.dapm_widgets		= ac97_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(ac97_widgets),

	.dapm_routes		= ac97_routes,

	.num_dapm_routes	= ARRAY_SIZE(ac97_routes),

	},

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static int ac97_probe(struct platform_device *pdev)

{

	return snd_soc_register_codec(&pdev->dev,

			&soc_codec_dev_ac97, &ac97_dai, 1);

	return devm_snd_soc_register_component(&pdev->dev,

			&soc_component_dev_ac97, &ac97_dai, 1);

}



static int ac97_remove(struct platform_device *pdev)

{

	snd_soc_unregister_codec(&pdev->dev);

	return 0;

}