All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>,
	Timur Tabi <timur@kernel.org>, Xiubo Li <Xiubo.Lee@gmail.com>,
	Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
	Shengjiu Wang <shengjiu.wang@gmail.com>,
	Sameer Pujar <spujar@nvidia.com>,
	Neil Armstrong <narmstrong@baylibre.com>,
	Nicolas Ferre <nicolas.ferre@microchip.com>,
	Nicolin Chen <nicoleotsuka@gmail.com>,
	Ludovic Desroches <ludovic.desroches@microchip.com>,
	Kevin Hilman <khilman@baylibre.com>,
	Codrin Ciubotariu <codrin.ciubotariu@microchip.com>,
	alsa-devel@alsa-project.org, Fabio Estevam <festevam@gmail.com>,
	Jerome Brunet <jbrunet@baylibre.com>
Subject: [PATCH v3 8/8] ASoC: soc-core: remove snd_soc_of_parse_daifmt()
Date: 14 Jun 2021 09:58:35 +0900	[thread overview]
Message-ID: <87zgvtuuro.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87bl89w9fw.wl-kuninori.morimoto.gx@renesas.com>


From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

No driver is using snd_soc_of_parse_daifmt().
This patch removes it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 include/sound/soc.h  |   4 --
 sound/soc/soc-core.c | 104 -------------------------------------------
 2 files changed, 108 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 63194a8773cd..675849d07284 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1249,10 +1249,6 @@ unsigned int snd_soc_daifmt_parse_clock_provider_raw(struct device_node *np,
 	snd_soc_daifmt_clock_provider_from_bitmap(			\
 		snd_soc_daifmt_parse_clock_provider_as_bitmap(np, prefix))
 
-unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
-				     const char *prefix,
-				     struct device_node **bitclkmaster,
-				     struct device_node **framemaster);
 int snd_soc_get_dai_id(struct device_node *ep);
 int snd_soc_get_dai_name(const struct of_phandle_args *args,
 			 const char **dai_name);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4cb9bb009e90..b9d2b8b650c4 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3169,110 +3169,6 @@ unsigned int snd_soc_daifmt_parse_clock_provider_raw(struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(snd_soc_daifmt_parse_clock_provider_raw);
 
-unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
-				     const char *prefix,
-				     struct device_node **bitclkmaster,
-				     struct device_node **framemaster)
-{
-	int ret, i;
-	char prop[128];
-	unsigned int format = 0;
-	int bit, frame;
-	const char *str;
-	struct {
-		char *name;
-		unsigned int val;
-	} of_fmt_table[] = {
-		{ "i2s",	SND_SOC_DAIFMT_I2S },
-		{ "right_j",	SND_SOC_DAIFMT_RIGHT_J },
-		{ "left_j",	SND_SOC_DAIFMT_LEFT_J },
-		{ "dsp_a",	SND_SOC_DAIFMT_DSP_A },
-		{ "dsp_b",	SND_SOC_DAIFMT_DSP_B },
-		{ "ac97",	SND_SOC_DAIFMT_AC97 },
-		{ "pdm",	SND_SOC_DAIFMT_PDM},
-		{ "msb",	SND_SOC_DAIFMT_MSB },
-		{ "lsb",	SND_SOC_DAIFMT_LSB },
-	};
-
-	if (!prefix)
-		prefix = "";
-
-	/*
-	 * check "dai-format = xxx"
-	 * or    "[prefix]format = xxx"
-	 * SND_SOC_DAIFMT_FORMAT_MASK area
-	 */
-	ret = of_property_read_string(np, "dai-format", &str);
-	if (ret < 0) {
-		snprintf(prop, sizeof(prop), "%sformat", prefix);
-		ret = of_property_read_string(np, prop, &str);
-	}
-	if (ret == 0) {
-		for (i = 0; i < ARRAY_SIZE(of_fmt_table); i++) {
-			if (strcmp(str, of_fmt_table[i].name) == 0) {
-				format |= of_fmt_table[i].val;
-				break;
-			}
-		}
-	}
-
-	/*
-	 * check "[prefix]continuous-clock"
-	 * SND_SOC_DAIFMT_CLOCK_MASK area
-	 */
-	snprintf(prop, sizeof(prop), "%scontinuous-clock", prefix);
-	if (of_property_read_bool(np, prop))
-		format |= SND_SOC_DAIFMT_CONT;
-	else
-		format |= SND_SOC_DAIFMT_GATED;
-
-	/*
-	 * check "[prefix]bitclock-inversion"
-	 * check "[prefix]frame-inversion"
-	 * SND_SOC_DAIFMT_INV_MASK area
-	 */
-	snprintf(prop, sizeof(prop), "%sbitclock-inversion", prefix);
-	bit = !!of_get_property(np, prop, NULL);
-
-	snprintf(prop, sizeof(prop), "%sframe-inversion", prefix);
-	frame = !!of_get_property(np, prop, NULL);
-
-	switch ((bit << 4) + frame) {
-	case 0x11:
-		format |= SND_SOC_DAIFMT_IB_IF;
-		break;
-	case 0x10:
-		format |= SND_SOC_DAIFMT_IB_NF;
-		break;
-	case 0x01:
-		format |= SND_SOC_DAIFMT_NB_IF;
-		break;
-	default:
-		/* SND_SOC_DAIFMT_NB_NF is default */
-		break;
-	}
-
-	/*
-	 * check "[prefix]bitclock-master"
-	 * check "[prefix]frame-master"
-	 * SND_SOC_DAIFMT_MASTER_MASK area
-	 */
-	snprintf(prop, sizeof(prop), "%sbitclock-master", prefix);
-	bit = !!of_get_property(np, prop, NULL);
-	if (bit && bitclkmaster)
-		*bitclkmaster = of_parse_phandle(np, prop, 0);
-
-	snprintf(prop, sizeof(prop), "%sframe-master", prefix);
-	frame = !!of_get_property(np, prop, NULL);
-	if (frame && framemaster)
-		*framemaster = of_parse_phandle(np, prop, 0);
-
-	format |= snd_soc_daifmt_clock_provider_from_bitmap((bit << 4) + frame);
-
-	return format;
-}
-EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt);
-
 int snd_soc_get_dai_id(struct device_node *ep)
 {
 	struct snd_soc_component *component;
-- 
2.25.1


  parent reply	other threads:[~2021-06-14  1:00 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-14  0:56 [PATCH v3 0/8] ASoC: tidyup snd_soc_of_parse_daifmt() Kuninori Morimoto
2021-06-14  0:56 ` [PATCH v3 1/8] ASoC: soc-core: add snd_soc_daifmt_clock_provider_from_bitmap() Kuninori Morimoto
2021-06-14  0:56 ` [PATCH v3 2/8] ASoC: soc-core: add snd_soc_daifmt_clock_provider_fliped() Kuninori Morimoto
2021-06-14  0:57 ` [PATCH v3 3/8] ASoC: soc-core: add snd_soc_daifmt_parse_format/clock_provider() Kuninori Morimoto
2021-06-14  0:57 ` [PATCH v3 4/8] ASoC: atmel: switch to use snd_soc_daifmt_parse_format/clock_provider() Kuninori Morimoto
2021-06-18 15:04   ` Codrin.Ciubotariu
2021-06-14  0:57 ` [PATCH v3 5/8] ASoC: fsl: " Kuninori Morimoto
2021-06-14  0:58 ` [PATCH v3 6/8] ASoC: meson: " Kuninori Morimoto
2021-06-18 14:26   ` Jerome Brunet
2021-06-14  0:58 ` [PATCH v3 7/8] ASoC: simple-card-utils: " Kuninori Morimoto
2021-06-14  0:58 ` Kuninori Morimoto [this message]
2021-06-21 18:46 ` [PATCH v3 0/8] ASoC: tidyup snd_soc_of_parse_daifmt() Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87zgvtuuro.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=Xiubo.Lee@gmail.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=codrin.ciubotariu@microchip.com \
    --cc=festevam@gmail.com \
    --cc=jbrunet@baylibre.com \
    --cc=khilman@baylibre.com \
    --cc=lgirdwood@gmail.com \
    --cc=ludovic.desroches@microchip.com \
    --cc=martin.blumenstingl@googlemail.com \
    --cc=narmstrong@baylibre.com \
    --cc=nicolas.ferre@microchip.com \
    --cc=nicoleotsuka@gmail.com \
    --cc=shengjiu.wang@gmail.com \
    --cc=spujar@nvidia.com \
    --cc=timur@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.