Applied "ASoC: pxa: remove bindings from pxa2xx-pcm" to the asoc tree

Message ID E1fYrF7-0002af-Il@debutante
State Accepted
Commit c7b4f15ddb4f28451679019374027f5223c616ce
Headers show
  • Applied "ASoC: pxa: remove bindings from pxa2xx-pcm" to the asoc tree
Related show

Commit Message

Mark Brown June 29, 2018, 11:07 a.m.
The patch

   ASoC: pxa: remove bindings from pxa2xx-pcm

has been applied to the asoc tree at 

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.


From c7b4f15ddb4f28451679019374027f5223c616ce Mon Sep 17 00:00:00 2001
From: Daniel Mack <>

Date: Wed, 27 Jun 2018 21:33:58 +0200
Subject: [PATCH] ASoC: pxa: remove bindings from pxa2xx-pcm

This platform is no longer needed on DT boards, so let's remove them to
avoid confusion. DT bindings should use the CPU DAIs (I2S/SSP/AC97)

Signed-off-by: Daniel Mack <>

Signed-off-by: Mark Brown <>

 .../devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt | 15 ---------------
 sound/soc/pxa/pxa2xx-pcm.c                        |  9 ---------
 2 files changed, 24 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt


Alsa-devel mailing list


diff --git a/Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt b/Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt
deleted file mode 100644
index 551fbb8348c2..000000000000
--- a/Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt
+++ /dev/null
@@ -1,15 +0,0 @@ 
-DT bindings for ARM PXA2xx PCM platform driver
-This is just a dummy driver that registers the PXA ASoC platform driver.
-It does not have any resources assigned.
-Required properties:
-	- compatible		'mrvl,pxa-pcm-audio'
-	pxa_pcm_audio: snd_soc_pxa_audio {
-		compatible = "mrvl,pxa-pcm-audio";
-	};
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index a1df4ec76cbd..72eaaef1b426 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -32,18 +32,9 @@  static int pxa2xx_soc_platform_probe(struct platform_device *pdev)
 					       NULL, 0);
-#ifdef CONFIG_OF
-static const struct of_device_id snd_soc_pxa_audio_match[] = {
-	{ .compatible   = "mrvl,pxa-pcm-audio" },
-	{ }
-MODULE_DEVICE_TABLE(of, snd_soc_pxa_audio_match);
 static struct platform_driver pxa_pcm_driver = {
 	.driver = {
 		.name = "pxa-pcm-audio",
-		.of_match_table = of_match_ptr(snd_soc_pxa_audio_match),
 	.probe = pxa2xx_soc_platform_probe,