kernel: refresh patches on linux 3.18
[openwrt/openwrt.git] / target / linux / ar71xx / patches-3.18 / 738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
1 --- a/arch/mips/ath79/Kconfig
2 +++ b/arch/mips/ath79/Kconfig
3 @@ -726,6 +726,26 @@ config ATH79_MACH_OM5P
4 select ATH79_DEV_M25P80
5 select ATH79_DEV_WMAC
6
7 +config ATH79_MACH_MR12
8 + bool "Meraki MR12 board support"
9 + select SOC_AR724X
10 + select ATH79_DEV_AP9X_PCI if PCI
11 + select ATH79_DEV_ETH
12 + select ATH79_DEV_GPIO_BUTTONS
13 + select ATH79_DEV_LEDS_GPIO
14 + select ATH79_DEV_M25P80
15 + select ATH79_DEV_WMAC
16 +
17 +config ATH79_MACH_MR16
18 + bool "Meraki MR16 board support"
19 + select SOC_AR71XX
20 + select ATH79_DEV_AP9X_PCI if PCI
21 + select ATH79_DEV_ETH
22 + select ATH79_DEV_GPIO_BUTTONS
23 + select ATH79_DEV_LEDS_GPIO
24 + select ATH79_DEV_M25P80
25 + select ATH79_DEV_WMAC
26 +
27 config ATH79_MACH_MR600
28 bool "OpenMesh MR600 board support"
29 select SOC_AR934X
30 --- a/arch/mips/ath79/Makefile
31 +++ b/arch/mips/ath79/Makefile
32 @@ -80,6 +80,8 @@ obj-$(CONFIG_ATH79_MACH_JA76PF) += mach
33 obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o
34 obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o
35 obj-$(CONFIG_ATH79_MACH_MC_MAC1200R) += mach-mc-mac1200r.o
36 +obj-$(CONFIG_ATH79_MACH_MR12) += mach-mr12.o
37 +obj-$(CONFIG_ATH79_MACH_MR16) += mach-mr16.o
38 obj-$(CONFIG_ATH79_MACH_MR600) += mach-mr600.o
39 obj-$(CONFIG_ATH79_MACH_MR900) += mach-mr900.o
40 obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o
41 --- a/arch/mips/ath79/machtypes.h
42 +++ b/arch/mips/ath79/machtypes.h
43 @@ -69,6 +69,8 @@ enum ath79_mach_type {
44 ATH79_MACH_JA76PF2, /* jjPlus JA76PF2 */
45 ATH79_MACH_JWAP003, /* jjPlus JWAP003 */
46 ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */
47 + ATH79_MACH_MR12, /* Cisco Meraki MR12 */
48 + ATH79_MACH_MR16, /* Cisco Meraki MR16 */
49 ATH79_MACH_MR600V2, /* OpenMesh MR600v2 */
50 ATH79_MACH_MR600, /* OpenMesh MR600 */
51 ATH79_MACH_MR900, /* OpenMesh MR900 */