mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 03:58:26 +02:00
e212aad78a
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22800 3c298f89-4303-0410-b956-a3cf2f4a3e73
83 lines
1.8 KiB
Diff
83 lines
1.8 KiB
Diff
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
@@ -345,24 +345,39 @@ static struct board_info __initdata boar
|
|
.active_low = 1,
|
|
},
|
|
{
|
|
- .name = "ppp",
|
|
- .gpio = 3,
|
|
+ .name = "power",
|
|
+ .gpio = 0,
|
|
.active_low = 1,
|
|
+ .default_trigger = "default-on",
|
|
},
|
|
{
|
|
- .name = "ppp-fail",
|
|
+ .name = "stop",
|
|
+ .gpio = 1,
|
|
+ .active_low = 1,
|
|
+ },
|
|
+ {
|
|
+ .name = "line1",
|
|
.gpio = 4,
|
|
.active_low = 1,
|
|
},
|
|
{
|
|
- .name = "power",
|
|
- .gpio = 0,
|
|
+ .name = "line2",
|
|
+ .gpio = 5,
|
|
.active_low = 1,
|
|
- .default_trigger = "default-on",
|
|
},
|
|
{
|
|
- .name = "stop",
|
|
- .gpio = 1,
|
|
+ .name = "line3",
|
|
+ .gpio = 6,
|
|
+ .active_low = 1,
|
|
+ },
|
|
+ {
|
|
+ .name = "tel",
|
|
+ .gpio = 7,
|
|
+ .active_low = 1,
|
|
+ },
|
|
+ {
|
|
+ .name = "eth",
|
|
+ .gpio = 35,
|
|
.active_low = 1,
|
|
},
|
|
},
|
|
@@ -880,6 +895,7 @@ static struct platform_device bcm63xx_gp
|
|
int __init board_register_devices(void)
|
|
{
|
|
u32 val;
|
|
+ int led_count = 0;
|
|
int button_count = 0;
|
|
|
|
if (board.has_uart0)
|
|
@@ -922,7 +938,11 @@ int __init board_register_devices(void)
|
|
|
|
platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
|
|
|
|
- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
|
+ /* count number of LEDs defined by this device */
|
|
+ while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
|
|
+ led_count++;
|
|
+
|
|
+ bcm63xx_led_data.num_leds = led_count;
|
|
bcm63xx_led_data.leds = board.leds;
|
|
|
|
platform_device_register(&bcm63xx_gpio_leds);
|
|
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
|
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
|
@@ -56,7 +56,7 @@ struct board_info {
|
|
struct bcm63xx_dsp_platform_data dsp;
|
|
|
|
/* GPIO LEDs */
|
|
- struct gpio_led leds[5];
|
|
+ struct gpio_led leds[8];
|
|
|
|
/* Buttons */
|
|
struct gpio_button buttons[2];
|