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

Commit 8c2d6a9f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: clock gating is decided by bool on snd_soc_of_parse_daifmt() 



ASoC clock gate settings are continuous/gated only.
This patch decides it as bool, then, gated clock will be default.
Special thanks to Stephen

Cc: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent eef28e10

sound/soc/soc-core.c

+6 −14
Original line number Diff line number Diff line
@@ -4229,9 +4229,6 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, 
		{ "pdm",	SND_SOC_DAIFMT_PDM},

		{ "msb",	SND_SOC_DAIFMT_MSB },

		{ "lsb",	SND_SOC_DAIFMT_LSB },

	}, of_clock_table[] = {

		{ "continuous",	SND_SOC_DAIFMT_CONT },

		{ "gated",	SND_SOC_DAIFMT_GATED },

	};



	if (!prefix)
@@ -4253,19 +4250,14 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, 
	}



	/*

	 * check "[prefix]clock-gating = xxx"

	 * check "[prefix]continuous-clock"

	 * SND_SOC_DAIFMT_CLOCK_MASK area

	 */

	snprintf(prop, sizeof(prop), "%sclock-gating", prefix);

	ret = of_property_read_string(np, prop, &str);

	if (ret == 0) {

		for (i = 0; i < ARRAY_SIZE(of_clock_table); i++) {

			if (strcmp(str, of_clock_table[i].name) == 0) {

				format |= of_clock_table[i].val;

				break;

			}

		}

	}

	snprintf(prop, sizeof(prop), "%scontinuous-clock", prefix);

	if (of_get_property(np, prop, NULL))

		format |= SND_SOC_DAIFMT_CONT;

	else

		format |= SND_SOC_DAIFMT_GATED;



	/*

	 * check "[prefix]bitclock-inversion"