[brcm63xx] register udc and spi devices at the correct init level

[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-2.6.35 / 240-spi.patch

diff --git a/target/linux/brcm63xx/patches-2.6.35/240-spi.patch b/target/linux/brcm63xx/patches-2.6.35/240-spi.patch
index 79e7ac630585151e9c4b7d6237fa0e6f13c4f788..800b228116cb82189aad2b41c4f9f3988ae9a4db 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.35/240-spi.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/240-spi.patch
@@ -944,13 +944,13 @@
  #include <board_bcm963xx.h>
  
  #define PFX   "board_bcm963xx: "
-@@ -1459,6 +1460,9 @@ void __init board_prom_init(void)
+@@ -1557,6 +1558,9 @@ int __init board_register_devices(void)
        if (board.has_udc0)
                bcm63xx_udc_register();
  
 +      if (!BCMCPU_IS_6345())
 +              bcm63xx_spi_register();
 +
-       /* Generate MAC address for WLAN and
-        * register our SPROM */
- #ifdef CONFIG_SSB_PCIHOST
+       /* read base address of boot chip select (0) */
+       if (BCMCPU_IS_6345())
+               val = 0x1fc00000;