ar71xx: add v3.18 support
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-3.18 / 603-MIPS-ath79-ap121-fixes.patch
1 --- a/arch/mips/ath79/mach-ap121.c
2 +++ b/arch/mips/ath79/mach-ap121.c
3 @@ -1,19 +1,21 @@
4 /*
5 * Atheros AP121 board support
6 *
7 - * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
8 + * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License version 2 as published
12 * by the Free Software Foundation.
13 */
14
15 -#include "machtypes.h"
16 +#include "dev-eth.h"
17 #include "dev-gpio-buttons.h"
18 #include "dev-leds-gpio.h"
19 +#include "dev-m25p80.h"
20 #include "dev-spi.h"
21 #include "dev-usb.h"
22 #include "dev-wmac.h"
23 +#include "machtypes.h"
24
25 #define AP121_GPIO_LED_WLAN 0
26 #define AP121_GPIO_LED_USB 1
27 @@ -24,7 +26,14 @@
28 #define AP121_KEYS_POLL_INTERVAL 20 /* msecs */
29 #define AP121_KEYS_DEBOUNCE_INTERVAL (3 * AP121_KEYS_POLL_INTERVAL)
30
31 -#define AP121_CAL_DATA_ADDR 0x1fff1000
32 +#define AP121_MAC0_OFFSET 0x0000
33 +#define AP121_MAC1_OFFSET 0x0006
34 +#define AP121_CALDATA_OFFSET 0x1000
35 +#define AP121_WMAC_MAC_OFFSET 0x1002
36 +
37 +#define AP121_MINI_GPIO_LED_WLAN 0
38 +#define AP121_MINI_GPIO_BTN_JUMPSTART 12
39 +#define AP121_MINI_GPIO_BTN_RESET 11
40
41 static struct gpio_led ap121_leds_gpio[] __initdata = {
42 {
43 @@ -58,41 +67,78 @@ static struct gpio_keys_button ap121_gpi
44 }
45 };
46
47 -static struct ath79_spi_controller_data ap121_spi0_data = {
48 - .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
49 - .cs_line = 0,
50 +static struct gpio_led ap121_mini_leds_gpio[] __initdata = {
51 + {
52 + .name = "ap121:green:wlan",
53 + .gpio = AP121_MINI_GPIO_LED_WLAN,
54 + .active_low = 0,
55 + },
56 };
57
58 -static struct spi_board_info ap121_spi_info[] = {
59 +static struct gpio_keys_button ap121_mini_gpio_keys[] __initdata = {
60 {
61 - .bus_num = 0,
62 - .chip_select = 0,
63 - .max_speed_hz = 25000000,
64 - .modalias = "mx25l1606e",
65 - .controller_data = &ap121_spi0_data,
66 + .desc = "jumpstart button",
67 + .type = EV_KEY,
68 + .code = KEY_WPS_BUTTON,
69 + .debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
70 + .gpio = AP121_MINI_GPIO_BTN_JUMPSTART,
71 + .active_low = 1,
72 + },
73 + {
74 + .desc = "reset button",
75 + .type = EV_KEY,
76 + .code = KEY_RESTART,
77 + .debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
78 + .gpio = AP121_MINI_GPIO_BTN_RESET,
79 + .active_low = 1,
80 }
81 };
82
83 -static struct ath79_spi_platform_data ap121_spi_data = {
84 - .bus_num = 0,
85 - .num_chipselect = 1,
86 -};
87 +static void __init ap121_common_setup(void)
88 +{
89 + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
90 +
91 + ath79_register_m25p80(NULL);
92 + ath79_register_wmac(art + AP121_CALDATA_OFFSET,
93 + art + AP121_WMAC_MAC_OFFSET);
94 +
95 + ath79_init_mac(ath79_eth0_data.mac_addr, art + AP121_MAC0_OFFSET, 0);
96 + ath79_init_mac(ath79_eth1_data.mac_addr, art + AP121_MAC1_OFFSET, 0);
97 +
98 + ath79_register_mdio(0, 0x0);
99 +
100 + /* LAN ports */
101 + ath79_register_eth(1);
102 +
103 + /* WAN port */
104 + ath79_register_eth(0);
105 +}
106
107 static void __init ap121_setup(void)
108 {
109 - u8 *cal_data = (u8 *) KSEG1ADDR(AP121_CAL_DATA_ADDR);
110 + ap121_common_setup();
111
112 ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_leds_gpio),
113 ap121_leds_gpio);
114 ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,
115 ARRAY_SIZE(ap121_gpio_keys),
116 ap121_gpio_keys);
117 -
118 - ath79_register_spi(&ap121_spi_data, ap121_spi_info,
119 - ARRAY_SIZE(ap121_spi_info));
120 ath79_register_usb();
121 - ath79_register_wmac(cal_data, NULL);
122 }
123
124 MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board",
125 ap121_setup);
126 +
127 +static void __init ap121_mini_setup(void)
128 +{
129 + ap121_common_setup();
130 +
131 + ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_mini_leds_gpio),
132 + ap121_mini_leds_gpio);
133 + ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,
134 + ARRAY_SIZE(ap121_mini_gpio_keys),
135 + ap121_mini_gpio_keys);
136 +}
137 +
138 +MIPS_MACHINE(ATH79_MACH_AP121_MINI, "AP121-MINI", "Atheros AP121-MINI",
139 + ap121_mini_setup);
140 --- a/arch/mips/ath79/Kconfig
141 +++ b/arch/mips/ath79/Kconfig
142 @@ -5,9 +5,10 @@ menu "Atheros AR71XX/AR724X/AR913X machi
143 config ATH79_MACH_AP121
144 bool "Atheros AP121 reference board"
145 select SOC_AR933X
146 + select ATH79_DEV_ETH
147 select ATH79_DEV_GPIO_BUTTONS
148 select ATH79_DEV_LEDS_GPIO
149 - select ATH79_DEV_SPI
150 + select ATH79_DEV_M25P80
151 select ATH79_DEV_USB
152 select ATH79_DEV_WMAC
153 help
154 --- a/arch/mips/ath79/machtypes.h
155 +++ b/arch/mips/ath79/machtypes.h
156 @@ -17,6 +17,7 @@
157 enum ath79_mach_type {
158 ATH79_MACH_GENERIC = 0,
159 ATH79_MACH_AP121, /* Atheros AP121 reference board */
160 + ATH79_MACH_AP121_MINI, /* Atheros AP121-MINI reference board */
161 ATH79_MACH_AP136_010, /* Atheros AP136-010 reference board */
162 ATH79_MACH_AP81, /* Atheros AP81 reference board */
163 ATH79_MACH_DB120, /* Atheros DB120 reference board */