ASoC: rsnd: remove pin sync option
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 24 Jan 2014 02:39:23 +0000 (18:39 -0800)
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>
Wed, 4 Feb 2015 10:13:00 +0000 (11:13 +0100)
Renesas Chip is supporting multi pin sound,
but the HW setting is very difficult and confusable.
But driver is supporting it halfway.
Remove SYNC option at this point.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 6f3ab6c1c022e7a4877d38940cd45ae7804a15e2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
include/sound/rcar_snd.h
sound/soc/sh/rcar/ssi.c

index 6add6cc..1d19bfc 100644 (file)
@@ -35,6 +35,7 @@
  */
 #define RSND_SSI_CLK_PIN_SHARE         (1 << 31)
 #define RSND_SSI_SYNC                  (1 << 29) /* SSI34_sync etc */
+#define RSND_SSI_CLK_FROM_ADG          (1 << 30) /* clock parent is master */
 
 #define RSND_SSI_PLAY                  (1 << 24)
 
index ddcca06..68393a9 100644 (file)
@@ -136,8 +136,6 @@ static void rsnd_ssi_mode_set(struct rsnd_priv *priv,
                        val = adg;                      \
                else                                    \
                        val = ext;                      \
-               if (flags & RSND_SSI_SYNC)              \
-                       val |= sync;                    \
        } while (0)
 
        flags = rsnd_ssi_mode_flags(ssi);