bcm63xx: update patches to latest upstream versions

[openwrt.git] / target / linux / brcm63xx / patches-3.3 / 302-extended-platform-devices.patch

diff --git a/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch b/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch
index 1578994..b48ef73 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch
+++ b/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch
@@ -1,21 +1,21 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -924,6 +924,9 @@ int __init board_register_devices(void)
-       }
- #endif
+@@ -899,6 +899,9 @@ int __init board_register_devices(void)
+ 
+       bcm63xx_spi_register();
  
 +      if (board.num_devs)
 +              platform_add_devices(board.devs, board.num_devs);
 +
-       /* read base address of boot chip select (0) */
-       val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-       val &= MPI_CSBASE_BASE_MASK;
+       bcm63xx_flash_register();
+ 
+       /* count number of LEDs defined by this device */
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 @@ -61,6 +61,10 @@ struct board_info {
  
        /* Buttons */
-       struct gpio_button buttons[4];
+       struct gpio_keys_button buttons[4];
 +
 +      /* Additional platform devices */
 +      struct platform_device **devs;