#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
-@@ -46,6 +47,8 @@
+@@ -42,6 +43,8 @@
#define NB4_SPI_GPIO_MOSI 7
#define NB4_SPI_GPIO_CLK 6
#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
-@@ -2663,6 +2666,104 @@ static struct board_info __initdata boar
+@@ -2378,6 +2381,105 @@ static struct board_info __initdata boar
};
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
+#ifdef CONFIG_BCM63XX_CPU_6362
+static struct rtl8367_extif_config nb6_rtl8367_extif0_cfg = {
+
+static struct board_info __initdata board_nb6 = {
+ .name = "NB6",
++ .of_board_id = "sfr,nb6-ser-r0",
+ .expected_cpu_id = 0x6362,
+
+ .has_uart0 = 1,
+ .devs = nb6_devices,
+ .num_devs = ARRAY_SIZE(nb6_devices),
+};
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6362 */
+
/*
* known 6368 boards
*/
-@@ -2869,6 +2970,10 @@ static const struct board_info __initcon
+@@ -2581,6 +2683,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2890,6 +2995,11 @@ static void __init boardid_fixup(u8 *boo
- }
- }
-
-+ if (BCMCPU_IS_6362() && (!strncmp(board_name, "NB6-", sizeof("NB6-") - 1))) {
-+ board_name[sizeof("NB6") - 1] = '\0';
-+ return ;
-+ }
-+
- /* check if bcm_tag is at 64k offset */
- if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
- /* else try 128k */