ixp4xx: add support for linux 3.10

[openwrt.git] / target / linux / brcm47xx / patches-3.8 / 260-MIPS-BCM47XX-add-board-detection.patch

diff --git a/target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch b/target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch
index ec307b1b68875d2b59d0d66bd282029c7fb297b8..3149855bf4ecd267de99291c6e562b0444add267 100644 (file)
--- a/target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch
+++ b/target/linux/brcm47xx/patches-3.8/260-MIPS-BCM47XX-add-board-detection.patch
@@ -8,7 +8,7 @@
  obj-$(CONFIG_BCM47XX_SSB)     += wgt634u.o
 --- /dev/null
 +++ b/arch/mips/bcm47xx/board.c
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,223 @@
 +#include <linux/export.h>
 +#include <linux/string.h>
 +#include <bcm47xx_board.h>
@@ -116,7 +116,8 @@
 +      {{BCM47XX_BOARD_NETGEAR_WNDR3400VCNA, "Netgear WNDR3400 Vcna"}, "U12H155T01_NETGEAR",},
 +      {{BCM47XX_BOARD_NETGEAR_WNDR3700V3, "Netgear WNDR3700 V3"}, "U12H194T00_NETGEAR",},
 +      {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR",},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR4500, "Netgear WNDR4500"}, "U12H189T00_NETGEAR",},
++      {{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR",},
++      {{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR",},
 +      {{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR",},
 +      {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR",},
 +      {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR",},
@@ -209,8 +210,10 @@
 +      if (bcm47xx_board != NULL)
 +              return;
 +      /* check if the nvram is available */
-+      if (bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)) == -ENXIO)
++      if (bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)) == -ENXIO) {
++              bcm47xx_board = bcm47xx_board_unknown;
 +              return;
++      }
 +
 +      bcm47xx_board = bcm47xx_board_get_nvram();
 +      pr_info("Found board: \"%s\"\n", bcm47xx_board->name);
@@ -231,7 +234,7 @@
 +EXPORT_SYMBOL(bcm47xx_board_get_name);
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,91 @@
 +#ifndef __BCM47XX_BOARD_H
 +#define __BCM47XX_BOARD_H
 +
@@ -303,7 +306,8 @@
 +      BCM47XX_BOARD_NETGEAR_WNDR3400VCNA,
 +      BCM47XX_BOARD_NETGEAR_WNDR3700V3,
 +      BCM47XX_BOARD_NETGEAR_WNDR4000,
-+      BCM47XX_BOARD_NETGEAR_WNDR4500,
++      BCM47XX_BOARD_NETGEAR_WNDR4500V1,
++      BCM47XX_BOARD_NETGEAR_WNDR4500V2,
 +      BCM47XX_BOARD_NETGEAR_WNR2000,
 +      BCM47XX_BOARD_NETGEAR_WNR3500L,
 +      BCM47XX_BOARD_NETGEAR_WNR3500U,