target/linux: refresh 2.6.32 patches

SVN-Revision: 21566
This commit is contained in:
Nicolas Thill
2010-05-24 20:35:46 +00:00
parent a93571825f
commit 46e2eea1ef
42 changed files with 142 additions and 171 deletions

View File

@@ -164,7 +164,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
+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

View File

@@ -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);

View File

@@ -79,4 +79,4 @@
+ struct gpio_led leds[8];
/* Buttons */
struct gpio_button buttons[1];
struct gpio_button buttons[2];

View File

@@ -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);

View File

@@ -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 <bcm63xx_dev_usb_ohci.h>
#include <bcm63xx_dev_usb_ehci.h>
#include <bcm63xx_dev_usb_udc.h>
@@ -945,7 +945,7 @@
#include <board_bcm963xx.h>
#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();

View File

@@ -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;

View File

@@ -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.
*/