Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8997' and... (4ac71d1b) · Commits · 戴 / test

sound/soc/codecs/wm8994.c

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -3993,6 +3993,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
	unsigned int reg;		unsigned int reg;
	int ret, i;		int ret, i;

			snd_soc_codec_init_regmap(codec, control->regmap);

	wm8994->hubs.codec = codec;		wm8994->hubs.codec = codec;

	mutex_init(&wm8994->accdet_lock);		mutex_init(&wm8994->accdet_lock);
	@@ -4434,19 +4436,11 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec)
	return 0;		return 0;
	}		}

	static struct regmap wm8994_get_regmap(struct device dev)
	{
	struct wm8994 *control = dev_get_drvdata(dev->parent);

	return control->regmap;
	}

	static const struct snd_soc_codec_driver soc_codec_dev_wm8994 = {		static const struct snd_soc_codec_driver soc_codec_dev_wm8994 = {
	.probe = wm8994_codec_probe,		.probe = wm8994_codec_probe,
	.remove = wm8994_codec_remove,		.remove = wm8994_codec_remove,
	.suspend = wm8994_codec_suspend,		.suspend = wm8994_codec_suspend,
	.resume = wm8994_codec_resume,		.resume = wm8994_codec_resume,
	.get_regmap = wm8994_get_regmap,
	.set_bias_level = wm8994_set_bias_level,		.set_bias_level = wm8994_set_bias_level,
	};		};

+3 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1062,8 +1062,11 @@ static int wm8997_codec_probe(struct snd_soc_codec *codec)
	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);		struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);		struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
	struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);		struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);
			struct arizona *arizona = priv->core.arizona;
	int ret;		int ret;

			snd_soc_codec_init_regmap(codec, arizona->regmap);

	ret = arizona_init_spk(codec);		ret = arizona_init_spk(codec);
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;
	@@ -1095,17 +1098,9 @@ static unsigned int wm8997_digital_vu[] = {
	ARIZONA_DAC_DIGITAL_VOLUME_5R,		ARIZONA_DAC_DIGITAL_VOLUME_5R,
	};		};

	static struct regmap wm8997_get_regmap(struct device dev)
	{
	struct wm8997_priv *priv = dev_get_drvdata(dev);

	return priv->core.arizona->regmap;
	}

	static const struct snd_soc_codec_driver soc_codec_dev_wm8997 = {		static const struct snd_soc_codec_driver soc_codec_dev_wm8997 = {
	.probe = wm8997_codec_probe,		.probe = wm8997_codec_probe,
	.remove = wm8997_codec_remove,		.remove = wm8997_codec_remove,
	.get_regmap = wm8997_get_regmap,

	.idle_bias_off = true,		.idle_bias_off = true,

+3 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1275,9 +1275,11 @@ static int wm8998_codec_probe(struct snd_soc_codec *codec)
	struct wm8998_priv *priv = snd_soc_codec_get_drvdata(codec);		struct wm8998_priv *priv = snd_soc_codec_get_drvdata(codec);
	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);		struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);		struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
			struct arizona *arizona = priv->core.arizona;
	int ret;		int ret;

	priv->core.arizona->dapm = dapm;		arizona->dapm = dapm;
			snd_soc_codec_init_regmap(codec, arizona->regmap);

	ret = arizona_init_spk(codec);		ret = arizona_init_spk(codec);
	if (ret < 0)		if (ret < 0)
	@@ -1313,17 +1315,9 @@ static unsigned int wm8998_digital_vu[] = {
	ARIZONA_DAC_DIGITAL_VOLUME_5R,		ARIZONA_DAC_DIGITAL_VOLUME_5R,
	};		};

	static struct regmap wm8998_get_regmap(struct device dev)
	{
	struct wm8998_priv *priv = dev_get_drvdata(dev);

	return priv->core.arizona->regmap;
	}

	static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = {		static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
	.probe = wm8998_codec_probe,		.probe = wm8998_codec_probe,
	.remove = wm8998_codec_remove,		.remove = wm8998_codec_remove,
	.get_regmap = wm8998_get_regmap,

	.idle_bias_off = true,		.idle_bias_off = true,