diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-04-05 00:56:27 +0900 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-04-28 17:14:31 +0100 |
| commit | 1bd0962e3d5bc66ee0ee207a61485c6a436cfac2 (patch) | |
| tree | 4244f3ac55b7c0d464680d063fcca6a3cae4d535 /arch | |
| parent | 4cad154b30e7471628cb1943081c72b6368b079a (diff) | |
| download | op-kernel-dev-1bd0962e3d5bc66ee0ee207a61485c6a436cfac2.zip op-kernel-dev-1bd0962e3d5bc66ee0ee207a61485c6a436cfac2.tar.gz | |
[MIPS] jmr3927: use generic txx9 gpio
Use generic txx9 gpio (and gpiolib) for JMR3927 board.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/Kconfig | 1 | ||||
| -rw-r--r-- | arch/mips/jmr3927/rbhma3100/setup.c | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index abc485d..77e3d24 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -613,6 +613,7 @@ config TOSHIBA_JMR3927 select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN select GENERIC_HARDIRQS_NO__DO_IRQ + select GPIO_TXX9 config TOSHIBA_RBTX4927 bool "Toshiba RBTX49[23]7 board" diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index c886d80..f39c444 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c @@ -36,11 +36,13 @@ #include <linux/pm.h> #include <linux/platform_device.h> #include <linux/clk.h> +#include <linux/gpio.h> #ifdef CONFIG_SERIAL_TXX9 #include <linux/serial_core.h> #endif #include <asm/txx9tmr.h> +#include <asm/txx9pio.h> #include <asm/reboot.h> #include <asm/jmr3927/jmr3927.h> #include <asm/mipsregs.h> @@ -340,9 +342,12 @@ static void __init tx3927_setup(void) /* PIO */ /* PIO[15:12] connected to LEDs */ - tx3927_pioptr->dir = 0x0000f000; - tx3927_pioptr->maskcpu = 0; - tx3927_pioptr->maskext = 0; + __raw_writel(0x0000f000, &tx3927_pioptr->dir); + __raw_writel(0, &tx3927_pioptr->maskcpu); + __raw_writel(0, &tx3927_pioptr->maskext); + txx9_gpio_init(TX3927_PIO_REG, 0, 16); + gpio_request(11, "dipsw1"); + gpio_request(10, "dipsw2"); { unsigned int conf; |
