901a7fa067
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46150
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
--- a/arch/mips/ath79/Kconfig
|
|
+++ b/arch/mips/ath79/Kconfig
|
|
@@ -714,6 +714,26 @@ config ATH79_MACH_OM5P
|
|
select ATH79_DEV_M25P80
|
|
select ATH79_DEV_WMAC
|
|
|
|
+config ATH79_MACH_MR12
|
|
+ bool "Meraki MR12 board support"
|
|
+ select SOC_AR724X
|
|
+ select ATH79_DEV_AP9X_PCI if PCI
|
|
+ select ATH79_DEV_ETH
|
|
+ select ATH79_DEV_GPIO_BUTTONS
|
|
+ select ATH79_DEV_LEDS_GPIO
|
|
+ select ATH79_DEV_M25P80
|
|
+ select ATH79_DEV_WMAC
|
|
+
|
|
+config ATH79_MACH_MR16
|
|
+ bool "Meraki MR16 board support"
|
|
+ select SOC_AR71XX
|
|
+ select ATH79_DEV_AP9X_PCI if PCI
|
|
+ select ATH79_DEV_ETH
|
|
+ select ATH79_DEV_GPIO_BUTTONS
|
|
+ select ATH79_DEV_LEDS_GPIO
|
|
+ select ATH79_DEV_M25P80
|
|
+ select ATH79_DEV_WMAC
|
|
+
|
|
config ATH79_MACH_MR600
|
|
bool "OpenMesh MR600 board support"
|
|
select SOC_AR934X
|
|
--- a/arch/mips/ath79/Makefile
|
|
+++ b/arch/mips/ath79/Makefile
|
|
@@ -79,6 +79,8 @@ obj-$(CONFIG_ATH79_MACH_JA76PF) += mach
|
|
obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o
|
|
obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o
|
|
obj-$(CONFIG_ATH79_MACH_MC_MAC1200R) += mach-mc-mac1200r.o
|
|
+obj-$(CONFIG_ATH79_MACH_MR12) += mach-mr12.o
|
|
+obj-$(CONFIG_ATH79_MACH_MR16) += mach-mr16.o
|
|
obj-$(CONFIG_ATH79_MACH_MR600) += mach-mr600.o
|
|
obj-$(CONFIG_ATH79_MACH_MR900) += mach-mr900.o
|
|
obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o
|
|
--- a/arch/mips/ath79/machtypes.h
|
|
+++ b/arch/mips/ath79/machtypes.h
|
|
@@ -68,6 +68,8 @@ enum ath79_mach_type {
|
|
ATH79_MACH_JA76PF2, /* jjPlus JA76PF2 */
|
|
ATH79_MACH_JWAP003, /* jjPlus JWAP003 */
|
|
ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */
|
|
+ ATH79_MACH_MR12, /* Cisco Meraki MR12 */
|
|
+ ATH79_MACH_MR16, /* Cisco Meraki MR16 */
|
|
ATH79_MACH_MR600V2, /* OpenMesh MR600v2 */
|
|
ATH79_MACH_MR600, /* OpenMesh MR600 */
|
|
ATH79_MACH_MR900, /* OpenMesh MR900 */
|