1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
4 #include <linux/string.h>
5 #include <linux/gpio_keys.h>
6 #include <linux/input.h>
7 +#include <linux/platform_device.h>
8 +#include <linux/spi/spi.h>
9 +#include <linux/spi/spi_gpio.h>
10 +#if 0 /* FIXME: 3.14 removed non-DT support */
11 +#include <linux/spi/74x164.h>
13 #include <asm/addrspace.h>
14 #include <bcm63xx_board.h>
15 #include <bcm63xx_cpu.h>
16 @@ -343,6 +349,12 @@ static struct board_info __initdata boar
17 #define CFE_OFFSET_64K 0x10000
18 #define CFE_OFFSET_128K 0x20000
20 +#define NB4_PID_OFFSET 0xff80
21 +#define NB4_74X164_GPIO_BASE 64
22 +#define NB4_SPI_GPIO_MOSI 7
23 +#define NB4_SPI_GPIO_CLK 6
24 +#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
29 @@ -739,6 +751,605 @@ static struct board_info __initdata boar
34 +struct spi_gpio_platform_data nb4_spi_gpio_data = {
35 + .sck = NB4_SPI_GPIO_CLK,
36 + .mosi = NB4_SPI_GPIO_MOSI,
37 + .miso = SPI_GPIO_NO_MISO,
38 + .num_chipselect = 1,
42 +static struct platform_device nb4_spi_gpio = {
46 + .platform_data = &nb4_spi_gpio_data,
50 +static struct platform_device * __initdata nb4_devices[] = {
54 +#if 0 /* FIXME: 3.14 removed non-DT support */
55 +const struct gen_74x164_chip_platform_data nb4_74x164_platform_data = {
56 + .base = NB4_74X164_GPIO_BASE
60 +static struct spi_board_info nb4_spi_devices[] = {
61 +#if 0 /* FIXME: 3.14 removed non-DT support */
63 + .modalias = "74x164",
64 + .max_speed_hz = 781000,
66 + .controller_data = (void *) SPI_GPIO_NO_CHIPSELECT,
68 + .platform_data = &nb4_74x164_platform_data
73 +static struct board_info __initdata board_nb4_ser_r0 = {
74 + .name = "NB4-SER-r0",
75 + .expected_cpu_id = 0x6358,
84 + .use_internal_phy = 1,
90 + .force_speed_100 = 1,
91 + .force_duplex_full = 1,
98 + .num_usbh_ports = 2,
102 + .name = "NB4-SER-r0:white:adsl",
103 + .gpio = NB4_74HC64_GPIO(4),
107 + .name = "NB4-SER-r0:white:traffic",
112 + .name = "NB4-SER-r0:white:tel",
113 + .gpio = NB4_74HC64_GPIO(3),
117 + .name = "NB4-SER-r0:white:tv",
118 + .gpio = NB4_74HC64_GPIO(2),
122 + .name = "NB4-SER-r0:white:wifi",
127 + .name = "NB4-SER-r0:white:alarm",
128 + .gpio = NB4_74HC64_GPIO(0),
132 + .name = "NB4-SER-r0:red:service",
137 + .name = "NB4-SER-r0:green:service",
142 + .name = "NB4-SER-r0:blue:service",
152 + .code = KEY_RESTART,
154 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
160 + .code = KEY_WPS_BUTTON,
162 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
170 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
178 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
181 + .devs = nb4_devices,
182 + .num_devs = ARRAY_SIZE(nb4_devices),
183 + .spis = nb4_spi_devices,
184 + .num_spis = ARRAY_SIZE(nb4_spi_devices),
187 +static struct board_info __initdata board_nb4_ser_r1 = {
188 + .name = "NB4-SER-r1",
189 + .expected_cpu_id = 0x6358,
198 + .use_internal_phy = 1,
204 + .force_speed_100 = 1,
205 + .force_duplex_full = 1,
212 + .num_usbh_ports = 2,
216 + .name = "NB4-SER-r1:white:adsl",
217 + .gpio = NB4_74HC64_GPIO(4),
221 + .name = "NB4-SER-r1:white:traffic",
226 + .name = "NB4-SER-r1:white:tel",
227 + .gpio = NB4_74HC64_GPIO(3),
231 + .name = "NB4-SER-r1:white:tv",
232 + .gpio = NB4_74HC64_GPIO(2),
236 + .name = "NB4-SER-r1:white:wifi",
241 + .name = "NB4-SER-r1:white:alarm",
242 + .gpio = NB4_74HC64_GPIO(0),
246 + .name = "NB4-SER-r1:red:service",
251 + .name = "NB4-SER-r1:green:service",
256 + .name = "NB4-SER-r1:blue:service",
266 + .code = KEY_RESTART,
268 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
274 + .code = KEY_WPS_BUTTON,
276 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
284 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
292 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
295 + .devs = nb4_devices,
296 + .num_devs = ARRAY_SIZE(nb4_devices),
297 + .spis = nb4_spi_devices,
298 + .num_spis = ARRAY_SIZE(nb4_spi_devices),
301 +static struct board_info __initdata board_nb4_ser_r2 = {
302 + .name = "NB4-SER-r2",
303 + .expected_cpu_id = 0x6358,
312 + .use_internal_phy = 1,
318 + .force_speed_100 = 1,
319 + .force_duplex_full = 1,
326 + .num_usbh_ports = 2,
330 + .name = "NB4-SER-r2:white:adsl",
331 + .gpio = NB4_74HC64_GPIO(4),
335 + .name = "NB4-SER-r2:white:traffic",
340 + .name = "NB4-SER-r2:white:tel",
341 + .gpio = NB4_74HC64_GPIO(3),
345 + .name = "NB4-SER-r2:white:tv",
346 + .gpio = NB4_74HC64_GPIO(2),
350 + .name = "NB4-SER-r2:white:wifi",
355 + .name = "NB4-SER-r2:white:alarm",
356 + .gpio = NB4_74HC64_GPIO(0),
360 + .name = "NB4-SER-r2:red:service",
365 + .name = "NB4-SER-r2:green:service",
370 + .name = "NB4-SER-r2:blue:service",
380 + .code = KEY_RESTART,
382 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
388 + .code = KEY_WPS_BUTTON,
390 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
398 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
406 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
409 + .devs = nb4_devices,
410 + .num_devs = ARRAY_SIZE(nb4_devices),
411 + .spis = nb4_spi_devices,
412 + .num_spis = ARRAY_SIZE(nb4_spi_devices),
415 +static struct board_info __initdata board_nb4_fxc_r1 = {
416 + .name = "NB4-FXC-r1",
417 + .expected_cpu_id = 0x6358,
426 + .use_internal_phy = 1,
432 + .force_speed_100 = 1,
433 + .force_duplex_full = 1,
440 + .num_usbh_ports = 2,
444 + .name = "NB4-FXC-r1:white:adsl",
445 + .gpio = NB4_74HC64_GPIO(4),
449 + .name = "NB4-FXC-r1:white:traffic",
453 + .name = "NB4-FXC-r1:white:tel",
454 + .gpio = NB4_74HC64_GPIO(3),
458 + .name = "NB4-FXC-r1:white:tv",
459 + .gpio = NB4_74HC64_GPIO(2),
463 + .name = "NB4-FXC-r1:white:wifi",
467 + .name = "NB4-FXC-r1:white:alarm",
468 + .gpio = NB4_74HC64_GPIO(0),
472 + .name = "NB4-FXC-r1:red:service",
476 + .name = "NB4-FXC-r1:green:service",
480 + .name = "NB4-FXC-r1:blue:service",
489 + .code = KEY_RESTART,
491 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
497 + .code = KEY_WPS_BUTTON,
499 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
507 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
515 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
518 + .devs = nb4_devices,
519 + .num_devs = ARRAY_SIZE(nb4_devices),
520 + .spis = nb4_spi_devices,
521 + .num_spis = ARRAY_SIZE(nb4_spi_devices),
524 +static struct board_info __initdata board_nb4_fxc_r2 = {
525 + .name = "NB4-FXC-r2",
526 + .expected_cpu_id = 0x6358,
535 + .use_internal_phy = 1,
541 + .force_speed_100 = 1,
542 + .force_duplex_full = 1,
549 + .num_usbh_ports = 2,
553 + .name = "NB4-FXC-r2:white:adsl",
554 + .gpio = NB4_74HC64_GPIO(4),
558 + .name = "NB4-FXC-r2:white:traffic",
562 + .name = "NB4-FXC-r2:white:tel",
563 + .gpio = NB4_74HC64_GPIO(3),
567 + .name = "NB4-FXC-r2:white:tv",
568 + .gpio = NB4_74HC64_GPIO(2),
572 + .name = "NB4-FXC-r2:white:wifi",
576 + .name = "NB4-FXC-r2:white:alarm",
577 + .gpio = NB4_74HC64_GPIO(0),
581 + .name = "NB4-FXC-r2:red:service",
585 + .name = "NB4-FXC-r2:green:service",
589 + .name = "NB4-FXC-r2:blue:service",
598 + .code = KEY_RESTART,
600 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
606 + .code = KEY_WPS_BUTTON,
608 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
616 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
624 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
627 + .devs = nb4_devices,
628 + .num_devs = ARRAY_SIZE(nb4_devices),
629 + .spis = nb4_spi_devices,
630 + .num_spis = ARRAY_SIZE(nb4_spi_devices),
635 @@ -775,6 +1386,11 @@ static const struct board_info __initcon
647 @@ -783,6 +1399,16 @@ static void __init boardid_fixup(u8 *boo
648 struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
649 char *board_name = (char *)bcm63xx_nvram_get_name();
651 + if (BCMCPU_IS_6358() && (!strcmp(board_name, "96358VW"))) {
652 + u8 *p = boot_addr + NB4_PID_OFFSET;
654 + /* Extract nb4 PID */
655 + if (!memcmp(p, "NB4-", 4)) {
656 + memcpy(board_name, p, sizeof("NB4-XXX-rX"));
661 /* check if bcm_tag is at 64k offset */
662 if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {