brcm63xx: replace CFEFIXUP usage with dtb based detection

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 42125

target/linux/brcm63xx/dts/ar1004g.dts

@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/include/ "bcm6348.dtsi"
+
+/ {
+	model = "ASMAX AR 1004g";
+	compatible = "asmax,ar1004g", "brcm,bcm6348";
+};

target/linux/brcm63xx/dts/ct536plus.dts

@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/include/ "bcm6348.dtsi"
+
+/ {
+	model = "Comtrend CT-536+/CT-5621T";
+	compatible = "comtrend,ct536+", "brcm,bcm6348";
+};

target/linux/brcm63xx/dts/dsl-274xb-c.dts

@@ -0,0 +1,31 @@
+/dts-v1/;
+
+/include/ "bcm6358.dtsi"
+
+/ {
+	model = "D-Link DSL-2740B/DSL-2741B rev C2/3";
+	compatible = "d-link,dsl-274xb-c2", "brcm,bcm6358";
+};
+
+&pflash {
+	status = "ok";
+
+	linux,part-probe = "bcm63xxpart";
+
+	cfe@0 {
+		label = "CFE";
+		reg = <0x000000 0x010000>;
+		read-only;
+	};
+
+	linux@10000 {
+		label = "linux";
+		reg = <0x010000 0x3e0000>;
+		read-only;
+	};
+
+	nvram@3f0000 {
+		label = "nvram";
+		reg = <0x3f0000 0x010000>;
+	};
+};

target/linux/brcm63xx/dts/dva-g3810bn_tl.dts

@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/include/ "bcm6358.dtsi"
+
+/ {
+	model = "D-Link DVA-G3810BN/TL";
+	compatible = "d-link,dva-g3810bn/tl", "brcm,bcm6358";
+};

target/linux/brcm63xx/dts/gw6000.dts

@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/include/ "bcm6348.dtsi"
+
+/ {
+	model = "TECOM GW6000";
+	compatible = "tecom,gw6000", "brcm,bcm6348";
+};

target/linux/brcm63xx/dts/gw6200.dts

@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/include/ "bcm6348.dtsi"
+
+/ {
+	model = "TECOM GW6200";
+	compatible = "tecom,gw6200", "brcm,bcm6348";
+};

target/linux/brcm63xx/dts/spw500v.dts

@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/include/ "bcm6348.dtsi"
+
+/ {
+	model = "T-Com Speedport W500 V";
+	compatible = "t-com,spw500v", "brcm,bcm6348";
+};

target/linux/brcm63xx/image/Makefile

@@ -255,8 +255,6 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),96328dg2x2,6328,A4001N,,--pad 4)
 	# ADB P.DG A4001N1
 	$(call Image/Build/CFE,$(1),963281T_TEF,6328,A4001N1,,--pad 8)
-	# Asmax AR 1004g
-	$(call Image/Build/CFEFIXUP,$(1),96348GW-10,AR1004G,6348,AR1004G)
 	# BT Voyager V210_BTR
 	$(call Image/Build/CFE,$(1),V210_BB,6348,BTV210_BTR,,--layoutver 5)
 	# BT Voyager V210_ROI, V210_WB
@@ -275,10 +273,6 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),RTA1025W_16,6348,RTA1025W_16,,--layoutver 5)
 	# RTA1320_16M (numerous routers)
 	$(call Image/Build/CFE,$(1),RTA1320_16M,6338,RTA1320_16M,,--layoutver 5)
-	# Tecom GW6000
-	$(call Image/Build/CFEFIXUP,$(1),96348GW,GW6000,6348,GW6000)
-	# Tecom GW6200
-	$(call Image/Build/CFEFIXUP,$(1),96348GW,GW6200,6348,GW6200,$(shell printf '\x99'))
 	# Neufbox4
 	$(call Image/Build/CFE,$(1),96358VW,6358,NEUFBOX4,OpenWRT-$(REVISION))
 	# Zyxel P870HW-51a v2
@@ -292,8 +286,6 @@ define Image/Build
 
 	# Comtrend 6373
 	$(call Image/Build/CFE,$(1),CT6373-1,6358,CT6373)
