X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/504d88e2ae2cadedaa85f46f6b74bce139962fd4..d2f6c11460d6e89d7c0488ea9b5d0cc9e4791e23:/target/linux/brcm63xx/patches-3.2/240-spi.patch

diff --git a/target/linux/brcm63xx/patches-3.2/240-spi.patch b/target/linux/brcm63xx/patches-3.2/240-spi.patch
index 685d96c28..068c83fab 100644
--- a/target/linux/brcm63xx/patches-3.2/240-spi.patch
+++ b/target/linux/brcm63xx/patches-3.2/240-spi.patch
@@ -136,15 +136,17 @@
  #define RSET_UART_SIZE			24
  #define RSET_UDC_SIZE			256
  #define RSET_OHCI_SIZE			256
-@@ -214,7 +215,7 @@ enum bcm63xx_regs_set {
+@@ -214,8 +215,8 @@ enum bcm63xx_regs_set {
  #define BCM_6358_UART0_BASE		(0xfffe0100)
  #define BCM_6358_UART1_BASE		(0xfffe0120)
  #define BCM_6358_GPIO_BASE		(0xfffe0080)
 -#define BCM_6358_SPI_BASE		(0xdeadbeef)
+-#define BCM_6358_UDC0_BASE		(0xfffe0800)
 +#define BCM_6358_SPI_BASE		(0xfffe0800)
- #define BCM_6358_UDC0_BASE		(0xfffe0400)
++#define BCM_6358_UDC0_BASE		(0xdeadbeef)
  #define BCM_6358_OHCI0_BASE		(0xfffe1400)
  #define BCM_6358_OHCI_PRIV_BASE		(0xdeadbeef)
+ #define BCM_6358_USBH_PRIV_BASE		(0xfffe1500)
 @@ -441,6 +442,7 @@ static inline unsigned long bcm63xx_regs
   */
  enum bcm63xx_irq {
@@ -153,15 +155,15 @@
  	IRQ_UART0,
  	IRQ_UART1,
  	IRQ_DSL,
-@@ -507,6 +509,7 @@ enum bcm63xx_irq {
+@@ -506,6 +508,7 @@ enum bcm63xx_irq {
   * 6348 irqs
   */
  #define BCM_6348_TIMER_IRQ		(IRQ_INTERNAL_BASE + 0)
 +#define BCM_6348_SPI_IRQ		(IRQ_INTERNAL_BASE + 1)
  #define BCM_6348_UART0_IRQ		(IRQ_INTERNAL_BASE + 2)
  #define BCM_6348_DSL_IRQ		(IRQ_INTERNAL_BASE + 4)
- #define BCM_6348_UDC0_IRQ		(IRQ_INTERNAL_BASE + 6)
-@@ -531,6 +534,7 @@ enum bcm63xx_irq {
+ #define BCM_6348_ENET1_IRQ		(IRQ_INTERNAL_BASE + 7)
+@@ -523,6 +526,7 @@ enum bcm63xx_irq {
   * 6358 irqs
   */
  #define BCM_6358_TIMER_IRQ		(IRQ_INTERNAL_BASE + 0)
@@ -905,22 +907,22 @@
 @@ -1,6 +1,6 @@
  obj-y		+= clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
  		   dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o \
--		   dev-usb-ohci.o dev-usb-ehci.o dev-usb-udc.o
-+		   dev-usb-ohci.o dev-usb-ehci.o dev-usb-udc.o dev-spi.o
+-		   dev-usb-ohci.o dev-usb-ehci.o
++		   dev-usb-ohci.o dev-usb-ehci.o dev-spi.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
  
  obj-y		+= boards/
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -31,6 +31,7 @@
+@@ -30,6 +30,7 @@
+ #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_usb_ohci.h>
  #include <bcm63xx_dev_usb_ehci.h>
- #include <bcm63xx_dev_usb_udc.h>
 +#include <bcm63xx_dev_spi.h>
  #include <board_bcm963xx.h>
  
  #define PFX	"board_bcm963xx: "
-@@ -934,6 +935,8 @@ int __init board_register_devices(void)
+@@ -928,6 +929,8 @@ int __init board_register_devices(void)
  	if (board.num_spis)
  		spi_register_board_info(board.spis, board.num_spis);