Unverified Commit 231b5607 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/ad73311', 'asoc/topic/adau1373',... 

Merge remote-tracking branches 'asoc/topic/ad73311', 'asoc/topic/adau1373', 'asoc/topic/adau17x1', 'asoc/topic/adau1977' and 'asoc/topic/adau7002' into asoc-next
parents cce67af3 463c5f87 0d12540c c90ef8c7 f305fe81 ba7a3a97

sound/soc/codecs/adau1373.c

+38 −46
Original line number Diff line number Diff line
@@ -549,8 +549,8 @@ static const struct snd_kcontrol_new adau1373_drc_controls[] = { 
static int adau1373_pll_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 adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);

	unsigned int pll_id = w->name[3] - '1';

	unsigned int val;
@@ -821,8 +821,8 @@ static const struct snd_soc_dapm_widget adau1373_dapm_widgets[] = { 
static int adau1373_check_aif_clk(struct snd_soc_dapm_widget *source,

	struct snd_soc_dapm_widget *sink)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);

	unsigned int dai;

	const char *clk;
@@ -842,8 +842,8 @@ static int adau1373_check_aif_clk(struct snd_soc_dapm_widget *source, 
static int adau1373_check_src(struct snd_soc_dapm_widget *source,

	struct snd_soc_dapm_widget *sink)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);

	unsigned int dai;



	dai = sink->name[3] - '1';
@@ -1031,8 +1031,8 @@ static const struct snd_soc_dapm_route adau1373_dapm_routes[] = { 
static int adau1373_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 adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);

	struct adau1373_dai *adau1373_dai = &adau1373->dais[dai->id];

	unsigned int div;

	unsigned int freq;
@@ -1098,8 +1098,8 @@ static int adau1373_hw_params(struct snd_pcm_substream *substream, 


static int adau1373_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)

{

	struct snd_soc_codec *codec = dai->codec;

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);

	struct adau1373_dai *adau1373_dai = &adau1373->dais[dai->id];

	unsigned int ctrl;
@@ -1158,7 +1158,7 @@ static int adau1373_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
static int adau1373_set_dai_sysclk(struct snd_soc_dai *dai,

	int clk_id, unsigned int freq, int dir)

{

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(dai->codec);

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(dai->component);

	struct adau1373_dai *adau1373_dai = &adau1373->dais[dai->id];



	switch (clk_id) {
@@ -1250,10 +1250,10 @@ static struct snd_soc_dai_driver adau1373_dai_driver[] = { 
	},

};



static int adau1373_set_pll(struct snd_soc_codec *codec, int pll_id,

static int adau1373_set_pll(struct snd_soc_component *component, int pll_id,

	int source, unsigned int freq_in, unsigned int freq_out)

{

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);

	unsigned int dpll_div = 0;

	uint8_t pll_regs[5];

	int ret;
@@ -1348,10 +1348,10 @@ static bool adau1373_valid_micbias(enum adau1373_micbias_voltage micbias) 
	return false;

}



static int adau1373_probe(struct snd_soc_codec *codec)

static int adau1373_probe(struct snd_soc_component *component)

{

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct adau1373_platform_data *pdata = codec->dev->platform_data;

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);

	struct adau1373_platform_data *pdata = component->dev->platform_data;

	bool lineout_differential = false;

	unsigned int val;

	int i;
@@ -1369,7 +1369,7 @@ static int adau1373_probe(struct snd_soc_codec *codec) 
				pdata->drc_setting[i]);

		}



		snd_soc_add_codec_controls(codec, adau1373_drc_controls,

		snd_soc_add_component_controls(component, adau1373_drc_controls,

			pdata->num_drc);



		val = 0;
@@ -1394,7 +1394,7 @@ static int adau1373_probe(struct snd_soc_codec *codec) 
	}



	if (!lineout_differential) {

		snd_soc_add_codec_controls(codec, adau1373_lineout2_controls,

		snd_soc_add_component_controls(component, adau1373_lineout2_controls,

			ARRAY_SIZE(adau1373_lineout2_controls));

	}
@@ -1404,10 +1404,10 @@ static int adau1373_probe(struct snd_soc_codec *codec) 
	return 0;

}



