1 files changed, 0 insertions, 71 deletions
diff --git a/patches.renesas/0293-ASoC-rsnd-add-rsnd_dvc_initialize_lock-unlock.patch b/patches.renesas/0293-ASoC-rsnd-add-rsnd_dvc_initialize_lock-unlock.patch
deleted file mode 100644
index 5b084c7f38f603..00000000000000
--- a/patches.renesas/0293-ASoC-rsnd-add-rsnd_dvc_initialize_lock-unlock.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 73998d8e58a110d0f791977e35498c6261191de8 Mon Sep 17 00:00:00 2001
-From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
-Date: Wed, 15 Jul 2015 07:13:29 +0000
-Subject: [PATCH 293/326] ASoC: rsnd: add rsnd_dvc_initialize_lock/unlock()
-
-Renesas SCU (Sampling Rate Convert Unit) includes SRC/CTU/MIX/DVC,
-and these have similar register. xxxIR (Initialization Register) is one
-of them. These xxxIR need be set to 1 during initialization.
-Current rsnd driver has src.c / dvc.c, and we will have mix.c.
-It is readable if these have same named function.
-This patch adds rsnd_dvc_initialize_lock/unlock() and make sure it
-
-Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
-Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-(cherry picked from commit 3bb3d363e50d371289f0bd63b48da771ea807c02)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- sound/soc/sh/rcar/dvc.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
-index 9392507b5651..343d44625fa5 100644
---- a/sound/soc/sh/rcar/dvc.c
-+++ b/sound/soc/sh/rcar/dvc.c
-@@ -70,6 +70,13 @@ static void rsnd_dvc_soft_reset(struct rsnd_mod *mod)
- 	rsnd_mod_write(mod, DVC_SWRSR, 1);
- }
- 
-+#define rsnd_dvc_initialize_lock(mod)	__rsnd_dvc_initialize_lock(mod, 1)
-+#define rsnd_dvc_initialize_unlock(mod)	__rsnd_dvc_initialize_lock(mod, 0)
-+static void __rsnd_dvc_initialize_lock(struct rsnd_mod *mod, u32 enable)
-+{
-+	rsnd_mod_write(mod, DVC_DVUIR, enable);
-+}
-+
- static void rsnd_dvc_volume_update(struct rsnd_dai_stream *io,
- 				   struct rsnd_mod *mod)
- {
-@@ -150,17 +157,15 @@ static int rsnd_dvc_init(struct rsnd_mod *mod,
- 
- 	rsnd_dvc_soft_reset(mod);
- 
--	rsnd_path_parse(priv, io);
-+	rsnd_dvc_initialize_lock(mod);
- 
--	rsnd_mod_write(mod, DVC_DVUIR, 1);
-+	rsnd_path_parse(priv, io);
- 
- 	rsnd_mod_write(mod, DVC_ADINR, rsnd_get_adinr(mod, io));
- 
- 	/* ch0/ch1 Volume */
- 	rsnd_dvc_volume_update(io, mod);
- 
--	rsnd_mod_write(mod, DVC_DVUIR, 0);
--
- 	rsnd_adg_set_cmd_timsel_gen2(mod, io);
- 
- 	return 0;
-@@ -179,6 +184,8 @@ static int rsnd_dvc_start(struct rsnd_mod *mod,
- 			  struct rsnd_dai_stream *io,
- 			  struct rsnd_priv *priv)
- {
-+	rsnd_dvc_initialize_unlock(mod);
-+
- 	rsnd_mod_write(mod, CMD_CTRL, 0x10);
- 
- 	return 0;
--- 
-2.6.2
-