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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23035 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch
index 57016d5..195185d 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch
@@ -17,16 +17,16 @@
  };
  
  static struct board_info __initdata board_rta1025w_16 = {
-@@ -913,6 +916,9 @@ void __init board_prom_init(void)
- 
-       bcm_gpio_writel(val, GPIO_MODE_REG);
+@@ -1011,6 +1014,9 @@ int __init board_register_devices(void)
+       if (board.has_dsp)
+               bcm63xx_dsp_register(&board.dsp);
  
 +      if (board.has_udc0)
 +              bcm63xx_udc_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;
 --- /dev/null
 +++ b/arch/mips/bcm63xx/dev-usb-udc.c
 @@ -0,0 +1,58 @@
@@ -214,7 +214,7 @@
   * SPI clock
   */
  static void spi_set(struct clk *clk, int enable)
-@@ -208,6 +232,8 @@ struct clk *clk_get(struct device *dev, 
+@@ -208,6 +232,8 @@ struct clk *clk_get(struct device *dev,
                return &clk_ephy;
        if (!strcmp(id, "usbh"))
                return &clk_usbh;

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 79e7ac6..800b228 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;