From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
rsrc-card which is using DPCM feature was created for Renesas sound.
But not only Renesas, but many SoC can use this driver, because
it is based on simple-card driver.
To use it as more open driver, rsrc-card should be renamed to
simple-dpcm-card. In order to easy patch review, as 3rd step,
this patch moves rsrc-card driver to generic folder.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
.../bindings/sound/{renesas,rsrc-card.txt => simple-dpcm-card.txt} | 0
sound/soc/generic/Kconfig | 6 ++++++
sound/soc/generic/Makefile | 2 ++
sound/soc/{sh/rcar/rsrc-card.c => generic/simple-dpcm-card.c} | 0
sound/soc/sh/Kconfig | 6 ------
sound/soc/sh/rcar/Makefile | 3 ---
6 files changed, 8 insertions(+), 9 deletions(-)
rename Documentation/devicetree/bindings/sound/{renesas,rsrc-card.txt => simple-dpcm-card.txt} (100%)
rename sound/soc/{sh/rcar/rsrc-card.c => generic/simple-dpcm-card.c} (100%)
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt b/Documentation/devicetree/bindings/sound/simple-dpcm-card.txt
similarity index 100%
rename from Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
rename to Documentation/devicetree/bindings/sound/simple-dpcm-card.txt
diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig
index 441fc9f..fbba1e6 100644
--- a/sound/soc/generic/Kconfig
+++ b/sound/soc/generic/Kconfig
@@ -6,3 +6,9 @@ config SND_SIMPLE_CARD
select SND_SIMPLE_CARD_CORE
help
This option enables generic simple sound card support
+
+config SND_SIMPLE_DPCM_CARD
+ tristate "ASoC Simple DPCM sound card support"
+ select SND_SIMPLE_CARD_CORE
+ help
+ This option enables generic simple DPCM sound card support
diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile
index d8a982d..a5f0e4d 100644
--- a/sound/soc/generic/Makefile
+++ b/sound/soc/generic/Makefile
@@ -1,5 +1,7 @@
obj-$(CONFIG_SND_SIMPLE_CARD_CORE) := simple-card-core.o
snd-soc-simple-card-objs := simple-card.o
+snd-soc-simple-dpcm-card-objs := simple-dpcm-card.o
obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o
+obj-$(CONFIG_SND_SIMPLE_DPCM_CARD) += snd-soc-simple-dpcm-card.o
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/generic/simple-dpcm-card.c
similarity index 100%
rename from sound/soc/sh/rcar/rsrc-card.c
rename to sound/soc/generic/simple-dpcm-card.c
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index d34d5ed..6db6405 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -42,12 +42,6 @@ config SND_SOC_RCAR
help
This option enables R-Car SRU/SCU/SSIU/SSI sound support
-config SND_SOC_RSRC_CARD
- tristate "Renesas Sampling Rate Convert Sound Card"
- select SND_SIMPLE_CARD_CORE
- help
- This option enables simple sound if you need sampling rate convert
-
##
## Boards
##
diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/sh/rcar/Makefile
index a89ddf7..9c3d5ae 100644
--- a/sound/soc/sh/rcar/Makefile
+++ b/sound/soc/sh/rcar/Makefile
@@ -1,5 +1,2 @@
snd-soc-rcar-objs := core.o gen.o dma.o adg.o ssi.o ssiu.o src.o ctu.o mix.o dvc.o cmd.o
obj-$(CONFIG_SND_SOC_RCAR) += snd-soc-rcar.o
-
-snd-soc-rsrc-card-objs := rsrc-card.o
-obj-$(CONFIG_SND_SOC_RSRC_CARD) += snd-soc-rsrc-card.o
--
1.9.1
