diff options
-rw-r--r-- | include/sound/rcar_snd.h | 1 | ||||
-rw-r--r-- | sound/soc/sh/rcar/ssi.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index 6add6ccc811e..1d19bfc2486d 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h | |||
@@ -35,6 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | #define RSND_SSI_CLK_PIN_SHARE (1 << 31) | 36 | #define RSND_SSI_CLK_PIN_SHARE (1 << 31) |
37 | #define RSND_SSI_SYNC (1 << 29) /* SSI34_sync etc */ | 37 | #define RSND_SSI_SYNC (1 << 29) /* SSI34_sync etc */ |
38 | #define RSND_SSI_CLK_FROM_ADG (1 << 30) /* clock parent is master */ | ||
38 | 39 | ||
39 | #define RSND_SSI_PLAY (1 << 24) | 40 | #define RSND_SSI_PLAY (1 << 24) |
40 | 41 | ||
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index ddcca067908c..68393a9f91bf 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c | |||
@@ -136,8 +136,6 @@ static void rsnd_ssi_mode_set(struct rsnd_priv *priv, | |||
136 | val = adg; \ | 136 | val = adg; \ |
137 | else \ | 137 | else \ |
138 | val = ext; \ | 138 | val = ext; \ |
139 | if (flags & RSND_SSI_SYNC) \ | ||
140 | val |= sync; \ | ||
141 | } while (0) | 139 | } while (0) |
142 | 140 | ||
143 | flags = rsnd_ssi_mode_flags(ssi); | 141 | flags = rsnd_ssi_mode_flags(ssi); |