Skip to contentSkip to conversation

ASoC: sun4i-spdif: Add support for the H3 SoC

PATCH In review [email protected] 3 participants 3 messages Jan 12, 2017 – Jan 20, 2017

Subsystems (3)
Sound ASoC Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 ASoC: sun4i-spdif: Add support for the H3 SoC

From: Marcus Cooper <[email protected]>

The H3 SoC uses the same SPDIF block as found in earlier SoCs, but its TXFIFO is mapped to another address.

Signed-off-by Marcus Cooper <[email protected]>
---
 sound/soc/sunxi/sun4i-spdif.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
sound/soc/sunxi/sun4i-spdif.c +11 -0
index fec62ee1fc72..c03cd07a9b19 100644
@@ -103,6 +103,8 @@
 	#define SUN4I_SPDIF_ISTA_RXOSTA			BIT(1)
 	#define SUN4I_SPDIF_ISTA_RXASTA			BIT(0)
 
+#define SUN8I_SPDIF_TXFIFO	(0x20)
+
 #define SUN4I_SPDIF_TXCNT	(0x24)
 
 #define SUN4I_SPDIF_RXCNT	(0x28)

@@ -417,6 +419,11 @@ static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks = {
 	.has_reset	= true,
 };
 
+static const struct sun4i_spdif_quirks sun8i_h3_spdif_quirks = {
+	.reg_dac_txdata	= SUN8I_SPDIF_TXFIFO,
+	.has_reset	= true,
+};
+
 static const struct of_device_id sun4i_spdif_of_match[] = {
 	{
 		.compatible = "allwinner,sun4i-a10-spdif",

@@ -426,6 +433,10 @@ static const struct of_device_id sun4i_spdif_of_match[] = {
 		.compatible = "allwinner,sun6i-a31-spdif",
 		.data = &sun6i_a31_spdif_quirks,
 	},
+	{
+		.compatible = "allwinner,sun8i-h3-spdif",
+		.data = &sun8i_h3_spdif_quirks,
+	},
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
Signature · 1 line
2.11.0
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · On Thu, Jan 12, 2017 at 05:45:16PM +0100…

From: Marcus Cooper <[email protected]>

The H3 SoC uses the same SPDIF block as found in earlier SoCs, but its TXFIFO is mapped to another address.

Signed-off-by Marcus Cooper <[email protected]>

You should also document the new compatible.

Once this is done, you have my:

Acked-by Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/[email protected]>

Thanks!
Maxime

Signature · 3 lines
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
maintainer
#2 lore raw

Applied "ASoC: sun4i-spdif: Add support for the H3 SoC" to the asoc tree

In reply to [email protected]

The patch

ASoC: sun4i-spdif: Add support for the H3 SoC

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 1bd92af877abfeddcc4b83a35482ed4139591acf Mon Sep 17 00:00:00 2001

From: Marcus Cooper <[email protected]>
Date: Thu, 19 Jan 2017 20:52:58 +0100
Subject: [PATCH] ASoC: sun4i-spdif: Add support for the H3 SoC

The H3 SoC uses the same SPDIF block as found in earlier SoCs, but its TXFIFO is mapped to another address.

Signed-off-by Marcus Cooper <[email protected]>
Acked-by Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/sunxi/sun4i-spdif.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
sound/soc/sunxi/sun4i-spdif.c +11 -0
index fec62ee1fc72..c03cd07a9b19 100644
@@ -103,6 +103,8 @@
 	#define SUN4I_SPDIF_ISTA_RXOSTA			BIT(1)
 	#define SUN4I_SPDIF_ISTA_RXASTA			BIT(0)
 
+#define SUN8I_SPDIF_TXFIFO	(0x20)
+
 #define SUN4I_SPDIF_TXCNT	(0x24)
 
 #define SUN4I_SPDIF_RXCNT	(0x28)

@@ -417,6 +419,11 @@ static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks = {
 	.has_reset	= true,
 };
 
+static const struct sun4i_spdif_quirks sun8i_h3_spdif_quirks = {
+	.reg_dac_txdata	= SUN8I_SPDIF_TXFIFO,
+	.has_reset	= true,
+};
+
 static const struct of_device_id sun4i_spdif_of_match[] = {
 	{
 		.compatible = "allwinner,sun4i-a10-spdif",

@@ -426,6 +433,10 @@ static const struct of_device_id sun4i_spdif_of_match[] = {
 		.compatible = "allwinner,sun6i-a31-spdif",
 		.data = &sun6i_a31_spdif_quirks,
 	},
+	{
+		.compatible = "allwinner,sun8i-h3-spdif",
+		.data = &sun8i_h3_spdif_quirks,
+	},
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
Signature · 1 line
2.11.0