ramips: register gpio buttons on the DIR-300 revB board

SVN-Revision: 19410
This commit is contained in:
Gabor Juhos 2010-01-30 15:25:44 +00:00
parent f9b053e87f
commit 30a397fd5e
4 changed files with 28 additions and 3 deletions

View file

@ -10,6 +10,7 @@ config RT305X_MACH_WHR_G300N
config RT305X_MACH_DIR_300_REVB config RT305X_MACH_DIR_300_REVB
bool "D-Link DIR-300 revB board support" bool "D-Link DIR-300 revB board support"
default y default y
select RALINK_DEV_GPIO_BUTTONS
select RALINK_DEV_GPIO_LEDS select RALINK_DEV_GPIO_LEDS
config RT305X_MACH_V22RW_2X2 config RT305X_MACH_V22RW_2X2

View file

@ -1,7 +1,7 @@
/* /*
* D-Link DIR-300 rev B board support * D-Link DIR-300 rev B board support
* *
* Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org> * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published * under the terms of the GNU General Public License version 2 as published
@ -15,6 +15,7 @@
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <asm/mach-ralink/machine.h> #include <asm/mach-ralink/machine.h>
#include <asm/mach-ralink/dev-gpio-buttons.h>
#include <asm/mach-ralink/dev-gpio-leds.h> #include <asm/mach-ralink/dev-gpio-leds.h>
#include <asm/mach-ralink/rt305x.h> #include <asm/mach-ralink/rt305x.h>
#include <asm/mach-ralink/rt305x_regs.h> #include <asm/mach-ralink/rt305x_regs.h>
@ -28,6 +29,8 @@
#define DIR_300B_GPIO_BUTTON_WPS 0 /* active low */ #define DIR_300B_GPIO_BUTTON_WPS 0 /* active low */
#define DIR_300B_GPIO_BUTTON_RESET 10 /* active low */ #define DIR_300B_GPIO_BUTTON_RESET 10 /* active low */
#define DIR_300B_BUTTONS_POLL_INTERVAL 20
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition dir_300b_partitions[] = { static struct mtd_partition dir_300b_partitions[] = {
{ {
@ -84,6 +87,24 @@ static struct gpio_led dir_300b_leds_gpio[] __initdata = {
} }
}; };
static struct gpio_button dir_300b_gpio_buttons[] __initdata = {
{
.desc = "reset",
.type = EV_KEY,
.code = BTN_0,
.threshold = 3,
.gpio = DIR_300B_GPIO_BUTTON_RESET,
.active_low = 1,
}, {
.desc = "wps",
.type = EV_KEY,
.code = BTN_1,
.threshold = 3,
.gpio = DIR_300B_GPIO_BUTTON_WPS,
.active_low = 1,
}
};
static void __init dir_300b_init(void) static void __init dir_300b_init(void)
{ {
rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT); rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
@ -92,6 +113,9 @@ static void __init dir_300b_init(void)
rt305x_register_ethernet(); rt305x_register_ethernet();
ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio), ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio),
dir_300b_leds_gpio); dir_300b_leds_gpio);
ramips_register_gpio_buttons(-1, DIR_300B_BUTTONS_POLL_INTERVAL,
ARRAY_SIZE(dir_300b_gpio_buttons),
dir_300b_gpio_buttons);
} }
MIPS_MACHINE(RAMIPS_MACH_DIR_300_REVB, "DIR-300-revB", "D-Link DIR-300 revB", MIPS_MACHINE(RAMIPS_MACH_DIR_300_REVB, "DIR-300-revB", "D-Link DIR-300 revB",

View file

@ -109,7 +109,7 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set # CONFIG_PNX8550_STB810 is not set
# CONFIG_PROBE_INITRD_HEADER is not set # CONFIG_PROBE_INITRD_HEADER is not set
# CONFIG_RALINK_DEV_GPIO_BUTTONS is not set CONFIG_RALINK_DEV_GPIO_BUTTONS=y
CONFIG_RALINK_DEV_GPIO_LEDS=y CONFIG_RALINK_DEV_GPIO_LEDS=y
# CONFIG_RALINK_RT288X is not set # CONFIG_RALINK_RT288X is not set
CONFIG_RALINK_RT305X=y CONFIG_RALINK_RT305X=y

View file

@ -112,7 +112,7 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set # CONFIG_PNX8550_STB810 is not set
# CONFIG_PROBE_INITRD_HEADER is not set # CONFIG_PROBE_INITRD_HEADER is not set
# CONFIG_RALINK_DEV_GPIO_BUTTONS is not set CONFIG_RALINK_DEV_GPIO_BUTTONS=y
CONFIG_RALINK_DEV_GPIO_LEDS=y CONFIG_RALINK_DEV_GPIO_LEDS=y
# CONFIG_RALINK_RT288X is not set # CONFIG_RALINK_RT288X is not set
CONFIG_RALINK_RT305X=y CONFIG_RALINK_RT305X=y