-	# Comtrend 536, 5621
-	$(call Image/Build/CFEFIXUP,$(1),96348GW-11,CT536_CT5621,6348,CT536_CT5621)
 	# Comtrend AR-5381u
 	$(call Image/Build/CFE,$(1),96328A-1241N,6328,AR-5381u,,--pad 8)
 	# Comtrend AR-5387un
@@ -316,15 +308,9 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),D-4P-W,6348,DSL2640B-B2)
 	# D-Link DSL-2650U
 	$(call Image/Build/CFE,$(1),96358VW2,6358,DSL2650U)
-	# D-Link DSL-2740B/DSL-2741B, rev C2
-	$(call Image/Build/CFEFIXUP,$(1),96358GW,AW4139,6358,DSL274XB-C2)
-	# D-Link DSL-2740B/DSL-2741B, rev C3
-	$(call Image/Build/CFE,$(1),AW4139,6358,DSL274XB-C3)
 	# D-Link DSL-2740B/DSL-2741B, rev F1
 	$(call Image/Build/CFE,$(1),AW4339U,6328,DSL274XB-F1-EU,,--signature2="4.06.01.EUF1" --pad 4)
 	$(call Image/Build/CFE,$(1),AW4339U,6328,DSL274XB-F1-AU,,--signature2="4.06.01.AUF1" --pad 4)
-	# D-Link DVA-G3810BN/TL
-	$(call Image/Build/CFEFIXUP,$(1),96358VW,DVAG3810BN,6358,DVAG3810BN)
 
 	# TP-Link TD-8810A, TD-8810B, TD-8811A, TD-8811B
 	$(call Image/Build/CFE,$(1),8L-2M-8M,6338,TP8810_8811)
@@ -359,9 +345,6 @@ define Image/Build
 	# Telsey CPVA642-type (e.g. CPA-ZNTE60T)
 	$(call Image/Build/CFE,$(1),CPVA642,6358,CPA-ZNTE60T,,--signature "Telsey Tlc",--signature2 "99.99.999",--second-image-flag "0")
 
-	# T-Com Speedport W 500V
-	$(call Image/Build/CFEFIXUP,$(1),96348GW,SPW500V,6348,SPW500V)
-
 	# Huawei HW520
 	$(call Image/Build/CFE,$(1),HW6358GW_B,6358,HW520,EchoLife_HG520v)
 
@@ -389,4 +372,21 @@ $(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-4M-flash-generic
 $(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-8M-flash-generic,,--pad 4))
 $(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-16M-flash-generic,,--pad 8))
 
+# Asmax AR 1004g
+$(eval $(call CfeImageDTB,ar1004g,96348GW-10,6348,AR1004G))
+# Comtrend 536, 5621
+$(eval $(call CfeImageDTB,ct536plus,96348GW-11,6348,CT536_CT5621))
+# Tecom GW6000
+$(eval $(call CfeImageDTB,gw6000,96348GW,6348,GW6000))
+# Tecom GW6200
+$(eval $(call CfeImageDTB,gw6200,96348GW,6348,GW6200,$(shell printf '\x99')))
+# T-Com Speedport W 500V
+$(eval $(call CfeImageDTB,spw500v,96348GW,6348,SPW500V))
+# D-Link DSL-2740B/DSL-2741B, rev C2
+$(eval $(call CfeImageDTB,dsl-274xb-c,96358GW,6358,DSL274XB-C2))
+# D-Link DSL-2740B/DSL-2741B, rev C3
+$(eval $(call CfeImageDTB,dsl-274xb-c,AW4139,6358,DSL274XB-C3))
+# D-Link DVA-G3810BN/TL
+$(eval $(call CfeImageDTB,dva-g3810bn_tl,96358VW,6358,DVAG3810BN))
+
 $(eval $(call BuildImage))

target/linux/brcm63xx/patches-3.14/504-board_dsl_274xb_rev_c.patch

