KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm63xx: Fix gpio-buttons and add LED and buttons for Tecom IGW6200 and Comtrend CT-5261

Browse source 
SVN-Revision: 19361
This commit is contained in:
Daniel Dickinson 2010-01-28 16:54:00 +00:00
parent 93e0e3ac0a
commit 022594b0ed
2 changed files with 61 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
View file

@ -33,6 +33,7 @@
#include <bcm63xx_dev_usb_udc.h>
#include <bcm63xx_dev_spi.h>
#include <board_bcm963xx.h>
#include <linux/input.h>
#define PFX "board_bcm963xx: "
@ -295,6 +296,16 @@ static struct board_info __initdata board_96348gw_11 = {
.active_low = 1,
},
},
.reset_buttons = {
{
.desc = "reset",
.gpio = 32,
.active_low = 1,
.type = EV_KEY,
.code = BTN_0,
.threshold = 3,
},
},
};
static struct board_info __initdata board_96348gw = {
@ -330,16 +341,6 @@ static struct board_info __initdata board_96348gw = {
.gpio = 2,
.active_low = 1,
},
{
.name = "ppp",
.gpio = 3,
.active_low = 1,
},
{
.name = "ppp-fail",
.gpio = 4,
.active_low = 1,
},
{
.name = "power",
.gpio = 0,
@ -351,7 +352,41 @@ static struct board_info __initdata board_96348gw = {
.gpio = 1,
.active_low = 1,
},
{
.name = "line1",
.gpio = 4,
.active_low = 1,
},
{
.name = "line2",
.gpio = 5,
.active_low = 1,
},
{ .name = "line3",
.gpio = 6,
.active_low = 1,
},
{
.name = "tel",
.gpio = 7,
.active_low = 1,
},
{
.name = "eth",
.gpio = 35,
.active_low = 1,
},
},
.reset_buttons = {
{
.desc = "reset",
.gpio = 36,
.active_low = 1,
.type = EV_KEY,
.code = BTN_0,
.threshold = 3,
},
},
};
static struct board_info __initdata board_FAST2404 = {
@ -606,7 +641,16 @@ static struct board_info __initdata board_AGPFS0 = {
},
},
.reset_btn = 37, /* sw2 */
.reset_buttons = {
{
.desc = "sw2",
.gpio = 37,
.active_low = 1,
.type = EV_KEY,
.code = BTN_0,
.threshold = 3,
},
},
/* sw1 is connected to gpio34*/
};
@ -869,11 +913,11 @@ static struct platform_device bcm63xx_gpio_leds = {
.dev.platform_data = &bcm63xx_led_data,
};
struct gpio_buttons_platform_data bcm63xx_gpio_buttons_data = {
static struct gpio_buttons_platform_data bcm63xx_gpio_buttons_data = {
.poll_interval = 20,
};
struct platform_device bcm63xx_gpio_buttons_device = {
static struct platform_device bcm63xx_gpio_buttons_device = {
.name = "gpio-buttons",
.id = 0,
.dev.platform_data = &bcm63xx_gpio_buttons_data,
@ -947,9 +991,9 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_leds);
if (board.reset_btn) {
bcm63xx_gpio_buttons_data.nbuttons = 1,
bcm63xx_gpio_buttons_data.buttons = board.reset_btn;
if (board.reset_buttons) {
bcm63xx_gpio_buttons_data.nbuttons = ARRAY_SIZE(board.reset_buttons);
bcm63xx_gpio_buttons_data.buttons = board.reset_buttons;
platform_device_register(&bcm63xx_gpio_buttons_device);
}

2
target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h
View file

@ -58,7 +58,7 @@ struct board_info {
struct gpio_led leds[8];
/* Reset button */
unsigned int reset_btn;
struct gpio_button reset_buttons[1];
};
#endif /* ! BOARD_BCM963XX_H_ */