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

Unverified Commit 683adc82 authored Jan 29, 2018 by Kuninori Morimoto Committed by Mark Brown Feb 12, 2018

ASoC: ad1836: 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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 7928b2cb

sound/soc/codecs/ad1836.c

+31 −37

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params,
		struct snd_soc_dai *dai)
		{
		struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(dai->codec);
		struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(dai->component);
		int word_len = 0;

		/* bit size */
		@@ -228,17 +228,17 @@ static struct snd_soc_dai_driver ad183x_dais[] = {
		};

		#ifdef CONFIG_PM
		static int ad1836_suspend(struct snd_soc_codec *codec)
		static int ad1836_suspend(struct snd_soc_component *component)
		{
		struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec);
		struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component);
		/* reset clock control mode */
		return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2,
		AD1836_ADC_SERFMT_MASK, 0);
		}

		static int ad1836_resume(struct snd_soc_codec *codec)
		static int ad1836_resume(struct snd_soc_component *component)
		{
		struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec);
		struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component);
		/* restore clock control mode */
		return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2,
		AD1836_ADC_SERFMT_MASK, AD1836_ADC_AUX);
		@@ -248,10 +248,10 @@ static int ad1836_resume(struct snd_soc_codec *codec)
		#define ad1836_resume NULL
		#endif

		static int ad1836_probe(struct snd_soc_codec *codec)
		static int ad1836_probe(struct snd_soc_component *component)
		{
		struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
		struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component);
		struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
		int num_dacs, num_adcs;
		int ret = 0;
		int i;
		@@ -277,7 +277,7 @@ static int ad1836_probe(struct snd_soc_codec *codec)
		if (ad1836->type == AD1836) {
		/* left/right diff:PGA/MUX */
		regmap_write(ad1836->regmap, AD1836_ADC_CTRL3, 0x3A);
		ret = snd_soc_add_codec_controls(codec, ad1836_controls,
		ret = snd_soc_add_component_controls(component, ad1836_controls,
		ARRAY_SIZE(ad1836_controls));
		if (ret)
		return ret;
		@@ -285,11 +285,11 @@ static int ad1836_probe(struct snd_soc_codec *codec)
		regmap_write(ad1836->regmap, AD1836_ADC_CTRL3, 0x00);
		}

		ret = snd_soc_add_codec_controls(codec, ad183x_dac_controls, num_dacs * 2);
		ret = snd_soc_add_component_controls(component, ad183x_dac_controls, num_dacs * 2);
		if (ret)
		return ret;

		ret = snd_soc_add_codec_controls(codec, ad183x_adc_controls, num_adcs);
		ret = snd_soc_add_component_controls(component, ad183x_adc_controls, num_adcs);
		if (ret)
		return ret;

		@@ -313,28 +313,29 @@ static int ad1836_probe(struct snd_soc_codec *codec)
		}

		/* power down chip */
		static int ad1836_remove(struct snd_soc_codec *codec)
		static void ad1836_remove(struct snd_soc_component *component)
		{
		struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec);
		struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component);
		/* reset clock control mode */
		return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2,
		regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2,
		AD1836_ADC_SERFMT_MASK, 0);
		}

		static const struct snd_soc_codec_driver soc_codec_dev_ad1836 = {
		static const struct snd_soc_component_driver soc_component_dev_ad1836 = {
		.probe = ad1836_probe,
		.remove = ad1836_remove,
		.suspend = ad1836_suspend,
		.resume = ad1836_resume,

		.component_driver = {
		.controls = ad183x_controls,
		.num_controls = ARRAY_SIZE(ad183x_controls),
		.dapm_widgets = ad183x_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(ad183x_dapm_widgets),
		.dapm_routes = ad183x_dapm_routes,
		.num_dapm_routes = ARRAY_SIZE(ad183x_dapm_routes),
		},
		.idle_bias_on = 1,
		.use_pmdown_time = 1,
		.endianness = 1,
		.non_legacy_dai_naming = 1,
		};

		static const struct reg_default ad1836_reg_defaults[] = {
		@@ -382,17 +383,11 @@ static int ad1836_spi_probe(struct spi_device *spi)

		spi_set_drvdata(spi, ad1836);

		ret = snd_soc_register_codec(&spi->dev,
		&soc_codec_dev_ad1836, &ad183x_dais[ad1836->type], 1);
		ret = devm_snd_soc_register_component(&spi->dev,
		&soc_component_dev_ad1836, &ad183x_dais[ad1836->type], 1);
		return ret;
		}

		static int ad1836_spi_remove(struct spi_device *spi)
		{
		snd_soc_unregister_codec(&spi->dev);
		return 0;
		}

		static const struct spi_device_id ad1836_ids[] = {
		{ "ad1835", AD1835 },
		{ "ad1836", AD1836 },
		@@ -408,7 +403,6 @@ static struct spi_driver ad1836_spi_driver = {
		.name = "ad1836",
		},
		.probe = ad1836_spi_probe,
		.remove = ad1836_spi_remove,
		.id_table = ad1836_ids,
		};