ixp4xx: fix MAC parsing and switch (unmanaged) functionality for wrt300nv2 (thank...

[openwrt.git] / target / linux / brcm63xx / patches-2.6.32 / 240-spi.patch

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 2c63623..570c157 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.32/240-spi.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/240-spi.patch
@@ -505,7 +505,7 @@
 +      if (is_on == BITBANG_CS_INACTIVE)
 +              val |= SPI_CMD_NOOP;
 +      else if (is_on == BITBANG_CS_ACTIVE)
-+              val |= (1 << spi->chip_select << SPI_CMD_DEVICE_ID_SHIFT);
++              val |= (spi->chip_select << SPI_CMD_DEVICE_ID_SHIFT);
 +
 +      bcm_spi_writew(val, bs->regs, SPI_CMD);
 +}
@@ -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)
+@@ -1509,6 +1510,9 @@ int __init board_register_devices(void)
        if (board.has_udc0)
                bcm63xx_udc_register();