@@ -1,12 +1,13 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -907,6 +907,61 @@ static struct board_info __initdata boar
+@@ -907,6 +907,62 @@ static struct board_info __initdata boar
  	.has_ohci0			= 1,
  };
  
 +/* D-Link DSL-274xB revison C2/C3 */
 +static struct board_info __initdata board_dsl_274xb_rev_c = {
 +	.name				= "AW4139",
++	.of_board_id			= "d-link,dsl-274xb-c2",
 +	.expected_cpu_id		= 0x6358,
 +
 +	.has_uart0			= 1,
@@ -62,7 +63,7 @@
  struct spi_gpio_platform_data nb4_spi_gpio_data = {
  	.sck		= NB4_SPI_GPIO_CLK,
  	.mosi		= NB4_SPI_GPIO_MOSI,
-@@ -1543,6 +1598,7 @@ static const struct board_info __initcon
+@@ -1543,6 +1599,7 @@ static const struct board_info __initcon
  	&board_AGPFS0,
  	&board_CPVA642,
  	&board_DWVS0,

target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch

@@ -1,12 +1,13 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -657,6 +657,67 @@ static struct board_info __initdata boar
+@@ -657,6 +657,68 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_spw500v = {
 +	.name				= "SPW500V",
++	.of_board_id			= "t-com,spw500v",
 +	.expected_cpu_id		= 0x6348,
 +
 +	.has_uart0			= 1,
@@ -68,7 +69,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -1590,6 +1651,7 @@ static const struct board_info __initcon
+@@ -1591,6 +1653,7 @@ static const struct board_info __initcon
  	&board_96348gw_a,
  	&board_rta1025w_16,
  	&board_96348_D4PW,

target/linux/brcm63xx/patches-3.14/506-board_gw6200_gw6000.patch

@@ -1,11 +1,12 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -516,6 +516,112 @@ static struct board_info __initdata boar
+@@ -516,6 +516,114 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_gw6200 = {
 +	.name				= "GW6200",
++	.of_board_id			= "tecom,gw6200",
 +	.expected_cpu_id		= 0x6348,
 +
 +	.has_uart0			= 1,
@@ -68,6 +69,7 @@
 +
 +static struct board_info __initdata board_gw6000 = {
 +	.name				= "GW6000",
++	.of_board_id			= "tecom,gw6000",
 +	.expected_cpu_id		= 0x6348,
 +
 +	.has_uart0			= 1,
@@ -113,7 +115,7 @@
  static struct board_info __initdata board_FAST2404 = {
  	.name				= "F@ST2404",
  	.of_board_id			= "sagem,f@st2404",
-@@ -1644,6 +1750,8 @@ static const struct board_info __initcon
+@@ -1646,6 +1754,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
  	&board_96348gw,

target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -824,6 +824,78 @@ static struct board_info __initdata boar
+@@ -827,6 +827,78 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -79,7 +79,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -1760,6 +1832,7 @@ static const struct board_info __initcon
+@@ -1764,6 +1836,7 @@ static const struct board_info __initcon
  	&board_rta1025w_16,
  	&board_96348_D4PW,
  	&board_spw500v,

target/linux/brcm63xx/patches-3.14/508-board_hw553.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1799,6 +1799,83 @@ static struct board_info __initdata boar
+@@ -1803,6 +1803,83 @@ static struct board_info __initdata boar
  	.spis = nb4_spi_devices,
  	.num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -84,7 +84,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1847,6 +1924,7 @@ static const struct board_info __initcon
+@@ -1851,6 +1928,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r2,
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,

target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch

@@ -46,7 +46,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -1892,6 +1931,7 @@ static const struct board_info __initcon
+@@ -1896,6 +1935,7 @@ static const struct board_info __initcon
  	&board_96338gw,
  	&board_96338w,
  	&board_96338w2_e7t,

target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1915,6 +1915,72 @@ static struct board_info __initdata boar
+@@ -1919,6 +1919,72 @@ static struct board_info __initdata boar
  		.pci_dev			= 1,
  	},
  };
@@ -73,7 +73,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1965,6 +2031,7 @@ static const struct board_info __initcon
+@@ -1969,6 +2035,7 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,
  	&board_HW553,

target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -935,6 +935,65 @@ static struct board_info __initdata boar
+@@ -938,6 +938,65 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -66,7 +66,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -2016,6 +2075,7 @@ static const struct board_info __initcon
+@@ -2020,6 +2079,7 @@ static const struct board_info __initcon
  	&board_96348_D4PW,
  	&board_spw500v,
  	&board_96348sv,
@@ -74,7 +74,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2091,6 +2151,22 @@ void __init board_bcm963xx_init(void)
+@@ -2095,6 +2155,22 @@ void __init board_bcm963xx_init(void)
  		val &= MPI_CSBASE_BASE_MASK;
  	}
  	boot_addr = (u8 *)KSEG1ADDR(val);

target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch

@@ -65,7 +65,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.of_board_id			= "brcm,bcm96348gw",
-@@ -2076,6 +2134,7 @@ static const struct board_info __initcon
+@@ -2080,6 +2138,7 @@ static const struct board_info __initcon
  	&board_spw500v,
  	&board_96348sv,
  	&board_V2500V_BB,

target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch

@@ -1,11 +1,12 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -543,6 +543,58 @@ static struct board_info __initdata boar
+@@ -543,6 +543,59 @@ static struct board_info __initdata boar
  };
  
  
 +static struct board_info __initdata board_ct536_ct5621 = {
 +	.name				= "CT536_CT5621",
++	.of_board_id			= "comtrend,ct-536+",
 +	.expected_cpu_id		= 0x6348,
 +
 +	.has_uart0			= 1,
@@ -59,7 +60,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.of_board_id			= "brcm,bcm96348gw",
-@@ -2135,6 +2187,7 @@ static const struct board_info __initcon
+@@ -2139,6 +2192,7 @@ static const struct board_info __initcon
  	&board_96348sv,
  	&board_V2500V_BB,
  	&board_V2110,

target/linux/brcm63xx/patches-3.14/515-board_DWV-S0_fixes.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1336,6 +1336,8 @@ static struct board_info __initdata boar
+@@ -1340,6 +1340,8 @@ static struct board_info __initdata boar
  	.of_board_id			= "pirelli,a226g",
  	.expected_cpu_id		= 0x6358,
  
@@ -9,7 +9,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -1352,6 +1354,7 @@ static struct board_info __initdata boar
+@@ -1356,6 +1358,7 @@ static struct board_info __initdata boar
  	},
  
  	.has_ohci0			= 1,

target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -595,6 +595,76 @@ static struct board_info __initdata boar
+@@ -596,6 +596,76 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -77,7 +77,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.of_board_id			= "brcm,bcm96348gw",
-@@ -2191,6 +2261,7 @@ static const struct board_info __initcon
+@@ -2196,6 +2266,7 @@ static const struct board_info __initcon
  	&board_V2500V_BB,
  	&board_V2110,
  	&board_ct536_ct5621,

target/linux/brcm63xx/patches-3.14/517-RTA1205W_16_uart_fixes.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -872,6 +872,7 @@ static struct board_info __initdata boar
+@@ -875,6 +875,7 @@ static struct board_info __initdata boar
  	.of_board_id			= "dynalink,rta1025w",
  	.expected_cpu_id		= 0x6348,
  

target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch

@@ -41,7 +41,7 @@
  
  static struct board_info __initdata board_ct536_ct5621 = {
  	.name				= "CT536_CT5621",
-@@ -2263,6 +2297,7 @@ static const struct board_info __initcon
+@@ -2268,6 +2302,7 @@ static const struct board_info __initcon
  	&board_V2110,
  	&board_ct536_ct5621,
  	&board_96348A_122,

target/linux/brcm63xx/patches-3.14/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
-@@ -2261,6 +2261,85 @@ static struct board_info __initdata boar
+@@ -2266,6 +2266,85 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -96,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2315,6 +2394,10 @@ static const struct board_info __initcon
+@@ -2320,6 +2399,10 @@ static const struct board_info __initcon
  	&board_HW553,
  	&board_spw303v,
  #endif

target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2337,6 +2337,72 @@ static struct board_info __initdata boar
+@@ -2342,6 +2342,72 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -2397,6 +2463,7 @@ static const struct board_info __initcon
+@@ -2402,6 +2468,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,

target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch

@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2446,6 +2516,7 @@ static const struct board_info __initcon
+@@ -2451,6 +2521,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,

target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch

@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2517,6 +2622,7 @@ static const struct board_info __initcon
+@@ -2522,6 +2627,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,

target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1175,6 +1175,59 @@ static struct board_info __initdata boar
+@@ -1178,6 +1178,59 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
@@ -60,7 +60,7 @@
  static struct board_info __initdata board_96348_D4PW = {
  	.name				= "D-4P-W",
  	.expected_cpu_id		= 0x6348,
-@@ -2652,6 +2705,7 @@ static const struct board_info __initcon
+@@ -2657,6 +2710,7 @@ static const struct board_info __initcon
  	&board_ct536_ct5621,
  	&board_96348A_122,
  	&board_CPVA502plus,

target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch

@@ -13,7 +13,7 @@
  /*
   * known 3368 boards
   */
-@@ -2376,6 +2382,124 @@ static struct board_info __initdata boar
+@@ -2381,6 +2387,124 @@ static struct board_info __initdata boar
  	.num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
  
@@ -138,7 +138,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -2720,6 +2844,7 @@ static const struct board_info __initcon
+@@ -2725,6 +2849,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r2,
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,

target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2642,6 +2642,73 @@ static struct board_info __initdata boar
+@@ -2647,6 +2647,74 @@ static struct board_info __initdata boar
  		},
  	}
  };
@@ -8,6 +8,7 @@
 +/* D-Link DVA-G3810BN/TL */
 +static struct board_info __initdata board_DVAG3810BN = {
 +	.name			= "DVAG3810BN",
++	.of_board_id		= "d-link,dva-g3810bn/tl",
 +	.expected_cpu_id	= 0x6358,
 +
 +	.has_uart0		= 1,
@@ -74,7 +75,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -2847,6 +2914,7 @@ static const struct board_info __initcon
+@@ -2852,6 +2920,7 @@ static const struct board_info __initcon
  	&board_ct6373_1,
  	&board_HW553,
  	&board_spw303v,

target/linux/brcm63xx/patches-3.14/528-board_nb6.patch

@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET		0xff80
  #define CT6373_74X164_GPIO_BASE	64
-@@ -2711,6 +2714,104 @@ static struct board_info __initdata boar
+@@ -2717,6 +2720,104 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
@@ -122,7 +122,7 @@
  /*
   * known 6368 boards
   */
-@@ -2917,6 +3018,10 @@ static const struct board_info __initcon
+@@ -2923,6 +3024,10 @@ static const struct board_info __initcon
  	&board_DVAG3810BN,
  #endif
  
@@ -133,7 +133,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
-@@ -2938,6 +3043,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2944,6 +3049,11 @@ static void __init boardid_fixup(u8 *boo
  		}
  	}
  

target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1117,6 +1117,57 @@ static struct board_info __initdata boar
+@@ -1120,6 +1120,57 @@ static struct board_info __initdata boar
  	.has_ehci0			= 1,
  };
  
