Переглянути джерело

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>
Kuninori Morimoto 9 роки тому
батько
коміт
d12c6216c4

+ 0 - 0
Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt → Documentation/devicetree/bindings/sound/simple-scu-card.txt


+ 7 - 0
sound/soc/generic/Kconfig

@@ -6,3 +6,10 @@ config SND_SIMPLE_CARD
 	select SND_SIMPLE_CARD_UTILS
 	select SND_SIMPLE_CARD_UTILS
 	help
 	help
 	  This option enables generic simple sound card support
 	  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.

+ 2 - 0
sound/soc/generic/Makefile

@@ -1,5 +1,7 @@
 snd-soc-simple-card-utils-objs	:= simple-card-utils.o
 snd-soc-simple-card-utils-objs	:= simple-card-utils.o
 snd-soc-simple-card-objs	:= simple-card.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_UTILS)	+= snd-soc-simple-card-utils.o
 obj-$(CONFIG_SND_SIMPLE_CARD)		+= snd-soc-simple-card.o
 obj-$(CONFIG_SND_SIMPLE_CARD)		+= snd-soc-simple-card.o
+obj-$(CONFIG_SND_SIMPLE_SCU_CARD)	+= snd-soc-simple-scu-card.o

+ 0 - 0
sound/soc/sh/rcar/rsrc-card.c → sound/soc/generic/simple-scu-card.c


+ 0 - 6
sound/soc/sh/Kconfig

@@ -42,12 +42,6 @@ config SND_SOC_RCAR
 	help
 	help
 	  This option enables R-Car SRU/SCU/SSIU/SSI sound support
 	  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
 ## Boards
 ##
 ##

+ 0 - 3
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
 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
 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