X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-2.6.33%2F240-spi.patch;h=2323661ee65ba84320db97c62bb9194eaaeded5a;hb=fb941964627b43473fa4dec2645ccc9f2df16f8a;hp=8d7e7b2968f22de28c74de82da770e3a67c6906e;hpb=84dd37d9302e887ed21ee67c21919c134e9060a2;p=openwrt%2Fstaging%2Fdedeckeh.git

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 8d7e7b2968..2323661ee6 100644
--- a/target/linux/brcm63xx/patches-2.6.33/240-spi.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/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)
+@@ -1525,6 +1526,9 @@ int __init board_register_devices(void)
  	if (board.has_udc0)
  		bcm63xx_udc_register();