@@ -58,7 +58,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
  	.name				= "RTA1025W_16",
  	.of_board_id			= "dynalink,rta1025w",
-@@ -2986,6 +3037,7 @@ static const struct board_info __initcon
+@@ -2992,6 +3043,7 @@ static const struct board_info __initcon
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,

target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch

@@ -134,7 +134,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
  	.name				= "AW4339U",
  	.expected_cpu_id		= 0x6328,
-@@ -3018,6 +3145,7 @@ static const struct board_info __initcon
+@@ -3024,6 +3151,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,

target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch

@@ -116,7 +116,7 @@
  static struct board_info __initdata board_963281TAN = {
  	.name				= "963281TAN",
  	.expected_cpu_id		= 0x6328,
-@@ -3144,6 +3253,7 @@ static const struct board_info __initcon
+@@ -3150,6 +3259,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,

target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch

@@ -92,7 +92,7 @@
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
  	{ .offset = 2, .value = 0x05bb },
  	{ .offset = 65, .value = 0x1204 },
-@@ -3253,6 +3338,7 @@ static const struct board_info __initcon
+@@ -3259,6 +3344,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,

target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch

@@ -56,7 +56,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -3352,6 +3401,7 @@ static const struct board_info __initcon
+@@ -3358,6 +3407,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,

target/linux/brcm63xx/patches-3.14/534-board_hw556.patch

@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -3001,6 +3002,492 @@ static struct board_info __initdata boar
+@@ -3006,6 +3007,492 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -501,7 +501,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
  	.name			= "96358-502V",
-@@ -3440,6 +3927,10 @@ static const struct board_info __initcon
+@@ -3446,6 +3933,10 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r2,
  	&board_ct6373_1,
  	&board_HW553,
@@ -512,7 +512,7 @@
  	&board_spw303v,
  	&board_DVAG3810BN,
  #endif
-@@ -3459,13 +3950,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3465,13 +3956,37 @@ static void __init boardid_fixup(u8 *boo
  	struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
  	char *board_name = (char *)bcm63xx_nvram_get_name();
  

target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch

@@ -61,7 +61,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -3889,6 +3943,7 @@ static const struct board_info __initcon
+@@ -3895,6 +3949,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
  	&board_rta770bw,

target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch

@@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -3933,6 +4049,7 @@ static const struct board_info __initcon
+@@ -3939,6 +4055,7 @@ static const struct board_info __initcon
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,

target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch

@@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3888,6 +3888,96 @@ static struct board_info __initdata boar
+@@ -3894,6 +3894,96 @@ static struct board_info __initdata boar
  	.devs = nb6_devices,
  	.num_devs = ARRAY_SIZE(nb6_devices),
  };
@@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -4109,6 +4199,7 @@ static const struct board_info __initcon
+@@ -4115,6 +4205,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,

target/linux/brcm63xx/patches-3.14/550-alice_gate2_leds.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2295,6 +2295,99 @@ static struct board_info __initdata boar
+@@ -2299,6 +2299,99 @@ static struct board_info __initdata boar
  
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,

target/linux/brcm63xx/patches-3.14/551-96348gw_a_leds.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1774,6 +1774,19 @@ static struct board_info __initdata boar
+@@ -1777,6 +1777,19 @@ static struct board_info __initdata boar
  	},
  
  	.has_ohci0 = 1,

