From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: <broonie@kernel.org>, <robh+dt@kernel.org>,
<kuninori.morimoto.gx@renesas.com>, <nsaenzjulienne@suse.de>,
<f.fainelli@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>,
<bcm-kernel-feedback-list@broadcom.com>,
<linux-rpi-kernel@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>,
Richard Fitzgerald <rf@opensource.cirrus.com>
Subject: [PATCH v4 5/6] ASoC: madera: Export clock config defines to dt-bindings
Date: Fri, 8 Jan 2021 16:05:00 +0000 [thread overview]
Message-ID: <20210108160501.7638-6-rf@opensource.cirrus.com> (raw)
In-Reply-To: <20210108160501.7638-1-rf@opensource.cirrus.com>
Move the defines for clock/fll IDs and sources into the dt-bindings
header so that they can be used by machine driver dts files.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
include/dt-bindings/sound/madera.h | 60 ++++++++++++++++++++++++++++++
sound/soc/codecs/madera.h | 56 +---------------------------
2 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/include/dt-bindings/sound/madera.h b/include/dt-bindings/sound/madera.h
index d0096d5eb0da..5c5fc1bfe6f9 100644
--- a/include/dt-bindings/sound/madera.h
+++ b/include/dt-bindings/sound/madera.h
@@ -22,4 +22,64 @@
#define CS47L35_DMIC_REF_MICBIAS2A 2
#define CS47L35_DMIC_REF_MICBIAS2B 3
+/* FLL IDs */
+#define MADERA_FLL1_REFCLK 1
+#define MADERA_FLL2_REFCLK 2
+#define MADERA_FLL3_REFCLK 3
+#define MADERA_FLLAO_REFCLK 4
+#define MADERA_FLL1_SYNCCLK 5
+#define MADERA_FLL2_SYNCCLK 6
+#define MADERA_FLL3_SYNCCLK 7
+#define MADERA_FLLAO_SYNCCLK 8
+
+/* FLL input source pin IDs */
+#define MADERA_FLL_SRC_NONE -1
+#define MADERA_FLL_SRC_MCLK1 0
+#define MADERA_FLL_SRC_MCLK2 1
+#define MADERA_FLL_SRC_MCLK3 2
+#define MADERA_FLL_SRC_SLIMCLK 3
+#define MADERA_FLL_SRC_FLL1 4
+#define MADERA_FLL_SRC_FLL2 5
+#define MADERA_FLL_SRC_AIF1BCLK 8
+#define MADERA_FLL_SRC_AIF2BCLK 9
+#define MADERA_FLL_SRC_AIF3BCLK 10
+#define MADERA_FLL_SRC_AIF4BCLK 11
+#define MADERA_FLL_SRC_AIF1LRCLK 12
+#define MADERA_FLL_SRC_AIF2LRCLK 13
+#define MADERA_FLL_SRC_AIF3LRCLK 14
+#define MADERA_FLL_SRC_AIF4LRCLK 15
+
+/* SYSCLK IDs */
+#define MADERA_CLK_SYSCLK_1 1
+#define MADERA_CLK_ASYNCCLK_1 2
+#define MADERA_CLK_OPCLK 3
+#define MADERA_CLK_ASYNC_OPCLK 4
+#define MADERA_CLK_SYSCLK_2 5
+#define MADERA_CLK_SYSCLK_3 6
+#define MADERA_CLK_ASYNCCLK_2 7
+#define MADERA_CLK_DSPCLK 8
+#define MADERA_CLK_OUTCLK 9
+
+/* SYSCLK source IDs */
+#define MADERA_CLK_SRC_MCLK1 0x0
+#define MADERA_CLK_SRC_MCLK2 0x1
+#define MADERA_CLK_SRC_MCLK3 0x2
+#define MADERA_CLK_SRC_FLL1 0x4
+#define MADERA_CLK_SRC_FLL2 0x5
+#define MADERA_CLK_SRC_FLL3 0x6
+#define MADERA_CLK_SRC_FLLAO_HI 0x7
+#define MADERA_CLK_SRC_FLL1_DIV6 0x7
+#define MADERA_CLK_SRC_AIF1BCLK 0x8
+#define MADERA_CLK_SRC_AIF2BCLK 0x9
+#define MADERA_CLK_SRC_AIF3BCLK 0xA
+#define MADERA_CLK_SRC_AIF4BCLK 0xB
+#define MADERA_CLK_SRC_FLLAO 0xF
+
+/* OPCLK source IDs */
+#define MADERA_OUTCLK_SYSCLK 0
+#define MADERA_OUTCLK_ASYNCCLK 1
+#define MADERA_OUTCLK_MCLK1 4
+#define MADERA_OUTCLK_MCLK2 5
+#define MADERA_OUTCLK_MCLK3 6
+
#endif
diff --git a/sound/soc/codecs/madera.h b/sound/soc/codecs/madera.h
index e0c0be59e2ef..1f4ea15648c5 100644
--- a/sound/soc/codecs/madera.h
+++ b/sound/soc/codecs/madera.h
@@ -9,67 +9,13 @@
#ifndef ASOC_MADERA_H
#define ASOC_MADERA_H
+#include <dt-bindings/sound/madera.h>
#include <linux/completion.h>
#include <sound/soc.h>
#include <sound/madera-pdata.h>
#include "wm_adsp.h"
-#define MADERA_FLL1_REFCLK 1
-#define MADERA_FLL2_REFCLK 2
-#define MADERA_FLL3_REFCLK 3
-#define MADERA_FLLAO_REFCLK 4
-#define MADERA_FLL1_SYNCCLK 5
-#define MADERA_FLL2_SYNCCLK 6
-#define MADERA_FLL3_SYNCCLK 7
-#define MADERA_FLLAO_SYNCCLK 8
-
-#define MADERA_FLL_SRC_NONE -1
-#define MADERA_FLL_SRC_MCLK1 0
-#define MADERA_FLL_SRC_MCLK2 1
-#define MADERA_FLL_SRC_MCLK3 2
-#define MADERA_FLL_SRC_SLIMCLK 3
-#define MADERA_FLL_SRC_FLL1 4
-#define MADERA_FLL_SRC_FLL2 5
-#define MADERA_FLL_SRC_AIF1BCLK 8
-#define MADERA_FLL_SRC_AIF2BCLK 9
-#define MADERA_FLL_SRC_AIF3BCLK 10
-#define MADERA_FLL_SRC_AIF4BCLK 11
-#define MADERA_FLL_SRC_AIF1LRCLK 12
-#define MADERA_FLL_SRC_AIF2LRCLK 13
-#define MADERA_FLL_SRC_AIF3LRCLK 14
-#define MADERA_FLL_SRC_AIF4LRCLK 15
-
-#define MADERA_CLK_SYSCLK_1 1
-#define MADERA_CLK_ASYNCCLK_1 2
-#define MADERA_CLK_OPCLK 3
-#define MADERA_CLK_ASYNC_OPCLK 4
-#define MADERA_CLK_SYSCLK_2 5
-#define MADERA_CLK_SYSCLK_3 6
-#define MADERA_CLK_ASYNCCLK_2 7
-#define MADERA_CLK_DSPCLK 8
-#define MADERA_CLK_OUTCLK 9
-
-#define MADERA_CLK_SRC_MCLK1 0x0
-#define MADERA_CLK_SRC_MCLK2 0x1
-#define MADERA_CLK_SRC_MCLK3 0x2
-#define MADERA_CLK_SRC_FLL1 0x4
-#define MADERA_CLK_SRC_FLL2 0x5
-#define MADERA_CLK_SRC_FLL3 0x6
-#define MADERA_CLK_SRC_FLLAO_HI 0x7
-#define MADERA_CLK_SRC_FLL1_DIV6 0x7
-#define MADERA_CLK_SRC_AIF1BCLK 0x8
-#define MADERA_CLK_SRC_AIF2BCLK 0x9
-#define MADERA_CLK_SRC_AIF3BCLK 0xA
-#define MADERA_CLK_SRC_AIF4BCLK 0xB
-#define MADERA_CLK_SRC_FLLAO 0xF
-
-#define MADERA_OUTCLK_SYSCLK 0
-#define MADERA_OUTCLK_ASYNCCLK 1
-#define MADERA_OUTCLK_MCLK1 4
-#define MADERA_OUTCLK_MCLK2 5
-#define MADERA_OUTCLK_MCLK3 6
-
#define MADERA_MIXER_VOL_MASK 0x00FE
#define MADERA_MIXER_VOL_SHIFT 1
#define MADERA_MIXER_VOL_WIDTH 7
--
2.20.1
next prev parent reply other threads:[~2021-01-08 16:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-08 16:04 [PATCH v4 0/6] Add support for Rpi4b + Cirrus Lochnagar2 and CS47L15 Richard Fitzgerald
2021-01-08 16:04 ` [PATCH v4 1/6] of: base: Add of_count_phandle_with_fixed_args() Richard Fitzgerald
2021-01-08 16:04 ` [PATCH v4 2/6] dt-bindings: audio-graph-card: Add plls and sysclks properties Richard Fitzgerald
2021-01-13 15:22 ` Rob Herring
2021-01-13 16:09 ` Mark Brown
2021-01-15 10:35 ` Richard Fitzgerald
2021-01-15 13:11 ` Mark Brown
2021-01-15 14:42 ` Richard Fitzgerald
2021-01-15 15:20 ` Mark Brown
2021-01-15 16:15 ` Richard Fitzgerald
2021-01-15 18:35 ` Mark Brown
2021-01-14 10:31 ` Richard Fitzgerald
2021-01-14 11:14 ` Mark Brown
2021-01-08 16:04 ` [PATCH v4 3/6] ASoC: audio-graph-card: Support setting component plls and sysclks Richard Fitzgerald
2021-01-12 1:35 ` Kuninori Morimoto
2021-01-12 10:22 ` Richard Fitzgerald
2021-01-13 0:00 ` Kuninori Morimoto
2021-01-13 15:51 ` Mark Brown
2021-01-08 16:04 ` [PATCH v4 4/6] ASoC: madera: Allow codecs to be selected from kernel config Richard Fitzgerald
2021-01-08 16:05 ` Richard Fitzgerald [this message]
2021-01-08 16:05 ` [PATCH v4 6/6] ARM: dts: Add dts for RPi4b + Cirrus Logic Lochnagar2 + CS47L15 Richard Fitzgerald
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=20210108160501.7638-6-rf@opensource.cirrus.com \
--to=rf@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=nsaenzjulienne@suse.de \
--cc=patches@opensource.cirrus.com \
--cc=robh+dt@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).