0cd478518f
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa). Changelogs: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10 096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied upstream and dropped. Signed-off-by: Mathias Kresin <openwrt@kresin.me> [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47104
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
--- a/arch/mips/ath79/Kconfig
|
|
+++ b/arch/mips/ath79/Kconfig
|
|
@@ -900,6 +900,16 @@ config ATH79_MACH_CAP4200AG
|
|
select ATH79_DEV_M25P80
|
|
select ATH79_DEV_WMAC
|
|
|
|
+config ATH79_MACH_MR1750
|
|
+ bool "OpenMesh MR1750 board support"
|
|
+ select SOC_QCA955X
|
|
+ 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_MR900
|
|
bool "OpenMesh MR900 board support"
|
|
select SOC_QCA955X
|
|
--- a/arch/mips/ath79/Makefile
|
|
+++ b/arch/mips/ath79/Makefile
|
|
@@ -91,6 +91,7 @@ obj-$(CONFIG_ATH79_MACH_HORNET_UB) += ma
|
|
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_MR1750) += mach-mr1750.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
|
|
@@ -80,6 +80,7 @@ enum ath79_mach_type {
|
|
ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */
|
|
ATH79_MACH_MR12, /* Cisco Meraki MR12 */
|
|
ATH79_MACH_MR16, /* Cisco Meraki MR16 */
|
|
+ ATH79_MACH_MR1750, /* OpenMesh MR1750 */
|
|
ATH79_MACH_MR600V2, /* OpenMesh MR600v2 */
|
|
ATH79_MACH_MR600, /* OpenMesh MR600 */
|
|
ATH79_MACH_MR900, /* OpenMesh MR900 */
|