brcm63xx: replace CFEFIXUP usage with dtb based detection

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

diff --git a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
index a05e09b..7f5318f 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,8 +10,8 @@ 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
-@@ -2225,6 +2225,85 @@ static struct board_info __initdata boar
- #endif
+@@ -2266,6 +2266,85 @@ static struct board_info __initdata boar
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
 + * known 6368 boards
@@ -90,13 +90,13 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 +      .has_ohci0 = 1,
 +      .has_ehci0 = 1,
 +};
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6368 */
 +
 +/*
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2279,6 +2358,10 @@ static const struct board_info __initcon
+@@ -2320,6 +2399,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
@@ -109,7 +109,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  static void __init boardid_fixup(u8 *boot_addr)
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -85,12 +85,25 @@ void __init board_early_setup(const stru
+@@ -88,12 +88,25 @@ void __init board_early_setup(const stru
                bcm63xx_pci_enabled = 1;
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;