diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index dfd768b1ad7d..3f07b072d995 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -109,7 +109,7 @@ For more detail information, see below - Register Description - CTUn Scale Value exx Register (CTUn_SVxxR) - ${LINUX}/sound/soc/sh/rcar/ctu.c + ${LINUX}/sound/soc/renesas/rcar/ctu.c - comment of header You need to use "simple-scu-audio-card" or "audio-graph-scu-card" for it. diff --git a/MAINTAINERS b/MAINTAINERS index 877b53abba49..a870d5798e81 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19667,6 +19667,17 @@ S: Maintained F: Documentation/devicetree/bindings/sound/renesas,idt821034.yaml F: sound/soc/codecs/idt821034.c +RENESAS R-CAR & FSI AUDIO (ASoC) DRIVERS +M: Kuninori Morimoto +L: linux-sound@vger.kernel.org +L: linux-renesas-soc@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/sound/renesas,rsnd.* +F: Documentation/devicetree/bindings/sound/renesas,fsi.yaml +F: sound/soc/renesas/rcar/ +F: sound/soc/renesas/fsi.c +F: include/sound/sh_fsi.h + RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER M: Miquel Raynal L: linux-mtd@lists.infradead.org @@ -19715,6 +19726,15 @@ S: Supported F: Documentation/devicetree/bindings/i2c/renesas,riic.yaml F: drivers/i2c/busses/i2c-riic.c +RENESAS RZ AUDIO (ASoC) DRIVER +M: Biju Das +M: Lad Prabhakar +L: linux-sound@vger.kernel.org +L: linux-renesas-soc@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml +F: sound/soc/renesas/rz-ssi.c + RENESAS RZ/G2L A/D DRIVER M: Lad Prabhakar L: linux-iio@vger.kernel.org diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 8e01b421fe8d..5efba76abb31 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -106,10 +106,10 @@ source "sound/soc/meson/Kconfig" source "sound/soc/mxs/Kconfig" source "sound/soc/pxa/Kconfig" source "sound/soc/qcom/Kconfig" +source "sound/soc/renesas/Kconfig" source "sound/soc/rockchip/Kconfig" source "sound/soc/samsung/Kconfig" source "sound/soc/sdca/Kconfig" -source "sound/soc/sh/Kconfig" source "sound/soc/sof/Kconfig" source "sound/soc/spear/Kconfig" source "sound/soc/sprd/Kconfig" diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 5307b0b62a93..08baaa11d813 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -59,10 +59,10 @@ obj-$(CONFIG_SND_SOC) += mxs/ obj-$(CONFIG_SND_SOC) += kirkwood/ obj-$(CONFIG_SND_SOC) += pxa/ obj-$(CONFIG_SND_SOC) += qcom/ +obj-$(CONFIG_SND_SOC) += renesas/ obj-$(CONFIG_SND_SOC) += rockchip/ obj-$(CONFIG_SND_SOC) += samsung/ obj-$(CONFIG_SND_SOC) += sdca/ -obj-$(CONFIG_SND_SOC) += sh/ obj-$(CONFIG_SND_SOC) += sof/ obj-$(CONFIG_SND_SOC) += spear/ obj-$(CONFIG_SND_SOC) += sprd/ diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 4ad3d1b0714f..747afe7d6f34 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -50,7 +50,7 @@ snd_soc_runtime_get_dai_fmt() sample driver - linux/sound/soc/sh/rcar/core.c + linux/sound/soc/renesas/rcar/core.c linux/sound/soc/codecs/ak4613.c linux/sound/soc/codecs/pcm3168a.c linux/sound/soc/soc-utils.c diff --git a/sound/soc/sh/Kconfig b/sound/soc/renesas/Kconfig similarity index 100% rename from sound/soc/sh/Kconfig rename to sound/soc/renesas/Kconfig diff --git a/sound/soc/sh/Makefile b/sound/soc/renesas/Makefile similarity index 100% rename from sound/soc/sh/Makefile rename to sound/soc/renesas/Makefile diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/renesas/dma-sh7760.c similarity index 100% rename from sound/soc/sh/dma-sh7760.c rename to sound/soc/renesas/dma-sh7760.c diff --git a/sound/soc/sh/fsi.c b/sound/soc/renesas/fsi.c similarity index 100% rename from sound/soc/sh/fsi.c rename to sound/soc/renesas/fsi.c diff --git a/sound/soc/sh/hac.c b/sound/soc/renesas/hac.c similarity index 100% rename from sound/soc/sh/hac.c rename to sound/soc/renesas/hac.c diff --git a/sound/soc/sh/migor.c b/sound/soc/renesas/migor.c similarity index 100% rename from sound/soc/sh/migor.c rename to sound/soc/renesas/migor.c diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/renesas/rcar/Makefile similarity index 100% rename from sound/soc/sh/rcar/Makefile rename to sound/soc/renesas/rcar/Makefile diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/renesas/rcar/adg.c similarity index 100% rename from sound/soc/sh/rcar/adg.c rename to sound/soc/renesas/rcar/adg.c diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/renesas/rcar/cmd.c similarity index 100% rename from sound/soc/sh/rcar/cmd.c rename to sound/soc/renesas/rcar/cmd.c diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/renesas/rcar/core.c similarity index 100% rename from sound/soc/sh/rcar/core.c rename to sound/soc/renesas/rcar/core.c diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/renesas/rcar/ctu.c similarity index 100% rename from sound/soc/sh/rcar/ctu.c rename to sound/soc/renesas/rcar/ctu.c diff --git a/sound/soc/sh/rcar/debugfs.c b/sound/soc/renesas/rcar/debugfs.c similarity index 100% rename from sound/soc/sh/rcar/debugfs.c rename to sound/soc/renesas/rcar/debugfs.c diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/renesas/rcar/dma.c similarity index 100% rename from sound/soc/sh/rcar/dma.c rename to sound/soc/renesas/rcar/dma.c diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/renesas/rcar/dvc.c similarity index 100% rename from sound/soc/sh/rcar/dvc.c rename to sound/soc/renesas/rcar/dvc.c diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/renesas/rcar/gen.c similarity index 100% rename from sound/soc/sh/rcar/gen.c rename to sound/soc/renesas/rcar/gen.c diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/renesas/rcar/mix.c similarity index 100% rename from sound/soc/sh/rcar/mix.c rename to sound/soc/renesas/rcar/mix.c diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/renesas/rcar/rsnd.h similarity index 100% rename from sound/soc/sh/rcar/rsnd.h rename to sound/soc/renesas/rcar/rsnd.h diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/renesas/rcar/src.c similarity index 100% rename from sound/soc/sh/rcar/src.c rename to sound/soc/renesas/rcar/src.c diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/renesas/rcar/ssi.c similarity index 100% rename from sound/soc/sh/rcar/ssi.c rename to sound/soc/renesas/rcar/ssi.c diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/renesas/rcar/ssiu.c similarity index 100% rename from sound/soc/sh/rcar/ssiu.c rename to sound/soc/renesas/rcar/ssiu.c diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/renesas/rz-ssi.c similarity index 100% rename from sound/soc/sh/rz-ssi.c rename to sound/soc/renesas/rz-ssi.c diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/renesas/sh7760-ac97.c similarity index 100% rename from sound/soc/sh/sh7760-ac97.c rename to sound/soc/renesas/sh7760-ac97.c diff --git a/sound/soc/sh/siu.h b/sound/soc/renesas/siu.h similarity index 100% rename from sound/soc/sh/siu.h rename to sound/soc/renesas/siu.h diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/renesas/siu_dai.c similarity index 100% rename from sound/soc/sh/siu_dai.c rename to sound/soc/renesas/siu_dai.c diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/renesas/siu_pcm.c similarity index 100% rename from sound/soc/sh/siu_pcm.c rename to sound/soc/renesas/siu_pcm.c diff --git a/sound/soc/sh/ssi.c b/sound/soc/renesas/ssi.c similarity index 100% rename from sound/soc/sh/ssi.c rename to sound/soc/renesas/ssi.c