Merge remote-tracking branches 'asoc/topic/wm8728', 'asoc/topic/wm8731',... (179ef216) · Commits · e / devices / android_kernel_teracube_emerald

sound/soc/codecs/wm8728.c

+34 −48

Original line number	Diff line number	Diff line
		@@ -74,13 +74,13 @@ static const struct snd_soc_dapm_route wm8728_intercon[] = {

		static int wm8728_mute(struct snd_soc_dai *dai, int mute)
		{
		struct snd_soc_codec *codec = dai->codec;
		u16 mute_reg = snd_soc_read(codec, WM8728_DACCTL);
		struct snd_soc_component *component = dai->component;
		u16 mute_reg = snd_soc_component_read32(component, WM8728_DACCTL);

		if (mute)
		snd_soc_write(codec, WM8728_DACCTL, mute_reg \| 1);
		snd_soc_component_write(component, WM8728_DACCTL, mute_reg \| 1);
		else
		snd_soc_write(codec, WM8728_DACCTL, mute_reg & ~1);
		snd_soc_component_write(component, WM8728_DACCTL, mute_reg & ~1);

		return 0;
		}
		@@ -89,8 +89,8 @@ static int wm8728_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;
		u16 dac = snd_soc_read(codec, WM8728_DACCTL);
		struct snd_soc_component *component = dai->component;
		u16 dac = snd_soc_component_read32(component, WM8728_DACCTL);

		dac &= ~0x18;

		@@ -107,7 +107,7 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream,
		return -EINVAL;
		}

		snd_soc_write(codec, WM8728_DACCTL, dac);
		snd_soc_component_write(component, WM8728_DACCTL, dac);

		return 0;
		}
		@@ -115,8 +115,8 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream,
		static int wm8728_set_dai_fmt(struct snd_soc_dai *codec_dai,
		unsigned int fmt)
		{
		struct snd_soc_codec *codec = codec_dai->codec;
		u16 iface = snd_soc_read(codec, WM8728_IFCTL);
		struct snd_soc_component *component = codec_dai->component;
		u16 iface = snd_soc_component_read32(component, WM8728_IFCTL);

		/* Currently only I2S is supported by the driver, though the
		* hardware is more flexible.
		@@ -156,24 +156,24 @@ static int wm8728_set_dai_fmt(struct snd_soc_dai *codec_dai,
		return -EINVAL;
		}

		snd_soc_write(codec, WM8728_IFCTL, iface);
		snd_soc_component_write(component, WM8728_IFCTL, iface);
		return 0;
		}

		static int wm8728_set_bias_level(struct snd_soc_codec *codec,
		static int wm8728_set_bias_level(struct snd_soc_component *component,
		enum snd_soc_bias_level level)
		{
		struct wm8728_priv *wm8728 = snd_soc_codec_get_drvdata(codec);
		struct wm8728_priv *wm8728 = snd_soc_component_get_drvdata(component);
		u16 reg;

		switch (level) {
		case SND_SOC_BIAS_ON:
		case SND_SOC_BIAS_PREPARE:
		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) {
		/* Power everything up... */
		reg = snd_soc_read(codec, WM8728_DACCTL);
		snd_soc_write(codec, WM8728_DACCTL, reg & ~0x4);
		reg = snd_soc_component_read32(component, WM8728_DACCTL);
		snd_soc_component_write(component, WM8728_DACCTL, reg & ~0x4);

		/* ..then sync in the register cache. */
		regcache_sync(wm8728->regmap);
		@@ -181,8 +181,8 @@ static int wm8728_set_bias_level(struct snd_soc_codec *codec,
		break;

		case SND_SOC_BIAS_OFF:
		reg = snd_soc_read(codec, WM8728_DACCTL);
		snd_soc_write(codec, WM8728_DACCTL, reg \| 0x4);
		reg = snd_soc_component_read32(component, WM8728_DACCTL);
		snd_soc_component_write(component, WM8728_DACCTL, reg \| 0x4);
		break;
		}
		return 0;
		@@ -211,18 +211,19 @@ static struct snd_soc_dai_driver wm8728_dai = {
		.ops = &wm8728_dai_ops,
		};

		static const struct snd_soc_codec_driver soc_codec_dev_wm8728 = {
		static const struct snd_soc_component_driver soc_component_dev_wm8728 = {
		.set_bias_level = wm8728_set_bias_level,
		.suspend_bias_off = true,

		.component_driver = {
		.controls = wm8728_snd_controls,
		.num_controls = ARRAY_SIZE(wm8728_snd_controls),
		.dapm_widgets = wm8728_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets),
		.dapm_routes = wm8728_intercon,
		.num_dapm_routes = ARRAY_SIZE(wm8728_intercon),
		},
		.suspend_bias_off = 1,
		.idle_bias_on = 1,
		.use_pmdown_time = 1,
		.endianness = 1,
		.non_legacy_dai_naming = 1,
		};

		static const struct of_device_id wm8728_of_match[] = {
		@@ -258,26 +259,18 @@ static int wm8728_spi_probe(struct spi_device *spi)

		spi_set_drvdata(spi, wm8728);

		ret = snd_soc_register_codec(&spi->dev,
		&soc_codec_dev_wm8728, &wm8728_dai, 1);
		ret = devm_snd_soc_register_component(&spi->dev,
		&soc_component_dev_wm8728, &wm8728_dai, 1);

		return ret;
		}

		static int wm8728_spi_remove(struct spi_device *spi)
		{
		snd_soc_unregister_codec(&spi->dev);

		return 0;
		}

		static struct spi_driver wm8728_spi_driver = {
		.driver = {
		.name = "wm8728",
		.of_match_table = wm8728_of_match,
		},
		.probe = wm8728_spi_probe,
		.remove = wm8728_spi_remove,
		};
		#endif /* CONFIG_SPI_MASTER */

		@@ -299,18 +292,12 @@ static int wm8728_i2c_probe(struct i2c_client *i2c,

		i2c_set_clientdata(i2c, wm8728);

		ret = snd_soc_register_codec(&i2c->dev,
		&soc_codec_dev_wm8728, &wm8728_dai, 1);
		ret = devm_snd_soc_register_component(&i2c->dev,
		&soc_component_dev_wm8728, &wm8728_dai, 1);

		return ret;
		}

		static int wm8728_i2c_remove(struct i2c_client *client)
		{
		snd_soc_unregister_codec(&client->dev);
		return 0;
		}

		static const struct i2c_device_id wm8728_i2c_id[] = {
		{ "wm8728", 0 },
		{ }
		@@ -323,7 +310,6 @@ static struct i2c_driver wm8728_i2c_driver = {
		.of_match_table = wm8728_of_match,
		},
		.probe = wm8728_i2c_probe,
		.remove = wm8728_i2c_remove,
		.id_table = wm8728_i2c_id,
		};
		#endif

sound/soc/codecs/wm8731.c

+50 −51

Original line number	Diff line number	Diff line
		@@ -88,9 +88,9 @@ static SOC_ENUM_SINGLE_DECL(wm8731_insel_enum,

		static int wm8731_deemph[] = { 0, 32000, 44100, 48000 };

		static int wm8731_set_deemph(struct snd_soc_codec *codec)
		static int wm8731_set_deemph(struct snd_soc_component *component)
		{
		struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
		struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
		int val, i, best;

		/* If we're using deemphasis select the nearest available sample
		@@ -110,17 +110,17 @@ static int wm8731_set_deemph(struct snd_soc_codec *codec)
		val = 0;
		}

		dev_dbg(codec->dev, "Set deemphasis %d (%dHz)\n",
		dev_dbg(component->dev, "Set deemphasis %d (%dHz)\n",
		best, wm8731_deemph[best]);

		return snd_soc_update_bits(codec, WM8731_APDIGI, 0x6, val);
		return snd_soc_component_update_bits(component, WM8731_APDIGI, 0x6, val);
		}

		static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
		struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
		struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);

		ucontrol->value.integer.value[0] = wm8731->deemph;

		@@ -130,8 +130,8 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
		static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
		struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
		struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
		unsigned int deemph = ucontrol->value.integer.value[0];
		int ret = 0;

		@@ -142,7 +142,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
		if (wm8731->deemph != deemph) {
		wm8731->deemph = deemph;

		wm8731_set_deemph(codec);
		wm8731_set_deemph(component);

		ret = 1;
		}
		@@ -214,8 +214,8 @@ SND_SOC_DAPM_INPUT("LLINEIN"),
		static int wm8731_check_osc(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 wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);
		struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);

		return wm8731->sysclk_type == WM8731_SYSCLK_XTAL;
		}
		@@ -337,16 +337,16 @@ static int wm8731_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 wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
		u16 iface = snd_soc_read(codec, WM8731_IFACE) & 0xfff3;
		struct snd_soc_component *component = dai->component;
		struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
		u16 iface = snd_soc_component_read32(component, WM8731_IFACE) & 0xfff3;
		int i = get_coeff(wm8731->sysclk, params_rate(params));
		u16 srate = (coeff_div[i].sr << 2) \|
		(coeff_div[i].bosr << 1) \| coeff_div[i].usb;

		wm8731->playback_fs = params_rate(params);

		snd_soc_write(codec, WM8731_SRATE, srate);
		snd_soc_component_write(component, WM8731_SRATE, srate);

		/* bit size */
		switch (params_width(params)) {
		@@ -363,30 +363,30 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream,
		break;
		}

		wm8731_set_deemph(codec);
		wm8731_set_deemph(component);

		snd_soc_write(codec, WM8731_IFACE, iface);
		snd_soc_component_write(component, WM8731_IFACE, iface);
		return 0;
		}

		static int wm8731_mute(struct snd_soc_dai *dai, int mute)
		{
		struct snd_soc_codec *codec = dai->codec;
		u16 mute_reg = snd_soc_read(codec, WM8731_APDIGI) & 0xfff7;
		struct snd_soc_component *component = dai->component;
		u16 mute_reg = snd_soc_component_read32(component, WM8731_APDIGI) & 0xfff7;

		if (mute)
		snd_soc_write(codec, WM8731_APDIGI, mute_reg \| 0x8);
		snd_soc_component_write(component, WM8731_APDIGI, mute_reg \| 0x8);
		else
		snd_soc_write(codec, WM8731_APDIGI, mute_reg);
		snd_soc_component_write(component, WM8731_APDIGI, mute_reg);
		return 0;
		}

		static int wm8731_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 snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
		struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = codec_dai->component;
		struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
		struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);

		switch (clk_id) {
		case WM8731_SYSCLK_XTAL:
		@@ -429,7 +429,7 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
		static int wm8731_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;
		u16 iface = 0;

		/* set master/slave audio interface */
		@@ -481,14 +481,14 @@ static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai,
		}

		/* set iface */
		snd_soc_write(codec, WM8731_IFACE, iface);
		snd_soc_component_write(component, WM8731_IFACE, iface);
		return 0;
		}

		static int wm8731_set_bias_level(struct snd_soc_codec *codec,
		static int wm8731_set_bias_level(struct snd_soc_component *component,
		enum snd_soc_bias_level level)
		{
		struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
		struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
		int ret;
		u16 reg;

		@@ -503,7 +503,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
		case SND_SOC_BIAS_PREPARE:
		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) {
		ret = regulator_bulk_enable(ARRAY_SIZE(wm8731->supplies),
		wm8731->supplies);
		if (ret != 0)
		@@ -513,13 +513,13 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
		}

		/* Clear PWROFF, gate CLKOUT, everything else as-is */
		reg = snd_soc_read(codec, WM8731_PWR) & 0xff7f;
		snd_soc_write(codec, WM8731_PWR, reg \| 0x0040);
		reg = snd_soc_component_read32(component, WM8731_PWR) & 0xff7f;
		snd_soc_component_write(component, WM8731_PWR, reg \| 0x0040);
		break;
		case SND_SOC_BIAS_OFF:
		if (wm8731->mclk)
		clk_disable_unprepare(wm8731->mclk);
		snd_soc_write(codec, WM8731_PWR, 0xffff);
		snd_soc_component_write(component, WM8731_PWR, 0xffff);
		regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),
		wm8731->supplies);
		regcache_mark_dirty(wm8731->regmap);
		@@ -531,7 +531,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
		static int wm8731_startup(struct snd_pcm_substream *substream,
		struct snd_soc_dai *dai)
		{
		struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(dai->codec);
		struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(dai->component);

		if (wm8731->constraints)
		snd_pcm_hw_constraint_list(substream->runtime, 0,
		@@ -628,18 +628,19 @@ static int wm8731_hw_init(struct device dev, struct wm8731_priv wm8731)
		return ret;
		}

		static const struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
		static const struct snd_soc_component_driver soc_component_dev_wm8731 = {
		.set_bias_level = wm8731_set_bias_level,
		.suspend_bias_off = true,

		.component_driver = {
		.controls = wm8731_snd_controls,
		.num_controls = ARRAY_SIZE(wm8731_snd_controls),
		.dapm_widgets = wm8731_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
		.dapm_routes = wm8731_intercon,
		.num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
		},
		.suspend_bias_off = 1,
		.idle_bias_on = 1,
		.use_pmdown_time = 1,
		.endianness = 1,
		.non_legacy_dai_naming = 1,
		};

		static const struct of_device_id wm8731_of_match[] = {
		@@ -704,8 +705,8 @@ static int wm8731_spi_probe(struct spi_device *spi)
		if (ret != 0)
		return ret;

		ret = snd_soc_register_codec(&spi->dev,
		&soc_codec_dev_wm8731, &wm8731_dai, 1);
		ret = devm_snd_soc_register_component(&spi->dev,
		&soc_component_dev_wm8731, &wm8731_dai, 1);
		if (ret != 0) {
		dev_err(&spi->dev, "Failed to register CODEC: %d\n", ret);
		return ret;
		@@ -716,7 +717,6 @@ static int wm8731_spi_probe(struct spi_device *spi)

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

		@@ -775,8 +775,8 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
		if (ret != 0)
		return ret;

		ret = snd_soc_register_codec(&i2c->dev,
		&soc_codec_dev_wm8731, &wm8731_dai, 1);
		ret = devm_snd_soc_register_component(&i2c->dev,
		&soc_component_dev_wm8731, &wm8731_dai, 1);
		if (ret != 0) {
		dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
		return ret;
		@@ -787,7 +787,6 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,

		static int wm8731_i2c_remove(struct i2c_client *client)
		{
		snd_soc_unregister_codec(&client->dev);
		return 0;
		}

sound/soc/codecs/wm8737.c

+47 −62

Original line number	Diff line number	Diff line
		@@ -74,9 +74,9 @@ static bool wm8737_volatile(struct device *dev, unsigned int reg)
		}
		}

		static int wm8737_reset(struct snd_soc_codec *codec)
		static int wm8737_reset(struct snd_soc_component *component)
		{
		return snd_soc_write(codec, WM8737_RESET, 0);
		return snd_soc_component_write(component, WM8737_RESET, 0);
		}

		static const DECLARE_TLV_DB_RANGE(micboost_tlv,
		@@ -328,8 +328,8 @@ static int wm8737_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 wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = dai->component;
		struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component);
		int i;
		u16 clocking = 0;
		u16 af = 0;
		@@ -348,7 +348,7 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream,
		}

		if (i == ARRAY_SIZE(coeff_div)) {
		dev_err(codec->dev, "%dHz MCLK can't support %dHz\n",
		dev_err(component->dev, "%dHz MCLK can't support %dHz\n",
		wm8737->mclk, params_rate(params));
		return -EINVAL;
		}
		@@ -371,8 +371,8 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream,
		return -EINVAL;
		}

		snd_soc_update_bits(codec, WM8737_AUDIO_FORMAT, WM8737_WL_MASK, af);
		snd_soc_update_bits(codec, WM8737_CLOCKING,
		snd_soc_component_update_bits(component, WM8737_AUDIO_FORMAT, WM8737_WL_MASK, af);
		snd_soc_component_update_bits(component, WM8737_CLOCKING,
		WM8737_USB_MODE \| WM8737_CLKDIV2 \| WM8737_SR_MASK,
		clocking);

		@@ -382,8 +382,8 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream,
		static int wm8737_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 wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec);
		struct snd_soc_component *component = codec_dai->component;
		struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component);
		int i;

		for (i = 0; i < ARRAY_SIZE(coeff_div); i++) {
		@@ -394,7 +394,7 @@ static int wm8737_set_dai_sysclk(struct snd_soc_dai *codec_dai,
		}
		}

		dev_err(codec->dev, "MCLK rate %dHz not supported\n", freq);
		dev_err(component->dev, "MCLK rate %dHz not supported\n", freq);

		return -EINVAL;
		}
		@@ -403,7 +403,7 @@ static int wm8737_set_dai_sysclk(struct snd_soc_dai *codec_dai,
		static int wm8737_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;
		u16 af = 0;

		switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
		@@ -445,16 +445,16 @@ static int wm8737_set_dai_fmt(struct snd_soc_dai *codec_dai,
		return -EINVAL;
		}

		snd_soc_update_bits(codec, WM8737_AUDIO_FORMAT,
		snd_soc_component_update_bits(component, WM8737_AUDIO_FORMAT,
		WM8737_FORMAT_MASK \| WM8737_LRP \| WM8737_MS, af);

		return 0;
		}

		static int wm8737_set_bias_level(struct snd_soc_codec *codec,
		static int wm8737_set_bias_level(struct snd_soc_component *component,
		enum snd_soc_bias_level level)
		{
		struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec);
		struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component);
		int ret;

		switch (level) {
		@@ -463,16 +463,16 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,

		case SND_SOC_BIAS_PREPARE:
		/* VMID at 275k /
		snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
		snd_soc_component_update_bits(component, WM8737_MISC_BIAS_CONTROL,
		WM8737_VMIDSEL_MASK, 0);
		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) {
		ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies),
		wm8737->supplies);
		if (ret != 0) {
		dev_err(codec->dev,
		dev_err(component->dev,
		"Failed to enable supplies: %d\n",
		ret);
		return ret;
		@@ -481,12 +481,12 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
		regcache_sync(wm8737->regmap);

		/* Fast VMID ramp at 22.5k /
		snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
		snd_soc_component_update_bits(component, WM8737_MISC_BIAS_CONTROL,
		WM8737_VMIDSEL_MASK,
		2 << WM8737_VMIDSEL_SHIFT);

		/* Bring VMID up */
		snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT,
		snd_soc_component_update_bits(component, WM8737_POWER_MANAGEMENT,
		WM8737_VMID_MASK \|
		WM8737_VREF_MASK,
		WM8737_VMID_MASK \|
		@@ -496,14 +496,14 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
		}

		/* VMID at 2300k /
		snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
		snd_soc_component_update_bits(component, WM8737_MISC_BIAS_CONTROL,
		WM8737_VMIDSEL_MASK,
		1 << WM8737_VMIDSEL_SHIFT);

		break;

		case SND_SOC_BIAS_OFF:
		snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT,
		snd_soc_component_update_bits(component, WM8737_POWER_MANAGEMENT,
		WM8737_VMID_MASK \| WM8737_VREF_MASK, 0);

		regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies),
		@@ -537,30 +537,30 @@ static struct snd_soc_dai_driver wm8737_dai = {
		.ops = &wm8737_dai_ops,
		};

		static int wm8737_probe(struct snd_soc_codec *codec)
		static int wm8737_probe(struct snd_soc_component *component)
		{
		struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec);
		struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component);
		int ret;

		ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies),
		wm8737->supplies);
		if (ret != 0) {
		dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
		dev_err(component->dev, "Failed to enable supplies: %d\n", ret);
		goto err_get;
		}

		ret = wm8737_reset(codec);
		ret = wm8737_reset(component);
		if (ret < 0) {
		dev_err(codec->dev, "Failed to issue reset\n");
		dev_err(component->dev, "Failed to issue reset\n");
		goto err_enable;
		}

		snd_soc_update_bits(codec, WM8737_LEFT_PGA_VOLUME, WM8737_LVU,
		snd_soc_component_update_bits(component, WM8737_LEFT_PGA_VOLUME, WM8737_LVU,
		WM8737_LVU);
		snd_soc_update_bits(codec, WM8737_RIGHT_PGA_VOLUME, WM8737_RVU,
		snd_soc_component_update_bits(component, WM8737_RIGHT_PGA_VOLUME, WM8737_RVU,
		WM8737_RVU);

		snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY);
		snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);

		/* Bias level configuration will have done an extra enable */
		regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies), wm8737->supplies);
		@@ -573,19 +573,20 @@ static int wm8737_probe(struct snd_soc_codec *codec)
		return ret;
		}

		static const struct snd_soc_codec_driver soc_codec_dev_wm8737 = {
		static const struct snd_soc_component_driver soc_component_dev_wm8737 = {
		.probe = wm8737_probe,
		.set_bias_level = wm8737_set_bias_level,
		.suspend_bias_off = true,

		.component_driver = {
		.controls = wm8737_snd_controls,
		.num_controls = ARRAY_SIZE(wm8737_snd_controls),
		.dapm_widgets = wm8737_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(wm8737_dapm_widgets),
		.dapm_routes = intercon,
		.num_dapm_routes = ARRAY_SIZE(intercon),
		},
		.suspend_bias_off = 1,
		.idle_bias_on = 1,
		.use_pmdown_time = 1,
		.endianness = 1,
		.non_legacy_dai_naming = 1,
		};

		static const struct of_device_id wm8737_of_match[] = {
		@@ -635,20 +636,13 @@ static int wm8737_i2c_probe(struct i2c_client *i2c,

		i2c_set_clientdata(i2c, wm8737);

		ret = snd_soc_register_codec(&i2c->dev,
		&soc_codec_dev_wm8737, &wm8737_dai, 1);
		ret = devm_snd_soc_register_component(&i2c->dev,
		&soc_component_dev_wm8737, &wm8737_dai, 1);

		return ret;

		}

		static int wm8737_i2c_remove(struct i2c_client *client)
		{
		snd_soc_unregister_codec(&client->dev);

		return 0;
		}

		static const struct i2c_device_id wm8737_i2c_id[] = {
		{ "wm8737", 0 },
		{ }
		@@ -661,7 +655,6 @@ static struct i2c_driver wm8737_i2c_driver = {
		.of_match_table = wm8737_of_match,
		},
		.probe = wm8737_i2c_probe,
		.remove = wm8737_i2c_remove,
		.id_table = wm8737_i2c_id,
		};
		#endif
		@@ -693,26 +686,18 @@ static int wm8737_spi_probe(struct spi_device *spi)

		spi_set_drvdata(spi, wm8737);

		ret = snd_soc_register_codec(&spi->dev,
		&soc_codec_dev_wm8737, &wm8737_dai, 1);
		ret = devm_snd_soc_register_component(&spi->dev,
		&soc_component_dev_wm8737, &wm8737_dai, 1);

		return ret;
		}

		static int wm8737_spi_remove(struct spi_device *spi)
		{
		snd_soc_unregister_codec(&spi->dev);

		return 0;
		}

		static struct spi_driver wm8737_spi_driver = {
		.driver = {
		.name = "wm8737",
		.of_match_table = wm8737_of_match,
		},
		.probe = wm8737_spi_probe,
		.remove = wm8737_spi_remove,
		};
		#endif /* CONFIG_SPI_MASTER */

sound/soc/codecs/wm8741.c

+59 −74

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wm8750.c

+51 −64

File changed.

Preview size limit exceeded, changes collapsed.