ASoC: es7134: correct required power supplies (30ddfffd) · Commits · 戴 / test

sound/soc/codecs/es7134.c

+41 −3

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,10 @@ struct es7134_clock_mode {
	struct es7134_chip {		struct es7134_chip {
	const struct es7134_clock_mode *modes;		const struct es7134_clock_mode *modes;
	unsigned int mode_num;		unsigned int mode_num;
			const struct snd_soc_dapm_widget *extra_widgets;
			unsigned int extra_widget_num;
			const struct snd_soc_dapm_route *extra_routes;
			unsigned int extra_route_num;
	};		};

	struct es7134_data {		struct es7134_data {
	@@ -110,6 +114,34 @@ static int es7134_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
	return 0;		return 0;
	}		}

			static int es7134_component_probe(struct snd_soc_component *c)
			{
			struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(c);
			struct es7134_data *priv = snd_soc_component_get_drvdata(c);
			const struct es7134_chip *chip = priv->chip;
			int ret;

			if (chip->extra_widget_num) {
			ret = snd_soc_dapm_new_controls(dapm, chip->extra_widgets,
			chip->extra_widget_num);
			if (ret) {
			dev_err(c->dev, "failed to add extra widgets\n");
			return ret;
			}
			}

			if (chip->extra_route_num) {
			ret = snd_soc_dapm_add_routes(dapm, chip->extra_routes,
			chip->extra_route_num);
			if (ret) {
			dev_err(c->dev, "failed to add extra routes\n");
			return ret;
			}
			}

			return 0;
			}

	static const struct snd_soc_dai_ops es7134_dai_ops = {		static const struct snd_soc_dai_ops es7134_dai_ops = {
	.set_fmt = es7134_set_fmt,		.set_fmt = es7134_set_fmt,
	.hw_params = es7134_hw_params,		.hw_params = es7134_hw_params,
	@@ -158,9 +190,16 @@ static const struct es7134_clock_mode es7134_modes[] = {
	},		},
	};		};

			/* Digital I/O are also supplied by VDD on the es7134 */
			static const struct snd_soc_dapm_route es7134_extra_routes[] = {
			{ "Playback", NULL, "VDD", }
			};

	static const struct es7134_chip es7134_chip = {		static const struct es7134_chip es7134_chip = {
	.modes = es7134_modes,		.modes = es7134_modes,
	.mode_num = ARRAY_SIZE(es7134_modes),		.mode_num = ARRAY_SIZE(es7134_modes),
			.extra_routes = es7134_extra_routes,
			.extra_route_num = ARRAY_SIZE(es7134_extra_routes),
	};		};

	static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {		static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {
	@@ -168,17 +207,16 @@ static const struct snd_soc_dapm_widget es7134_dapm_widgets[] = {
	SND_SOC_DAPM_OUTPUT("AOUTR"),		SND_SOC_DAPM_OUTPUT("AOUTR"),
	SND_SOC_DAPM_DAC("DAC", "Playback", SND_SOC_NOPM, 0, 0),		SND_SOC_DAPM_DAC("DAC", "Playback", SND_SOC_NOPM, 0, 0),
	SND_SOC_DAPM_REGULATOR_SUPPLY("VDD", 0, 0),		SND_SOC_DAPM_REGULATOR_SUPPLY("VDD", 0, 0),
	SND_SOC_DAPM_REGULATOR_SUPPLY("AVDD", 0, 0),
	};		};

	static const struct snd_soc_dapm_route es7134_dapm_routes[] = {		static const struct snd_soc_dapm_route es7134_dapm_routes[] = {
	{ "AOUTL", NULL, "DAC" },		{ "AOUTL", NULL, "DAC" },
	{ "AOUTR", NULL, "DAC" },		{ "AOUTR", NULL, "DAC" },
	{ "Playback", NULL, "VDD" },		{ "DAC", NULL, "VDD" },
	{ "DAC", NULL, "AVDD" },
	};		};

	static const struct snd_soc_component_driver es7134_component_driver = {		static const struct snd_soc_component_driver es7134_component_driver = {
			.probe = es7134_component_probe,
	.dapm_widgets = es7134_dapm_widgets,		.dapm_widgets = es7134_dapm_widgets,
	.num_dapm_widgets = ARRAY_SIZE(es7134_dapm_widgets),		.num_dapm_widgets = ARRAY_SIZE(es7134_dapm_widgets),
	.dapm_routes = es7134_dapm_routes,		.dapm_routes = es7134_dapm_routes,

Admin message