ASoc: kirkwood: merge kirkwood-i2c and kirkwood-dma

PATCH Superseded Jean-Francois Moine 3 participants 5 messages Jul 25, 2013 – Jul 26, 2013

Subsystems (4)

Arm (32-bit) Sound Arm sub-architectures ASoC

lore

Share & tools

lore

Jean-Francois Moine

author

2013-07-25 09:14 UTC #0 lore raw

PATCH 3/4 ASoc: kirkwood: merge kirkwood-i2c and kirkwood-dma

To avoid the declaration of a 'kirkwood-pcm-audio' device in the DT, this patch merges the kirkwood-i2c and kirkwood-dma drivers into one module.

Signed-off-by Jean-Francois Moine <[email protected]>

---
 arch/arm/mach-kirkwood/common.c      |  6 ------
 sound/soc/kirkwood/Kconfig           |  5 -----
 sound/soc/kirkwood/Makefile          |  4 +---
 sound/soc/kirkwood/kirkwood-dma.c    | 30 +-----------------------------
 sound/soc/kirkwood/kirkwood-i2s.c    |  5 +++++
 sound/soc/kirkwood/kirkwood-openrd.c |  2 +-
 sound/soc/kirkwood/kirkwood-t5325.c  |  2 +-
 sound/soc/kirkwood/kirkwood.h        |  1 +
 8 files changed, 10 insertions(+), 45 deletions(-)

arch/arm/mach-kirkwood/common.c +0 -6

index e9238b5..fd02f1b 100644
@@ -587,15 +587,9 @@ static struct platform_device kirkwood_i2s_device = {
 	},
 };
 
