kernel: fix bluetooth and zsmalloc for 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.13 / 528-board_nb6.patch
1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
3 @@ -17,6 +17,7 @@
4 #include <linux/spi/spi.h>
5 #include <linux/spi/spi_gpio.h>
6 #include <linux/spi/74x164.h>
7 +#include <linux/rtl8367.h>
8 #include <asm/addrspace.h>
9 #include <bcm63xx_board.h>
10 #include <bcm63xx_cpu.h>
11 @@ -56,6 +57,8 @@
12 #define NB4_SPI_GPIO_MOSI 7
13 #define NB4_SPI_GPIO_CLK 6
14 #define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
15 +#define NB6_GPIO_RTL8367_SDA 18
16 +#define NB6_GPIO_RTL8367_SCK 20
17
18 #define CT6373_PID_OFFSET 0xff80
19 #define CT6373_74X164_GPIO_BASE 64
20 @@ -2672,6 +2675,104 @@ static struct board_info __initdata boar
21 };
22 #endif
23
24 +#ifdef CONFIG_BCM63XX_CPU_6362
25 +static struct rtl8367_extif_config nb6_rtl8367_extif0_cfg = {
26 + .mode = RTL8367_EXTIF_MODE_RGMII,
27 + .txdelay = 1,
28 + .rxdelay = 5,
29 + .ability = {
30 + .force_mode = 1,
31 + .txpause = 1,
32 + .rxpause = 1,
33 + .link = 1,
34 + .duplex = 1,
35 + .speed = RTL8367_PORT_SPEED_1000,
36 + },
37 +};
38 +
39 +static struct rtl8367_platform_data nb6_rtl8367_data = {
40 + .gpio_sda = NB6_GPIO_RTL8367_SDA,
41 + .gpio_sck = NB6_GPIO_RTL8367_SCK,
42 + .extif0_cfg = &nb6_rtl8367_extif0_cfg,
43 +};
44 +
45 +static struct platform_device nb6_rtl8367_device = {
46 + .name = RTL8367_DRIVER_NAME,
47 + .id = -1,
48 + .dev = {
49 + .platform_data = &nb6_rtl8367_data,
50 + }
51 +};
52 +
53 +static struct platform_device * __initdata nb6_devices[] = {
54 + &nb6_rtl8367_device,
55 +};
56 +
57 +static struct board_info __initdata board_nb6 = {
58 + .name = "NB6",
59 + .expected_cpu_id = 0x6362,
60 +
61 + .has_uart0 = 1,
62 +
63 + .has_ohci0 = 1,
64 + .has_ehci0 = 1,
65 + .num_usbh_ports = 2,
66 +
67 + .has_enetsw = 1,
68 +
69 + .enetsw = {
70 + .used_ports = {
71 + [4] = {
72 + .used = 1,
73 + .phy_id = 0xff,
74 + .bypass_link = 1,
75 + .force_speed = 1000,
76 + .force_duplex_full = 1,
77 + .name = "RGMII",
78 + },
79 + },
80 + },
81 +
82 + .buttons = {
83 + {
84 + .desc = "reset",
85 + .gpio = 24,
86 + .type = EV_KEY,
87 + .code = KEY_RESTART,
88 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
89 + .active_low = 1,
90 + },
91 + {
92 + .desc = "wps",
93 + .gpio = 25,
94 + .type = EV_KEY,
95 + .code = KEY_WPS_BUTTON,
96 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
97 + .active_low = 1,
98 + },
99 + {
100 + .desc = "wlan",
101 + .gpio = 12,
102 + .type = EV_KEY,
103 + .code = KEY_WLAN,
104 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
105 + .active_low = 1,
106 + },
107 + {
108 + .desc = "service",
109 + .gpio = 10,
110 + .type = EV_KEY,
111 + .code = BTN_0,
112 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
113 + .active_low = 1,
114 + },
115 + },
116 +
117 + .devs = nb6_devices,
118 + .num_devs = ARRAY_SIZE(nb6_devices),
119 +};
120 +#endif
121 +
122 /*
123 * known 6368 boards
124 */
125 @@ -2878,6 +2979,10 @@ static const struct board_info __initcon
126 &board_DVAG3810BN,
127 #endif
128
129 +#ifdef CONFIG_BCM63XX_CPU_6362
130 + &board_nb6,
131 +#endif
132 +
133 #ifdef CONFIG_BCM63XX_CPU_6368
134 &board_96368mvwg,
135 &board_96368mvngr,
136 @@ -2945,6 +3050,11 @@ static void __init boardid_fixup(u8 *boo
137 }
138 }
139
140 + if (BCMCPU_IS_6362() && (!strncmp(board_name, "NB6-", sizeof("NB6-") - 1))) {
141 + board_name[sizeof("NB6") - 1] = '\0';
142 + return ;
143 + }
144 +
145 /* check if bcm_tag is at 64k offset */
146 if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
147 /* else try 128k */