diff options
-rw-r--r-- | arch/arm/mach-shmobile/board-bockw.c | 4 | ||||
-rw-r--r-- | include/sound/rcar_snd.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index 540f0dc2431a..eb5b54fc5cc9 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c | |||
@@ -332,11 +332,11 @@ static struct rsnd_ssi_platform_info rsnd_ssi[] = { | |||
332 | RSND_SSI_UNUSED, /* SSI 1 */ | 332 | RSND_SSI_UNUSED, /* SSI 1 */ |
333 | RSND_SSI_UNUSED, /* SSI 2 */ | 333 | RSND_SSI_UNUSED, /* SSI 2 */ |
334 | RSND_SSI_SET(1, 0, gic_iid(0x85), RSND_SSI_PLAY), | 334 | RSND_SSI_SET(1, 0, gic_iid(0x85), RSND_SSI_PLAY), |
335 | RSND_SSI_SET(2, 0, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE | RSND_SSI_CLK_FROM_ADG), | 335 | RSND_SSI_SET(2, 0, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE), |
336 | RSND_SSI_SET(0, 0, gic_iid(0x86), RSND_SSI_PLAY), | 336 | RSND_SSI_SET(0, 0, gic_iid(0x86), RSND_SSI_PLAY), |
337 | RSND_SSI_SET(0, 0, gic_iid(0x86), 0), | 337 | RSND_SSI_SET(0, 0, gic_iid(0x86), 0), |
338 | RSND_SSI_SET(3, 0, gic_iid(0x86), RSND_SSI_PLAY), | 338 | RSND_SSI_SET(3, 0, gic_iid(0x86), RSND_SSI_PLAY), |
339 | RSND_SSI_SET(4, 0, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE | RSND_SSI_CLK_FROM_ADG), | 339 | RSND_SSI_SET(4, 0, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE), |
340 | }; | 340 | }; |
341 | 341 | ||
342 | static struct rsnd_scu_platform_info rsnd_scu[9] = { | 342 | static struct rsnd_scu_platform_info rsnd_scu[9] = { |
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index 12afab18945d..6ce506b09383 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h | |||
@@ -34,7 +34,6 @@ | |||
34 | * B : SSI direction | 34 | * B : SSI direction |
35 | */ | 35 | */ |
36 | #define RSND_SSI_CLK_PIN_SHARE (1 << 31) | 36 | #define RSND_SSI_CLK_PIN_SHARE (1 << 31) |
37 | #define RSND_SSI_CLK_FROM_ADG (1 << 30) /* clock parent is master */ | ||
38 | #define RSND_SSI_SYNC (1 << 29) /* SSI34_sync etc */ | 37 | #define RSND_SSI_SYNC (1 << 29) /* SSI34_sync etc */ |
39 | 38 | ||
40 | #define RSND_SSI_PLAY (1 << 24) | 39 | #define RSND_SSI_PLAY (1 << 24) |