static int adau1373_set_bias_level(struct snd_soc_codec *codec,

static int adau1373_set_bias_level(struct snd_soc_component *component,

	enum snd_soc_bias_level level)

{

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);



	switch (level) {

	case SND_SOC_BIAS_ON:
@@ -1426,9 +1426,9 @@ static int adau1373_set_bias_level(struct snd_soc_codec *codec, 
	return 0;

}



static int adau1373_resume(struct snd_soc_codec *codec)

static int adau1373_resume(struct snd_soc_component *component)

{

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	struct adau1373 *adau1373 = snd_soc_component_get_drvdata(component);



	regcache_sync(adau1373->regmap);
@@ -1458,22 +1458,20 @@ static const struct regmap_config adau1373_regmap_config = { 
	.num_reg_defaults = ARRAY_SIZE(adau1373_reg_defaults),

};



static const struct snd_soc_codec_driver adau1373_codec_driver = {

static const struct snd_soc_component_driver adau1373_component_driver = {

	.probe			= adau1373_probe,

	.resume			= adau1373_resume,

	.set_bias_level		= adau1373_set_bias_level,

	.idle_bias_off = true,



	.set_pll		= adau1373_set_pll,



	.component_driver = {

	.controls		= adau1373_controls,

	.num_controls		= ARRAY_SIZE(adau1373_controls),

	.dapm_widgets		= adau1373_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(adau1373_dapm_widgets),

	.dapm_routes		= adau1373_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(adau1373_dapm_routes),

	},

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static int adau1373_i2c_probe(struct i2c_client *client,
@@ -1495,17 +1493,12 @@ static int adau1373_i2c_probe(struct i2c_client *client, 


	dev_set_drvdata(&client->dev, adau1373);



	ret = snd_soc_register_codec(&client->dev, &adau1373_codec_driver,

	ret = devm_snd_soc_register_component(&client->dev,

			&adau1373_component_driver,

			adau1373_dai_driver, ARRAY_SIZE(adau1373_dai_driver));

	return ret;

}



static int adau1373_i2c_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);

	return 0;

}



static const struct i2c_device_id adau1373_i2c_id[] = {

	{ "adau1373", 0 },

	{ }
@@ -1517,7 +1510,6 @@ static struct i2c_driver adau1373_i2c_driver = { 
		.name = "adau1373",

	},

	.probe = adau1373_i2c_probe,

	.remove = adau1373_i2c_remove,

	.id_table = adau1373_i2c_id,

};

sound/soc/codecs/adau1701.c

+46 −55
Original line number Diff line number Diff line
@@ -298,10 +298,10 @@ static const struct sigmadsp_ops adau1701_sigmadsp_ops = { 
	.safeload = adau1701_safeload,

};



static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv,

static int adau1701_reset(struct snd_soc_component *component, unsigned int clkdiv,

	unsigned int rate)

{

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);

	int ret;



	sigmadsp_reset(adau1701->sigmadsp);
@@ -348,7 +348,7 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv, 
	if (clkdiv != ADAU1707_CLKDIV_UNSET) {

		ret = sigmadsp_setup(adau1701->sigmadsp, rate);

		if (ret) {

			dev_warn(codec->dev, "Failed to load firmware\n");

			dev_warn(component->dev, "Failed to load firmware\n");

			return ret;

		}

	}
@@ -362,10 +362,10 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv, 
	return 0;

}



static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec,

static int adau1701_set_capture_pcm_format(struct snd_soc_component *component,

					   struct snd_pcm_hw_params *params)

{

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);

	unsigned int mask = ADAU1701_SEROCTL_WORD_LEN_MASK;

	unsigned int val;
@@ -403,10 +403,10 @@ static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec, 
	return 0;

}



static int adau1701_set_playback_pcm_format(struct snd_soc_codec *codec,

static int adau1701_set_playback_pcm_format(struct snd_soc_component *component,

					    struct snd_pcm_hw_params *params)

{

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);

	unsigned int val;



	if (adau1701->dai_fmt != SND_SOC_DAIFMT_RIGHT_J)
@@ -435,8 +435,8 @@ static int adau1701_set_playback_pcm_format(struct snd_soc_codec *codec, 
static int adau1701_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 adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);

	unsigned int clkdiv = adau1701->sysclk / params_rate(params);

	unsigned int val;

	int ret;
@@ -447,7 +447,7 @@ static int adau1701_hw_params(struct snd_pcm_substream *substream, 
	 * firmware upload.

	 */

	if (clkdiv != adau1701->pll_clkdiv) {

		ret = adau1701_reset(codec, clkdiv, params_rate(params));

		ret = adau1701_reset(component, clkdiv, params_rate(params));

		if (ret < 0)

			return ret;

	}
@@ -470,16 +470,16 @@ static int adau1701_hw_params(struct snd_pcm_substream *substream, 
		ADAU1701_DSPCTRL_SR_MASK, val);



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

		return adau1701_set_playback_pcm_format(codec, params);

		return adau1701_set_playback_pcm_format(component, params);

	else

		return adau1701_set_capture_pcm_format(codec, params);

		return adau1701_set_capture_pcm_format(component, params);

}



static int adau1701_set_dai_fmt(struct snd_soc_dai *codec_dai,

		unsigned int fmt)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = codec_dai->component;

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);

	unsigned int serictl = 0x00, seroctl = 0x00;

	bool invert_lrclk;
@@ -548,11 +548,11 @@ static int adau1701_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	return 0;

}



static int adau1701_set_bias_level(struct snd_soc_codec *codec,

static int adau1701_set_bias_level(struct snd_soc_component *component,

		enum snd_soc_bias_level level)

{

	unsigned int mask = ADAU1701_AUXNPOW_VBPD | ADAU1701_AUXNPOW_VRPD;

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);



	switch (level) {

	case SND_SOC_BIAS_ON:
@@ -576,9 +576,9 @@ static int adau1701_set_bias_level(struct snd_soc_codec *codec, 


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

{

	struct snd_soc_codec *codec = dai->codec;

	struct snd_soc_component *component = dai->component;

	unsigned int mask = ADAU1701_DSPCTRL_DAM;

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);

	unsigned int val;



	if (mute)
@@ -591,11 +591,11 @@ static int adau1701_digital_mute(struct snd_soc_dai *dai, int mute) 
	return 0;

}



static int adau1701_set_sysclk(struct snd_soc_codec *codec, int clk_id,

static int adau1701_set_sysclk(struct snd_soc_component *component, int clk_id,

	int source, unsigned int freq, int dir)

{

	unsigned int val;

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);



	switch (clk_id) {

	case ADAU1701_CLK_SRC_OSC:
@@ -618,7 +618,7 @@ static int adau1701_set_sysclk(struct snd_soc_codec *codec, int clk_id, 
static int adau1701_startup(struct snd_pcm_substream *substream,

	struct snd_soc_dai *dai)

{

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(dai->codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(dai->component);



	return sigmadsp_restrict_params(adau1701->sigmadsp, substream);

}
@@ -664,20 +664,20 @@ static const struct of_device_id adau1701_dt_ids[] = { 
MODULE_DEVICE_TABLE(of, adau1701_dt_ids);

#endif



static int adau1701_probe(struct snd_soc_codec *codec)

static int adau1701_probe(struct snd_soc_component *component)

{

	int i, ret;

	unsigned int val;

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);



	ret = sigmadsp_attach(adau1701->sigmadsp, &codec->component);

	ret = sigmadsp_attach(adau1701->sigmadsp, component);

	if (ret)

		return ret;



	ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies),

				    adau1701->supplies);

	if (ret < 0) {

		dev_err(codec->dev, "Failed to enable regulators: %d\n", ret);

		dev_err(component->dev, "Failed to enable regulators: %d\n", ret);

		return ret;

	}
@@ -690,7 +690,7 @@ static int adau1701_probe(struct snd_soc_codec *codec) 
	adau1701->pll_clkdiv = ADAU1707_CLKDIV_UNSET;



	/* initalize with pre-configured pll mode settings */

	ret = adau1701_reset(codec, adau1701->pll_clkdiv, 0);

	ret = adau1701_reset(component, adau1701->pll_clkdiv, 0);

	if (ret < 0)

		goto exit_regulators_disable;
@@ -715,22 +715,20 @@ exit_regulators_disable: 
	return ret;

}



static int adau1701_remove(struct snd_soc_codec *codec)

static void adau1701_remove(struct snd_soc_component *component)

{

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);



	if (gpio_is_valid(adau1701->gpio_nreset))

		gpio_set_value_cansleep(adau1701->gpio_nreset, 0);



	regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies);



	return 0;

}



#ifdef CONFIG_PM

static int adau1701_suspend(struct snd_soc_codec *codec)

static int adau1701_suspend(struct snd_soc_component *component)

{

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);



	regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies),

			       adau1701->supplies);
@@ -738,42 +736,41 @@ static int adau1701_suspend(struct snd_soc_codec *codec) 
	return 0;

}



static int adau1701_resume(struct snd_soc_codec *codec)

static int adau1701_resume(struct snd_soc_component *component)

{

	struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);

	struct adau1701 *adau1701 = snd_soc_component_get_drvdata(component);

	int ret;



        ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies),

				    adau1701->supplies);

	if (ret < 0) {

		dev_err(codec->dev, "Failed to enable regulators: %d\n", ret);

		dev_err(component->dev, "Failed to enable regulators: %d\n", ret);

		return ret;

	}



	return adau1701_reset(codec, adau1701->pll_clkdiv, 0);

	return adau1701_reset(component, adau1701->pll_clkdiv, 0);

}