-static struct platform_device kirkwood_pcm_device = {
-	.name		= "kirkwood-pcm-audio",
-	.id		= -1,
-};
-
 void __init kirkwood_audio_init(void)
 {
 	platform_device_register(&kirkwood_i2s_device);
-	platform_device_register(&kirkwood_pcm_device);
 }
 
 /*****************************************************************************

sound/soc/kirkwood/Kconfig +0 -5

index c62d715..b6917a7 100644
@@ -6,14 +6,10 @@ config SND_KIRKWOOD_SOC
 	  the Kirkwood I2S interface. You will also need to select the
 	  audio interfaces to support below.
 
-config SND_KIRKWOOD_SOC_I2S
-	tristate
-
 config SND_KIRKWOOD_SOC_OPENRD
 	tristate "SoC Audio support for Kirkwood Openrd Client"
 	depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)
 	depends on I2C
-	select SND_KIRKWOOD_SOC_I2S
 	select SND_SOC_CS42L51
 	help
 	  Say Y if you want to add support for SoC audio on

@@ -22,7 +18,6 @@ config SND_KIRKWOOD_SOC_OPENRD
 config SND_KIRKWOOD_SOC_T5325
 	tristate "SoC Audio support for HP t5325"
 	depends on SND_KIRKWOOD_SOC && MACH_T5325 && I2C
-	select SND_KIRKWOOD_SOC_I2S
 	select SND_SOC_ALC5623
 	help
 	  Say Y if you want to add support for SoC audio on

sound/soc/kirkwood/Makefile +1 -3

index 3e62ae9..cf22ad3 100644
@@ -1,8 +1,6 @@
-snd-soc-kirkwood-objs := kirkwood-dma.o
-snd-soc-kirkwood-i2s-objs := kirkwood-i2s.o
+snd-soc-kirkwood-objs := kirkwood-i2s.o kirkwood-dma.o
 
 obj-$(CONFIG_SND_KIRKWOOD_SOC) += snd-soc-kirkwood.o
-obj-$(CONFIG_SND_KIRKWOOD_SOC_I2S) += snd-soc-kirkwood-i2s.o
 
 snd-soc-openrd-objs := kirkwood-openrd.o
 snd-soc-t5325-objs := kirkwood-t5325.o

sound/soc/kirkwood/kirkwood-dma.c +1 ~~-29~~

index cef5277..9f4c595 100644
@@ -364,36 +364,8 @@ static void kirkwood_dma_free_dma_buffers(struct snd_pcm *pcm)
 	}
 }
 
-static struct snd_soc_platform_driver kirkwood_soc_platform = {
+struct snd_soc_platform_driver kirkwood_soc_platform = {
 	.ops		= &kirkwood_dma_ops,
 	.pcm_new	= kirkwood_dma_new,
 	.pcm_free	= kirkwood_dma_free_dma_buffers,
 };
-
-static int kirkwood_soc_platform_probe(struct platform_device *pdev)
-{
-	return snd_soc_register_platform(&pdev->dev, &kirkwood_soc_platform);
-}
-
-static int kirkwood_soc_platform_remove(struct platform_device *pdev)
-{
-	snd_soc_unregister_platform(&pdev->dev);
-	return 0;
-}
-
-static struct platform_driver kirkwood_pcm_driver = {
-	.driver = {
-			.name = "kirkwood-pcm-audio",
-			.owner = THIS_MODULE,
-	},
-
-	.probe = kirkwood_soc_platform_probe,
-	.remove = kirkwood_soc_platform_remove,
-};
-
-module_platform_driver(kirkwood_pcm_driver);
-
-MODULE_AUTHOR("Arnaud Patard <[email protected]>");
-MODULE_DESCRIPTION("Marvell Kirkwood Audio DMA module");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:kirkwood-pcm-audio");

sound/soc/kirkwood/kirkwood-i2s.c +5 -0

index d3e50af..3517784 100644
@@ -459,6 +459,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
 {
 	struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);
 
+	snd_soc_unregister_platform(&pdev->dev);
 	snd_soc_unregister_component(&pdev->dev);
 
 	if (!IS_ERR(priv->extclk)) {

@@ -544,6 +545,10 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "snd_soc_register_component failed\n");
 		goto fail;
 	}
+	err = snd_soc_register_platform(&pdev->dev, &kirkwood_soc_platform);;
+	if (err) {
+		dev_err(&pdev->dev, "snd_soc_register_platform failed\n");
+		goto fail;
 	return 0;
 
 fail:

sound/soc/kirkwood/kirkwood-openrd.c +1 -1

index b979c71..0fa3082 100644
@@ -55,7 +55,7 @@ static struct snd_soc_dai_link openrd_client_dai[] = {
 	.name = "CS42L51",
 	.stream_name = "CS42L51 HiFi",
 	.cpu_dai_name = "kirkwood-i2s",
-	.platform_name = "kirkwood-pcm-audio",
+	.platform_name = "kirkwood-i2s",
 	.codec_dai_name = "cs42l51-hifi",
 	.codec_name = "cs42l51-codec.0-004a",
 	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,

sound/soc/kirkwood/kirkwood-t5325.c +1 -1

index 1d0ed6f..f48ebda 100644
@@ -71,7 +71,7 @@ static struct snd_soc_dai_link t5325_dai[] = {
 	.name = "ALC5621",
 	.stream_name = "ALC5621 HiFi",
 	.cpu_dai_name = "kirkwood-i2s",
-	.platform_name = "kirkwood-pcm-audio",
+	.platform_name = "kirkwood-i2s",
 	.codec_dai_name = "alc5621-hifi",
 	.codec_name = "alc562x-codec.0-001a",
 	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,

sound/soc/kirkwood/kirkwood.h +1 -0

index 4d92637..f3de119 100644
@@ -133,4 +133,5 @@ struct kirkwood_dma_data {
 	int burst;
 };
 
+extern struct snd_soc_platform_driver kirkwood_soc_platform;
 #endif

Signature · 7 lines

1.8.3.2



-- 
Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/

Mark Brown

maintainer

2013-07-25 19:16 UTC #1 lore raw

Quoted 3 lines · Jean-Francois Moine

To avoid the declaration of a 'kirkwood-pcm-audio' device in the DT, this patch merges the kirkwood-i2c and kirkwood-dma drivers into one module.

This seems mostly fine, though it may be best to keep kirkwood-dma as a separate module for the benefit of the S/PDIF support when it gets added
- I had a look at the implementation Russell has and it looks like it can be added as a separate interface.

Review

Quoted 2 lines

(quoted diff) +1 -1

-	.platform_name = "kirkwood-pcm-audio",
+	.platform_name = "kirkwood-i2s",

Should the name be done as dev_name() for the interface (I don't know if there is ever more than one)?

Russell King - ARM Linux

2013-07-25 22:58 UTC #2 lore raw

Quoted 9 lines · Mark Brown

Quoted 3 lines · Jean-Francois Moine
To avoid the declaration of a 'kirkwood-pcm-audio' device in the DT, this patch merges the kirkwood-i2c and kirkwood-dma drivers into one module.
This seems mostly fine, though it may be best to keep kirkwood-dma as a separate module for the benefit of the S/PDIF support when it gets added
- I had a look at the implementation Russell has and it looks like it can be added as a separate interface.

You wouldn't want I2S and SPDIF to be separate modules though - they're the same hardware but different output stream formatters attached to the DMA FIFO output. Don't forget the requirements concerning the simultaneous use of I2S and SPDIF - these "output formatters" must both be enabled and disabled in unison when concurrent use is required - both bits must be set or cleared together with a single register write.

Quoted 5 lines

Review
Quoted 2 lines
(quoted diff) +1 -1
-	.platform_name = "kirkwood-pcm-audio",
+	.platform_name = "kirkwood-i2s",
Should the name be done as dev_name() for the interface (I don't know if there is ever more than one)?

Getting away from "kirkwood-i2s" would be sensible, because it may not be just "i2s" in this hardware block. The documentation calls this an "audio controller" but I guess "kirkwood-pcm" would be a reasonable compromise, even though it has a separate AC'97 block which could also be construed as being "pcm".

The AC'97 block uses a separate peripheral DMA controller and so wouldn't make use of kirkwood-dma.c either.

Jean-Francois Moine

author

2013-07-26 07:38 UTC #3 lore raw

Quoted 24 lines · On Thu, 25 Jul 2013 23:58:16 +0100 Russell King - ARM Linux…

Quoted 9 lines · Mark Brown
Quoted 3 lines · Jean-Francois Moine
To avoid the declaration of a 'kirkwood-pcm-audio' device in the DT, this patch merges the kirkwood-i2c and kirkwood-dma drivers into one module.
This seems mostly fine, though it may be best to keep kirkwood-dma as a separate module for the benefit of the S/PDIF support when it gets added
- I had a look at the implementation Russell has and it looks like it can be added as a separate interface.
You wouldn't want I2S and SPDIF to be separate modules though - they're the same hardware but different output stream formatters attached to the DMA FIFO output. Don't forget the requirements concerning the simultaneous use of I2S and SPDIF - these "output formatters" must both be enabled and disabled in unison when concurrent use is required - both bits must be set or cleared together with a single register write.
Quoted 5 lines
Review
Quoted 2 lines
(quoted diff) +1 -1
-	.platform_name = "kirkwood-pcm-audio",
+	.platform_name = "kirkwood-i2s",
Should the name be done as dev_name() for the interface (I don't know if there is ever more than one)?

Quoted 8 lines

Getting away from "kirkwood-i2s" would be sensible, because it may not be just "i2s" in this hardware block. The documentation calls this an "audio controller" but I guess "kirkwood-pcm" would be a reasonable compromise, even though it has a separate AC'97 block which could also be construed as being "pcm".
The AC'97 block uses a separate peripheral DMA controller and so wouldn't make use of kirkwood-dma.c either.

As the kirkwood audio subsystem is used in the other mvebu machines, the name of the module kirkwood-i2s/kirkwood-dma could be "mvebu-pcm-audio".

Signature · 2 lines

Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/

Mark Brown

maintainer

2013-07-26 10:58 UTC #4 lore raw

In reply to Russell King - ARM Linux

Quoted 7 lines · Russell King - ARM Linux

Quoted 4 lines · Mark Brown
This seems mostly fine, though it may be best to keep kirkwood-dma as a separate module for the benefit of the S/PDIF support when it gets added
- I had a look at the implementation Russell has and it looks like it can be added as a separate interface.

Quoted 6 lines

You wouldn't want I2S and SPDIF to be separate modules though - they're the same hardware but different output stream formatters attached to the DMA FIFO output. Don't forget the requirements concerning the simultaneous use of I2S and SPDIF - these "output formatters" must both be enabled and disabled in unison when concurrent use is required - both bits must be set or cleared together with a single register write.

OK, I knew they both needed to know about each other and to share some stuff but I figured it was reasonable to compile out the S/PDIF support if only using I2S or similar - so long as they're coupled at runtime it should be fine.

Quoted 8 lines

Quoted 2 lines
Should the name be done as dev_name() for the interface (I don't know if there is ever more than one)?
Getting away from "kirkwood-i2s" would be sensible, because it may not be just "i2s" in this hardware block. The documentation calls this an "audio controller" but I guess "kirkwood-pcm" would be a reasonable compromise, even though it has a separate AC'97 block which could also be construed as being "pcm".

I was thinking just pick a name at runtime based on what was doing the instantiation which would avoid hard coding anything in the DMA driver.