From: Danny Milosavljevic <dannym@scratchpost.org>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
Mark Brown <broonie@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
alsa-devel@alsa-project.org, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-sunxi@googlegroups.com
Cc: Danny Milosavljevic <dannym@scratchpost.org>
Subject: [PATCH v5 3/3] ASoC: sun4i-codec: Add custom regmap configs
Date: Thu, 22 Sep 2016 09:13:13 +0200 [thread overview]
Message-ID: <20160922071313.12891-4-dannym@scratchpost.org> (raw)
In-Reply-To: <20160922071313.12891-1-dannym@scratchpost.org>
The A20 has a few extra registers that the A10 doesn't have.
Therefore, use different regmaps for A10 as compared to A20.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
sound/soc/sunxi/sun4i-codec.c | 38 +++++++++++++++++++++++++++++++++++---
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 3b53b78..e047ec0 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -682,12 +682,37 @@ static const struct regmap_config sun4i_codec_regmap_config = {
.reg_bits = 32,
.reg_stride = 4,
.val_bits = 32,
+ .max_register = SUN4I_CODEC_ADC_RXCNT,
+};
+
+static const struct regmap_config sun7i_codec_regmap_config = {
+ .reg_bits = 32,
+ .reg_stride = 4,
+ .val_bits = 32,
.max_register = SUN7I_CODEC_AC_MIC_PHONE_CAL,
};
+struct sun4i_codec_quirks {
+ const struct regmap_config *regmap_config;
+};
+
+static const struct sun4i_codec_quirks sun4i_codec_quirks = {
+ .regmap_config = &sun4i_codec_regmap_config,
+};
+
+static const struct sun4i_codec_quirks sun7i_codec_quirks = {
+ .regmap_config = &sun7i_codec_regmap_config,
+};
+
static const struct of_device_id sun4i_codec_of_match[] = {
- { .compatible = "allwinner,sun4i-a10-codec" },
- { .compatible = "allwinner,sun7i-a20-codec" },
+ {
+ .compatible = "allwinner,sun4i-a10-codec",
+ .data = &sun4i_codec_quirks,
+ },
+ {
+ .compatible = "allwinner,sun7i-a20-codec",
+ .data = &sun7i_codec_quirks,
+ },
{}
};
MODULE_DEVICE_TABLE(of, sun4i_codec_of_match);
@@ -760,6 +785,7 @@ static int sun4i_codec_probe(struct platform_device *pdev)
{
struct snd_soc_card *card;
struct sun4i_codec *scodec;
+ const struct sun4i_codec_quirks *quirks;
struct resource *res;
void __iomem *base;
int ret;
@@ -777,8 +803,14 @@ static int sun4i_codec_probe(struct platform_device *pdev)
return PTR_ERR(base);
}
+ quirks = of_device_get_match_data(&pdev->dev);
+ if (quirks == NULL) {
+ dev_err(&pdev->dev, "Failed to determine the quirks to use\n");
+ return -ENODEV;
+ }
+
scodec->regmap = devm_regmap_init_mmio(&pdev->dev, base,
- &sun4i_codec_regmap_config);
+ quirks->regmap_config);
if (IS_ERR(scodec->regmap)) {
dev_err(&pdev->dev, "Failed to create our regmap\n");
return PTR_ERR(scodec->regmap);
next prev parent reply other threads:[~2016-09-22 7:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-22 7:13 [PATCH v5 0/3] ASoC: sun4i-codec: Distinguish sun4i from sun7i Danny Milosavljevic
2016-09-22 7:13 ` Danny Milosavljevic [this message]
[not found] ` <20160922071313.12891-4-dannym-bxPqe3T81XXwRsdMLXbzog@public.gmane.org>
2016-09-22 8:29 ` [PATCH v5 3/3] ASoC: sun4i-codec: Add custom regmap configs Maxime Ripard
2016-09-25 5:58 ` Applied "ASoC: sun4i-codec: Add custom regmap configs" to the asoc tree Mark Brown
[not found] ` <20160922071313.12891-1-dannym-bxPqe3T81XXwRsdMLXbzog@public.gmane.org>
2016-09-22 7:13 ` [PATCH v5 1/3] ASoC: sun4i-codec: Rename sun4i_codec_widgets for consistency Danny Milosavljevic
[not found] ` <20160922071313.12891-2-dannym-bxPqe3T81XXwRsdMLXbzog@public.gmane.org>
2016-09-23 13:02 ` Maxime Ripard
2016-09-22 7:13 ` [PATCH v5 2/3] ASoC: sun4i-codec: Rename some sun7i-only registers Danny Milosavljevic
[not found] ` <20160922071313.12891-3-dannym-bxPqe3T81XXwRsdMLXbzog@public.gmane.org>
2016-09-22 8:29 ` Maxime Ripard
2016-09-22 8:31 ` [PATCH v5 0/3] ASoC: sun4i-codec: Distinguish sun4i from sun7i Maxime Ripard
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=20160922071313.12891-4-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=wens@csie.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).