target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch

@@ -36,7 +36,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -1483,6 +1491,8 @@ static struct board_info __initdata boar
+@@ -1484,6 +1492,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -45,7 +45,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -1660,6 +1670,8 @@ static struct board_info __initdata boar
+@@ -1663,6 +1673,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -54,7 +54,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -1736,6 +1748,8 @@ static struct board_info __initdata boar
+@@ -1739,6 +1751,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -63,7 +63,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -1759,6 +1773,8 @@ static struct board_info __initdata boar
+@@ -1762,6 +1776,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -72,7 +72,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -1780,6 +1796,8 @@ static struct board_info __initdata boar
+@@ -1783,6 +1799,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -81,7 +81,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -2117,6 +2135,8 @@ static struct board_info __initdata boar
+@@ -2121,6 +2139,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -90,7 +90,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -2171,6 +2191,8 @@ static struct board_info __initdata boar
+@@ -2175,6 +2195,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -99,7 +99,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -2313,6 +2335,8 @@ static struct board_info __initdata boar
+@@ -2317,6 +2339,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -108,7 +108,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -2432,6 +2456,8 @@ static struct board_info __initdata boar
+@@ -2436,6 +2460,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {

target/linux/brcm63xx/patches-3.14/554-board_DWVS0_leds_buttons.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2464,6 +2464,94 @@ static struct board_info __initdata boar
+@@ -2468,6 +2468,94 @@ static struct board_info __initdata boar
  
  	.has_ohci0			= 1,
  	.has_ehci0			= 1,

target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch

@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4363,6 +4450,9 @@ static const struct board_info __initcon
+@@ -4369,6 +4456,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
  	&board_cvg834g,
  #endif

target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch

@@ -95,7 +95,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -4452,6 +4540,7 @@ static const struct board_info __initcon
+@@ -4458,6 +4546,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,

target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4532,6 +4532,75 @@ static struct board_info __initdata boar
+@@ -4538,6 +4538,75 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4616,6 +4685,9 @@ static const struct board_info __initcon
+@@ -4622,6 +4691,9 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  #endif

target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch

@@ -8,12 +8,13 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1436,6 +1436,51 @@ static struct board_info __initdata boar
+@@ -1436,6 +1436,52 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_96348gw_10_AR1004G = {
 +	.name				= "AR1004G",
++	.of_board_id			= "asmax,ar1004g",
 +	.expected_cpu_id		= 0x6348,
 +
 +	.has_uart0			= 1,
@@ -60,7 +61,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
-@@ -4652,6 +4697,7 @@ static const struct board_info __initcon
+@@ -4658,6 +4704,7 @@ static const struct board_info __initcon
  	&board_96348A_122,
  	&board_CPVA502plus,
  	&board_96348W3,

target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4643,6 +4643,108 @@ static struct board_info __initdata boar
+@@ -4650,6 +4650,108 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -109,7 +109,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -4733,6 +4835,7 @@ static const struct board_info __initcon
+@@ -4740,6 +4842,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963269bhr,

target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4580,6 +4580,131 @@ static struct board_info __initdata boar
+@@ -4587,6 +4587,131 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -132,7 +132,7 @@
  static struct board_info __initdata board_963269bhr = {
  	.name				= "963269BHR",
  	.expected_cpu_id		= 0x63268,
-@@ -4834,6 +4959,7 @@ static const struct board_info __initcon
+@@ -4841,6 +4966,7 @@ static const struct board_info __initcon
  	&board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268

target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch

@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -4574,6 +4575,117 @@ static struct board_info __initdata boar
+@@ -4581,6 +4582,117 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -126,7 +126,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -4957,6 +5069,7 @@ static const struct board_info __initcon
+@@ -4964,6 +5076,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,

target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4576,6 +4576,116 @@ static struct board_info __initdata boar
+@@ -4583,6 +4583,116 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
@@ -117,7 +117,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -5069,6 +5179,7 @@ static const struct board_info __initcon
+@@ -5076,6 +5186,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,

target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4686,6 +4686,116 @@ static struct board_info __initdata boar
+@@ -4693,6 +4693,116 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -117,7 +117,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -5180,6 +5290,7 @@ static const struct board_info __initcon
+@@ -5187,6 +5297,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_VR3025u,

target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4585,6 +4585,96 @@ static struct sprom_fixup __initdata vr3
+@@ -4592,6 +4592,96 @@ static struct sprom_fixup __initdata vr3
  	{ .offset = 115, .value = 0xfad9 },
  };
  
@@ -97,7 +97,7 @@
  static struct board_info __initdata board_VR3025u = {
  	.name					= "96368M-1541N",
  	.expected_cpu_id		= 0x6368,
-@@ -5289,6 +5379,7 @@ static const struct board_info __initcon
+@@ -5296,6 +5386,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,

target/linux/brcm63xx/patches-3.14/565-board_hw520.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3547,6 +3547,56 @@ static struct board_info __initdata boar
+@@ -3553,6 +3553,56 @@ static struct board_info __initdata boar
  	.num_spis = ARRAY_SIZE(ct6373_spi_devices),
  };
  
@@ -57,7 +57,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -5362,6 +5412,7 @@ static const struct board_info __initcon
+@@ -5369,6 +5419,7 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,
  	&board_ct6373_1,

target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch

@@ -96,7 +96,7 @@
  static struct board_info __initdata board_A4001N1 = {
  	.name					= "963281T_TEF",
  	.expected_cpu_id			= 0x6328,
-@@ -5360,6 +5449,7 @@ static const struct board_info __initcon
+@@ -5367,6 +5456,7 @@ static const struct board_info __initcon
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,

target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch

@@ -142,7 +142,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -5443,6 +5578,7 @@ static const struct board_info __initcon
+@@ -5450,6 +5585,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,