#else

#define adau1701_resume 	NULL

#define adau1701_suspend 	NULL

#endif /* CONFIG_PM */



static const struct snd_soc_codec_driver adau1701_codec_drv = {

static const struct snd_soc_component_driver adau1701_component_drv = {

	.probe			= adau1701_probe,

	.remove			= adau1701_remove,

	.resume			= adau1701_resume,

	.suspend		= adau1701_suspend,

	.set_bias_level		= adau1701_set_bias_level,

	.idle_bias_off		= true,



	.component_driver = {

	.controls		= adau1701_controls,

	.num_controls		= ARRAY_SIZE(adau1701_controls),

	.dapm_widgets		= adau1701_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(adau1701_dapm_widgets),

	.dapm_routes		= adau1701_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(adau1701_dapm_routes),

	},

	.set_sysclk		= adau1701_set_sysclk,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static const struct regmap_config adau1701_regmap = {
@@ -889,7 +886,8 @@ static int adau1701_i2c_probe(struct i2c_client *client, 
		goto exit_regulators_disable;

	}



	ret = snd_soc_register_codec(&client->dev, &adau1701_codec_drv,

	ret = devm_snd_soc_register_component(&client->dev,

			&adau1701_component_drv,

			&adau1701_dai, 1);



exit_regulators_disable:
@@ -898,12 +896,6 @@ exit_regulators_disable: 
	return ret;

}



static int adau1701_i2c_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);

	return 0;

}



static const struct i2c_device_id adau1701_i2c_id[] = {

	{ "adau1401", 0 },

	{ "adau1401a", 0 },
@@ -919,7 +911,6 @@ static struct i2c_driver adau1701_i2c_driver = { 
		.of_match_table	= of_match_ptr(adau1701_dt_ids),

	},

	.probe		= adau1701_i2c_probe,

	.remove		= adau1701_i2c_remove,

	.id_table	= adau1701_i2c_id,

};

sound/soc/codecs/adau1761.c

+45 −43
Original line number Diff line number Diff line
@@ -255,8 +255,8 @@ static const struct snd_kcontrol_new adau1761_input_mux_control = 
static int adau1761_dejitter_fixup(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 adau *adau = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	struct adau *adau = snd_soc_component_get_drvdata(component);



	/* After any power changes have been made the dejitter circuit

	 * has to be reinitialized. */
@@ -445,10 +445,10 @@ static const struct snd_soc_dapm_route adau1761_dapm_routes[] = { 
	{ "Digital Clock 1", NULL, "SYSCLK" },

};



static int adau1761_set_bias_level(struct snd_soc_codec *codec,

static int adau1761_set_bias_level(struct snd_soc_component *component,

				 enum snd_soc_bias_level level)

{

	struct adau *adau = snd_soc_codec_get_drvdata(codec);

	struct adau *adau = snd_soc_component_get_drvdata(component);



	switch (level) {

	case SND_SOC_BIAS_ON:
@@ -460,7 +460,7 @@ static int adau1761_set_bias_level(struct snd_soc_codec *codec, 
		regmap_update_bits(adau->regmap, ADAU17X1_CLOCK_CONTROL,

			ADAU17X1_CLOCK_CONTROL_SYSCLK_EN,

			ADAU17X1_CLOCK_CONTROL_SYSCLK_EN);

		if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF)

		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)

			regcache_sync(adau->regmap);

		break;

	case SND_SOC_BIAS_OFF:
@@ -474,9 +474,9 @@ static int adau1761_set_bias_level(struct snd_soc_codec *codec, 
}



static enum adau1761_output_mode adau1761_get_lineout_mode(

	struct snd_soc_codec *codec)

	struct snd_soc_component *component)

{

	struct adau1761_platform_data *pdata = codec->dev->platform_data;

	struct adau1761_platform_data *pdata = component->dev->platform_data;



	if (pdata)

		return pdata->lineout_mode;
@@ -484,11 +484,11 @@ static enum adau1761_output_mode adau1761_get_lineout_mode( 
	return ADAU1761_OUTPUT_MODE_LINE;

}



static int adau1761_setup_digmic_jackdetect(struct snd_soc_codec *codec)

static int adau1761_setup_digmic_jackdetect(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct adau1761_platform_data *pdata = codec->dev->platform_data;

	struct adau *adau = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct adau1761_platform_data *pdata = component->dev->platform_data;

	struct adau *adau = snd_soc_component_get_drvdata(component);

	enum adau1761_digmic_jackdet_pin_mode mode;

	unsigned int val = 0;

	int ret;
@@ -513,7 +513,7 @@ static int adau1761_setup_digmic_jackdetect(struct snd_soc_codec *codec) 
		if (pdata->jackdetect_active_low)

			val |= ADAU1761_DIGMIC_JACKDETECT_ACTIVE_LOW;



		ret = snd_soc_add_codec_controls(codec,

		ret = snd_soc_add_component_controls(component,

			adau1761_jack_detect_controls,

			ARRAY_SIZE(adau1761_jack_detect_controls));

		if (ret)
@@ -546,11 +546,11 @@ static int adau1761_setup_digmic_jackdetect(struct snd_soc_codec *codec) 
	return 0;

}



static int adau1761_setup_headphone_mode(struct snd_soc_codec *codec)

static int adau1761_setup_headphone_mode(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct adau *adau = snd_soc_codec_get_drvdata(codec);

	struct adau1761_platform_data *pdata = codec->dev->platform_data;

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct adau *adau = snd_soc_component_get_drvdata(component);

	struct adau1761_platform_data *pdata = component->dev->platform_data;

	enum adau1761_output_mode mode;

	int ret;
@@ -588,7 +588,7 @@ static int adau1761_setup_headphone_mode(struct snd_soc_codec *codec) 
			adau1761_capless_dapm_routes,

			ARRAY_SIZE(adau1761_capless_dapm_routes));

	} else {

		ret = snd_soc_add_codec_controls(codec, adau1761_mono_controls,

		ret = snd_soc_add_component_controls(component, adau1761_mono_controls,

			ARRAY_SIZE(adau1761_mono_controls));

		if (ret)

			return ret;
@@ -640,14 +640,14 @@ static bool adau1761_readable_register(struct device *dev, unsigned int reg) 
	return adau17x1_readable_register(dev, reg);

}



static int adau1761_codec_probe(struct snd_soc_codec *codec)

static int adau1761_component_probe(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct adau1761_platform_data *pdata = codec->dev->platform_data;

	struct adau *adau = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct adau1761_platform_data *pdata = component->dev->platform_data;

	struct adau *adau = snd_soc_component_get_drvdata(component);

	int ret;



	ret = adau17x1_add_widgets(codec);

	ret = adau17x1_add_widgets(component);

	if (ret < 0)

		return ret;
@@ -658,20 +658,20 @@ static int adau1761_codec_probe(struct snd_soc_codec *codec) 
		regmap_update_bits(adau->regmap, ADAU1761_RIGHT_DIFF_INPUT_VOL,

			ADAU1761_DIFF_INPUT_VOL_LDEN,

			ADAU1761_DIFF_INPUT_VOL_LDEN);

		ret = snd_soc_add_codec_controls(codec,

		ret = snd_soc_add_component_controls(component,

			adau1761_differential_mode_controls,

			ARRAY_SIZE(adau1761_differential_mode_controls));

		if (ret)

			return ret;

	} else {

		ret = snd_soc_add_codec_controls(codec,

		ret = snd_soc_add_component_controls(component,

			adau1761_single_mode_controls,

			ARRAY_SIZE(adau1761_single_mode_controls));

		if (ret)

			return ret;

	}



	switch (adau1761_get_lineout_mode(codec)) {

	switch (adau1761_get_lineout_mode(component)) {

	case ADAU1761_OUTPUT_MODE_LINE:

		break;

	case ADAU1761_OUTPUT_MODE_HEADPHONE:
@@ -686,11 +686,11 @@ static int adau1761_codec_probe(struct snd_soc_codec *codec) 
		return -EINVAL;

	}



	ret = adau1761_setup_headphone_mode(codec);

	ret = adau1761_setup_headphone_mode(component);

	if (ret)

		return ret;



	ret = adau1761_setup_digmic_jackdetect(codec);

	ret = adau1761_setup_digmic_jackdetect(component);

	if (ret)

		return ret;
@@ -706,27 +706,28 @@ static int adau1761_codec_probe(struct snd_soc_codec *codec) 
			return ret;

	}



	ret = adau17x1_add_routes(codec);

	ret = adau17x1_add_routes(component);

	if (ret < 0)

		return ret;



	return 0;

}



static const struct snd_soc_codec_driver adau1761_codec_driver = {

	.probe = adau1761_codec_probe,

static const struct snd_soc_component_driver adau1761_component_driver = {

	.probe			= adau1761_component_probe,

	.resume			= adau17x1_resume,

	.set_bias_level		= adau1761_set_bias_level,

	.suspend_bias_off = true,



	.component_driver = {

	.controls		= adau1761_controls,

	.num_controls		= ARRAY_SIZE(adau1761_controls),

	.dapm_widgets		= adau1x61_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(adau1x61_dapm_widgets),

	.dapm_routes		= adau1x61_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(adau1x61_dapm_routes),

	},

	.suspend_bias_off	= 1,

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



#define ADAU1761_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
@@ -793,7 +794,8 @@ int adau1761_probe(struct device *dev, struct regmap *regmap, 
	 * reaches standby and the core clock is enabled */

	regcache_cache_only(regmap, true);



	return snd_soc_register_codec(dev, &adau1761_codec_driver, dai_drv, 1);

	return devm_snd_soc_register_component(dev, &adau1761_component_driver,

					       dai_drv, 1);

}

EXPORT_SYMBOL_GPL(adau1761_probe);

sound/soc/codecs/adau1781.c

+26 −25
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ static const struct snd_kcontrol_new adau1781_mono_mixer_controls[] = { 
static int adau1781_dejitter_fixup(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 adau *adau = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	struct adau *adau = snd_soc_component_get_drvdata(component);



	/* After any power changes have been made the dejitter circuit

	 * has to be reinitialized. */
@@ -314,10 +314,10 @@ static const struct snd_soc_dapm_route adau1781_dmic_dapm_routes[] = { 
	{ "Right Decimator", NULL, "DMIC Select" },

};



static int adau1781_set_bias_level(struct snd_soc_codec *codec,

static int adau1781_set_bias_level(struct snd_soc_component *component,

		enum snd_soc_bias_level level)

{

	struct adau *adau = snd_soc_codec_get_drvdata(codec);

	struct adau *adau = snd_soc_component_get_drvdata(component);



	switch (level) {

	case SND_SOC_BIAS_ON:
@@ -380,14 +380,14 @@ static int adau1781_set_input_mode(struct adau *adau, unsigned int reg, 
		ADAU1781_INPUT_DIFFERNTIAL, val);

}



static int adau1781_codec_probe(struct snd_soc_codec *codec)

static int adau1781_component_probe(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct adau1781_platform_data *pdata = dev_get_platdata(codec->dev);

	struct adau *adau = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct adau1781_platform_data *pdata = dev_get_platdata(component->dev);

	struct adau *adau = snd_soc_component_get_drvdata(component);

	int ret;



	ret = adau17x1_add_widgets(codec);

	ret = adau17x1_add_widgets(component);

	if (ret)

		return ret;
@@ -419,27 +419,28 @@ static int adau1781_codec_probe(struct snd_soc_codec *codec) 
			return ret;

	}



	ret = adau17x1_add_routes(codec);

	ret = adau17x1_add_routes(component);

	if (ret < 0)

		return ret;



	return 0;

}



static const struct snd_soc_codec_driver adau1781_codec_driver = {

	.probe = adau1781_codec_probe,

static const struct snd_soc_component_driver adau1781_component_driver = {

	.probe			= adau1781_component_probe,

	.resume			= adau17x1_resume,

	.set_bias_level		= adau1781_set_bias_level,

	.suspend_bias_off = true,



	.component_driver = {

	.controls		= adau1781_controls,

	.num_controls		= ARRAY_SIZE(adau1781_controls),

	.dapm_widgets		= adau1781_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(adau1781_dapm_widgets),

	.dapm_routes		= adau1781_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(adau1781_dapm_routes),

	},

	.suspend_bias_off	= 1,

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



#define ADAU1781_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
@@ -498,7 +499,7 @@ int adau1781_probe(struct device *dev, struct regmap *regmap, 
	if (ret)

		return ret;



	return snd_soc_register_codec(dev, &adau1781_codec_driver,

	return devm_snd_soc_register_component(dev, &adau1781_component_driver,

		&adau1781_dai_driver, 1);

}

EXPORT_SYMBOL_GPL(adau1781_probe);

sound/soc/codecs/adau17x1.c

+34 −35

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE