bcm63xx: add flash type detection

[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.3 / 520-bcm63xx-add-support-for-96368MVWG-board.patch

diff --git a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch
index e5fdeea608239b1aceb2fbd913f19ee29ef72857..8866ece505f04cd7e01bdbe4f83104fd68fc97c6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2018,6 +2018,80 @@ static struct board_info __initdata boar
+@@ -2016,6 +2016,80 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -91,7 +91,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initdata *bcm963xx_boards[] = {
-@@ -2066,6 +2140,10 @@ static const struct board_info __initdat
+@@ -2064,6 +2138,10 @@ static const struct board_info __initdat
        &board_HW553,
        &board_spw303v,
  #endif
@@ -102,8 +102,8 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static void __init nb4_nvram_fixup(void)
-@@ -2283,12 +2361,25 @@ void __init board_prom_init(void)
-               bcm63xx_pci_enabled = 1;
+@@ -2280,12 +2358,25 @@ void __init board_prom_init(void)
+       if (board.has_pci) {
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;
 +