Message ID | 87fvqramfr.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | c653033bae957ee141b2d27881c22e46ff26c651 |
Headers | show |
On Tue, Nov 19, 2013 at 05:31:23PM -0800, Kuninori Morimoto wrote: > 92eba04e4bcd469518cc759ac1bf1a49acaa5cc1 > (ASoC: rcar: remove RSND_SSI_CLK_FROM_ADG) removed > RSND_SSI_CLK_FROM_ADG, it is no longer needed Acked-by: Mark Brown <broonie@linaro.org> I ignored this because it was ARM: - I get CCed on a lot of architecture patches that arne't terribly relevant/interesting.
On Wed, Nov 20, 2013 at 09:45:16AM +0000, Mark Brown wrote: > On Tue, Nov 19, 2013 at 05:31:23PM -0800, Kuninori Morimoto wrote: > > 92eba04e4bcd469518cc759ac1bf1a49acaa5cc1 > > (ASoC: rcar: remove RSND_SSI_CLK_FROM_ADG) removed > > RSND_SSI_CLK_FROM_ADG, it is no longer needed > > Acked-by: Mark Brown <broonie@linaro.org> > > I ignored this because it was ARM: - I get CCed on a lot of architecture > patches that arne't terribly relevant/interesting. Thanks, I have (finally) queued this up. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index 1b1dae3..ffca67c 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -308,11 +308,11 @@ static struct rsnd_ssi_platform_info rsnd_ssi[] = { RSND_SSI_UNUSED, /* SSI 1 */ RSND_SSI_UNUSED, /* SSI 2 */ RSND_SSI_SET(1, 0, gic_iid(0x85), RSND_SSI_PLAY), - RSND_SSI_SET(2, 0, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE | RSND_SSI_CLK_FROM_ADG), + RSND_SSI_SET(2, 0, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE), RSND_SSI_SET(0, 0, gic_iid(0x86), RSND_SSI_PLAY), RSND_SSI_SET(0, 0, gic_iid(0x86), 0), RSND_SSI_SET(3, 0, gic_iid(0x86), RSND_SSI_PLAY), - RSND_SSI_SET(4, 0, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE | RSND_SSI_CLK_FROM_ADG), + RSND_SSI_SET(4, 0, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE), }; static struct rsnd_scu_platform_info rsnd_scu[9] = { diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index 12afab1..6ce506b 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h @@ -34,7 +34,6 @@ * B : SSI direction */ #define RSND_SSI_CLK_PIN_SHARE (1 << 31) -#define RSND_SSI_CLK_FROM_ADG (1 << 30) /* clock parent is master */ #define RSND_SSI_SYNC (1 << 29) /* SSI34_sync etc */ #define RSND_SSI_PLAY (1 << 24)