ASoC: rsrc-card: rename rsrc-card to simple-scu-card phase3

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 will be renamed to
simple-scu-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@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt
similarity index 100%
rename from Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
rename to Documentation/devicetree/bindings/sound/simple-scu-card.txt

diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig
index c01c5dd68601b69d519f0fb7d1953efc994f61bd..2d0ff037c5a1c52941f6caafea0298456537930c 100644 (file)
--- a/sound/soc/generic/Kconfig
+++ b/sound/soc/generic/Kconfig
@@ -6,3 +6,10 @@ config SND_SIMPLE_CARD
        select SND_SIMPLE_CARD_UTILS
        help
          This option enables generic simple sound card support
+
+config SND_SIMPLE_SCU_CARD
+       tristate "ASoC Simple SCU sound card support"
+       select SND_SIMPLE_CARD_UTILS
+       help
+         This option enables generic simple SCU sound card support.
+         It supports DPCM of multi CPU single Codec ststem.

diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile
index 2d53c8d70705b2688a748967bbd0517335138fe2..ee750f3023baf8acdb8ecd3b2dcf7bc943d6dcd9 100644 (file)
--- a/sound/soc/generic/Makefile
+++ b/sound/soc/generic/Makefile
@@ -1,5 +1,7 @@
 snd-soc-simple-card-utils-objs := simple-card-utils.o
 snd-soc-simple-card-objs       := simple-card.o
+snd-soc-simple-scu-card-objs   := simple-scu-card.o
 
 obj-$(CONFIG_SND_SIMPLE_CARD_UTILS)    += snd-soc-simple-card-utils.o
 obj-$(CONFIG_SND_SIMPLE_CARD)          += snd-soc-simple-card.o
+obj-$(CONFIG_SND_SIMPLE_SCU_CARD)      += snd-soc-simple-scu-card.o

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/generic/simple-scu-card.c
similarity index 100%
rename from sound/soc/sh/rcar/rsrc-card.c
rename to sound/soc/generic/simple-scu-card.c

diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 9311f119feb5da5b8889427d603a642e3b124cd3..6db6405d952f87c9b742ae833ea2735f9925e9db 100644 (file)
--- 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_UTILS
-       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 a89ddf75869531f17acfddafcf3fa895613c06aa..9c3d5aed99d1441322fc80ec23a6ac165f65ba7e 100644 (file)
--- 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