diff options
author | Magnus Damm <damm@opensource.se> | 2011-12-13 11:36:42 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 20:18:30 -0500 |
commit | 14f691c139bd372c8b254650db6b3956e6473665 (patch) | |
tree | 89753f2cfe0e9d4509c86f063cd3bae9086632e9 /arch/arm/mach-shmobile/board-marzen.c | |
parent | 19c43fc53870e772084bb778f2bb3c949bf9a3b7 (diff) |
ARM: mach-shmobile: Marzen SCIF2/SCIF4 support
Add SCIF2 and SCIF4 pin configuration code to
the r8a7779 Marzen board.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile/board-marzen.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 0ea8b489e7e9..7fcd5e10c31d 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
28 | #include <linux/gpio.h> | ||
28 | #include <linux/dma-mapping.h> | 29 | #include <linux/dma-mapping.h> |
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
30 | #include <mach/r8a7779.h> | 31 | #include <mach/r8a7779.h> |
@@ -86,6 +87,14 @@ static void __init marzen_init(void) | |||
86 | { | 87 | { |
87 | r8a7779_pinmux_init(); | 88 | r8a7779_pinmux_init(); |
88 | 89 | ||
90 | /* SCIF2 (CN18: DEBUG0) */ | ||
91 | gpio_request(GPIO_FN_TX2_C, NULL); | ||
92 | gpio_request(GPIO_FN_RX2_C, NULL); | ||
93 | |||
94 | /* SCIF4 (CN19: DEBUG1) */ | ||
95 | gpio_request(GPIO_FN_TX4, NULL); | ||
96 | gpio_request(GPIO_FN_RX4, NULL); | ||
97 | |||
89 | r8a7779_add_standard_devices(); | 98 | r8a7779_add_standard_devices(); |
90 | platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); | 99 | platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); |
91 | } | 100 | } |