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>
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 @@ -768,6 +780,270 @@ 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 + .of_board_id = "sfr,nb4-ser-r0",
76 + .expected_cpu_id = 0x6358,
85 + .use_internal_phy = 1,
91 + .force_speed_100 = 1,
92 + .force_duplex_full = 1,
99 + .num_usbh_ports = 2,
103 + .name = "NB4-SER-r0:white:adsl",
104 + .gpio = NB4_74HC64_GPIO(4),
108 + .name = "NB4-SER-r0:white:traffic",
113 + .name = "NB4-SER-r0:white:tel",
114 + .gpio = NB4_74HC64_GPIO(3),
118 + .name = "NB4-SER-r0:white:tv",
119 + .gpio = NB4_74HC64_GPIO(2),
123 + .name = "NB4-SER-r0:white:wifi",
128 + .name = "NB4-SER-r0:white:alarm",
129 + .gpio = NB4_74HC64_GPIO(0),
133 + .name = "NB4-SER-r0:red:service",
138 + .name = "NB4-SER-r0:green:service",
143 + .name = "NB4-SER-r0:blue:service",
153 + .code = KEY_RESTART,
155 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
161 + .code = KEY_WPS_BUTTON,
163 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
171 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
179 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
182 + .devs = nb4_devices,
183 + .num_devs = ARRAY_SIZE(nb4_devices),
184 + .spis = nb4_spi_devices,
185 + .num_spis = ARRAY_SIZE(nb4_spi_devices),
188 +static struct board_info __initdata board_nb4_fxc_r1 = {
189 + .name = "NB4-FXC-r1",
190 + .of_board_id = "sfr,nb4-fxc-r1",
191 + .expected_cpu_id = 0x6358,
200 + .use_internal_phy = 1,
206 + .force_speed_100 = 1,
207 + .force_duplex_full = 1,
214 + .num_usbh_ports = 2,
218 + .name = "NB4-FXC-r1:white:adsl",
219 + .gpio = NB4_74HC64_GPIO(4),
223 + .name = "NB4-FXC-r1:white:traffic",
227 + .name = "NB4-FXC-r1:white:tel",
228 + .gpio = NB4_74HC64_GPIO(3),
232 + .name = "NB4-FXC-r1:white:tv",
233 + .gpio = NB4_74HC64_GPIO(2),
237 + .name = "NB4-FXC-r1:white:wifi",
241 + .name = "NB4-FXC-r1:white:alarm",
242 + .gpio = NB4_74HC64_GPIO(0),
246 + .name = "NB4-FXC-r1:red:service",
250 + .name = "NB4-FXC-r1:green:service",
254 + .name = "NB4-FXC-r1:blue:service",
263 + .code = KEY_RESTART,
265 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
271 + .code = KEY_WPS_BUTTON,
273 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
281 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
289 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
292 + .devs = nb4_devices,
293 + .num_devs = ARRAY_SIZE(nb4_devices),
294 + .spis = nb4_spi_devices,
295 + .num_spis = ARRAY_SIZE(nb4_spi_devices),
297 #endif /* CONFIG_BCM63XX_CPU_6358 */
300 @@ -804,6 +1080,8 @@ static const struct board_info __initcon