From a56cab61d1182e10992499350bb930b9cd5d6b8e Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 24 May 2010 20:35:46 +0000 Subject: target/linux: refresh 2.6.32 patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21566 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch | 2 +- target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch | 2 +- .../linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch | 2 +- .../brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch | 2 +- target/linux/brcm63xx/patches-2.6.32/240-spi.patch | 4 ++-- .../brcm63xx/patches-2.6.32/250-6358-enet1-external-mii-clk.patch | 2 +- .../brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch | 8 +++----- 7 files changed, 10 insertions(+), 12 deletions(-) (limited to 'target/linux/brcm63xx') diff --git a/target/linux/brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch b/target/linux/brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch index 8736dc7d6..a3f25dc8f 100644 --- a/target/linux/brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch +++ b/target/linux/brcm63xx/patches-2.6.32/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 -@@ -1141,6 +1141,11 @@ MODULE_LICENSE ("GPL"); +@@ -1142,6 +1142,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_atmel_driver #endif diff --git a/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch b/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch index b223589db..5262b186d 100644 --- a/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch +++ b/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch @@ -11,7 +11,7 @@ static struct gpio_led_platform_data bcm63xx_led_data; static struct platform_device bcm63xx_gpio_leds = { -@@ -853,6 +857,8 @@ int __init board_register_devices(void) +@@ -854,6 +858,8 @@ int __init board_register_devices(void) platform_device_register(&mtd_dev); diff --git a/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch index b4d948afb..2288baafa 100644 --- a/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch +++ b/target/linux/brcm63xx/patches-2.6.32/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.32/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch index 539d8d475..20b45355f 100644 --- a/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch +++ b/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch @@ -16,7 +16,7 @@ }; static struct board_info __initdata board_rta1025w_16 = { -@@ -949,6 +951,9 @@ int __init board_register_devices(void) +@@ -950,6 +952,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.32/240-spi.patch b/target/linux/brcm63xx/patches-2.6.32/240-spi.patch index 319d21cd1..a891ca389 100644 --- a/target/linux/brcm63xx/patches-2.6.32/240-spi.patch +++ b/target/linux/brcm63xx/patches-2.6.32/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) +@@ -1495,6 +1496,9 @@ int __init board_register_devices(void) if (board.has_udc0) bcm63xx_udc_register(); diff --git a/target/linux/brcm63xx/patches-2.6.32/250-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-2.6.32/250-6358-enet1-external-mii-clk.patch index 3c1afaefa..0c9cd7622 100644 --- a/target/linux/brcm63xx/patches-2.6.32/250-6358-enet1-external-mii-clk.patch +++ b/target/linux/brcm63xx/patches-2.6.32/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) +@@ -1338,6 +1338,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.32/260-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch index 28eb78ce8..9cc300621 100644 --- a/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch +++ b/target/linux/brcm63xx/patches-2.6.32/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 +@@ -741,11 +741,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