diff options
| author | Magnus Damm <damm@opensource.se> | 2011-12-13 16:36:42 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 01:18:30 (GMT) |
| commit | 14f691c139bd372c8b254650db6b3956e6473665 (patch) | |
| tree | 89753f2cfe0e9d4509c86f063cd3bae9086632e9 /arch | |
| parent | 19c43fc53870e772084bb778f2bb3c949bf9a3b7 (diff) | |
| download | linux-14f691c139bd372c8b254650db6b3956e6473665.tar.xz | |
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')
| -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 0ea8b48..7fcd5e1 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -25,6 +25,7 @@ #include <linux/platform_device.h> #include <linux/delay.h> #include <linux/io.h> +#include <linux/gpio.h> #include <linux/dma-mapping.h> #include <mach/hardware.h> #include <mach/r8a7779.h> @@ -86,6 +87,14 @@ static void __init marzen_init(void) { r8a7779_pinmux_init(); + /* SCIF2 (CN18: DEBUG0) */ + gpio_request(GPIO_FN_TX2_C, NULL); + gpio_request(GPIO_FN_RX2_C, NULL); + + /* SCIF4 (CN19: DEBUG1) */ + gpio_request(GPIO_FN_TX4, NULL); + gpio_request(GPIO_FN_RX4, NULL); + r8a7779_add_standard_devices(); platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); } |