From fb941964627b43473fa4dec2645ccc9f2df16f8a Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 13 Jun 2010 12:20:53 +0000 Subject: add missing alice gate2 leds (#6743) SVN-Revision: 21785 --- .../011-add_bcm63xx_ehci_controller.patch | 2 +- .../brcm63xx/patches-2.6.33/110-gpiodev.patch | 2 +- .../patches-2.6.33/140-new_bcm96348gw_leds.patch | 2 +- .../patches-2.6.33/150-alice_gate2_leds.patch | 43 +++++++++++++++++++++- .../180-udc_preliminary_support.patch | 2 +- .../200-extended-platform-devices.patch | 2 +- .../brcm63xx/patches-2.6.33/220-board-D4PW.patch | 2 +- .../brcm63xx/patches-2.6.33/221-board-NB4.patch | 17 ++------- target/linux/brcm63xx/patches-2.6.33/240-spi.patch | 4 +- .../250-6358-enet1-external-mii-clk.patch | 2 +- .../260-no_ehci_over_current_check.patch | 8 ++-- 11 files changed, 57 insertions(+), 29 deletions(-) (limited to 'target/linux/brcm63xx/patches-2.6.33') diff --git a/target/linux/brcm63xx/patches-2.6.33/011-add_bcm63xx_ehci_controller.patch b/target/linux/brcm63xx/patches-2.6.33/011-add_bcm63xx_ehci_controller.patch index 16ca692a2f..22949b5440 100644 --- a/target/linux/brcm63xx/patches-2.6.33/011-add_bcm63xx_ehci_controller.patch +++ b/target/linux/brcm63xx/patches-2.6.33/011-add_bcm63xx_ehci_controller.patch @@ -164,7 +164,7 @@ Signed-off-by: Maxime Bizon +MODULE_ALIAS("platform:bcm63xx_ehci"); --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL"); +@@ -1159,6 +1159,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_atmel_driver #endif diff --git a/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch b/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch index 9d4196fcf0..7ae056f23f 100644 --- a/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch +++ b/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch @@ -11,7 +11,7 @@ static struct gpio_led_platform_data bcm63xx_led_data; static struct platform_device bcm63xx_gpio_leds = { -@@ -852,6 +856,8 @@ int __init board_register_devices(void) +@@ -853,6 +857,8 @@ int __init board_register_devices(void) platform_device_register(&mtd_dev); diff --git a/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch index edf00b90bb..96aa0d270c 100644 --- a/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch +++ b/target/linux/brcm63xx/patches-2.6.33/140-new_bcm96348gw_leds.patch @@ -79,4 +79,4 @@ + struct gpio_led leds[8]; /* Buttons */ - struct gpio_button buttons[1]; + struct gpio_button buttons[2]; diff --git a/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch index 1eb5d2b301..7415ca4239 100644 --- a/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch +++ b/target/linux/brcm63xx/patches-2.6.33/150-alice_gate2_leds.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -588,6 +588,63 @@ static struct board_info __initdata boar +@@ -588,6 +588,93 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, @@ -19,6 +19,26 @@ + .default_trigger = "default-on", + }, + { ++ .name = "service:red", ++ .gpio = 7, ++ .active_low = 1, ++ }, ++ { ++ .name = "service:green", ++ .gpio = 6, ++ .active_low = 1, ++ }, ++ { ++ .name = "adsl:red", ++ .gpio = 9, ++ .active_low = 1, ++ }, ++ { ++ .name = "adsl:green", ++ .gpio = 10, ++ .active_low = 1, ++ }, ++ { + .name = "wifi:red", + .gpio = 23, + .active_low = 1, @@ -29,6 +49,16 @@ + .active_low = 1, + }, + { ++ .name = "internet:red", ++ .gpio = 25, ++ .active_low = 1, ++ }, ++ { ++ .name = "internet:green", ++ .gpio = 25, ++ .active_low = 1, ++ }, ++ { + .name = "usr1:red", + .gpio = 27, + .active_low = 1, @@ -64,3 +94,14 @@ }; static struct board_info __initdata board_DWVS0 = { +--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h ++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +@@ -54,7 +54,7 @@ struct board_info { + struct bcm63xx_dsp_platform_data dsp; + + /* GPIO LEDs */ +- struct gpio_led leds[8]; ++ struct gpio_led leds[14]; + + /* Buttons */ + struct gpio_button buttons[2]; diff --git a/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch index 74140339f0..cb5b808aa6 100644 --- a/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch +++ b/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch @@ -17,7 +17,7 @@ }; static struct board_info __initdata board_rta1025w_16 = { -@@ -948,6 +951,9 @@ int __init board_register_devices(void) +@@ -979,6 +982,9 @@ int __init board_register_devices(void) if (board.has_dsp) bcm63xx_dsp_register(&board.dsp); diff --git a/target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch b/target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch index c6425091ca..c17f85b841 100644 --- a/target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch +++ b/target/linux/brcm63xx/patches-2.6.33/200-extended-platform-devices.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1000,6 +1000,10 @@ int __init board_register_devices(void) +@@ -1030,6 +1030,10 @@ int __init board_register_devices(void) platform_device_register(&bcm63xx_gpio_buttons_device); } diff --git a/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch b/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch index 46e2595ea2..eb2cf172de 100644 --- a/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch +++ b/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch @@ -50,7 +50,7 @@ #endif /* -@@ -692,6 +735,7 @@ static const struct board_info __initdat +@@ -722,6 +765,7 @@ static const struct board_info __initdat &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, diff --git a/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch index 7c17b887d2..fd68facc9c 100644 --- a/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch +++ b/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch @@ -21,7 +21,7 @@ static struct bcm963xx_nvram nvram; static unsigned int mac_addr_used; static struct board_info board; -@@ -713,6 +720,471 @@ static struct board_info __initdata boar +@@ -743,6 +750,471 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -493,7 +493,7 @@ #endif /* -@@ -743,9 +1215,30 @@ static const struct board_info __initdat +@@ -773,9 +1245,30 @@ static const struct board_info __initdat &board_96358vw2, &board_AGPFS0, &board_DWVS0, @@ -524,7 +524,7 @@ /* * early init callback, read nvram data from flash and checksum it */ -@@ -793,6 +1286,9 @@ void __init board_prom_init(void) +@@ -823,6 +1316,9 @@ void __init board_prom_init(void) return; } @@ -534,14 +534,3 @@ /* find board by name */ for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) { if (strncmp(nvram.name, bcm963xx_boards[i]->name, ---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -55,7 +55,7 @@ struct board_info { - struct bcm63xx_dsp_platform_data dsp; - - /* GPIO LEDs */ -- struct gpio_led leds[8]; -+ struct gpio_led leds[9]; - - /* Buttons */ - struct gpio_button buttons[2]; diff --git a/target/linux/brcm63xx/patches-2.6.33/240-spi.patch b/target/linux/brcm63xx/patches-2.6.33/240-spi.patch index a886a02a0c..2323661ee6 100644 --- a/target/linux/brcm63xx/patches-2.6.33/240-spi.patch +++ b/target/linux/brcm63xx/patches-2.6.33/240-spi.patch @@ -937,7 +937,7 @@ obj-y += boards/ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -29,6 +29,7 @@ +@@ -30,6 +30,7 @@ #include #include #include @@ -945,7 +945,7 @@ #include #define PFX "board_bcm963xx: " -@@ -998,6 +999,9 @@ int __init board_register_devices(void) +@@ -1525,6 +1526,9 @@ int __init board_register_devices(void) if (board.has_udc0) bcm63xx_udc_register(); diff --git a/target/linux/brcm63xx/patches-2.6.33/250-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-2.6.33/250-6358-enet1-external-mii-clk.patch index 3c1afaefa1..36b2810820 100644 --- a/target/linux/brcm63xx/patches-2.6.33/250-6358-enet1-external-mii-clk.patch +++ b/target/linux/brcm63xx/patches-2.6.33/250-6358-enet1-external-mii-clk.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1308,6 +1308,8 @@ void __init board_prom_init(void) +@@ -1368,6 +1368,8 @@ void __init board_prom_init(void) if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G3_EXT_MII | GPIO_MODE_6348_G0_EXT_MII; diff --git a/target/linux/brcm63xx/patches-2.6.33/260-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-2.6.33/260-no_ehci_over_current_check.patch index 28eb78ce8e..96f81fa316 100644 --- a/target/linux/brcm63xx/patches-2.6.33/260-no_ehci_over_current_check.patch +++ b/target/linux/brcm63xx/patches-2.6.33/260-no_ehci_over_current_check.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.32.12/drivers/usb/host/ehci-hub.c -=================================================================== ---- linux-2.6.32.12.orig/drivers/usb/host/ehci-hub.c 2010-05-02 21:06:45.000000000 +0200 -+++ linux-2.6.32.12/drivers/usb/host/ehci-hub.c 2010-05-02 21:07:08.000000000 +0200 -@@ -741,11 +741,13 @@ +--- a/drivers/usb/host/ehci-hub.c ++++ b/drivers/usb/host/ehci-hub.c +@@ -743,11 +743,13 @@ static int ehci_hub_control ( * power switching; they're allowed to just limit the * current. khubd will turn the power back on. */ -- cgit v1.2.3