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
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
--- a/arch/mips/ath79/Kconfig
|
|
+++ b/arch/mips/ath79/Kconfig
|
|
@@ -151,6 +151,20 @@ config ATH79_MACH_AP147
|
|
Say 'Y' here if you want your kernel to support the
|
|
QCA AP147 reference boards.
|
|
|
|
+config ATH79_MACH_AP152
|
|
+ bool "Atheros AP152 reference board"
|
|
+ select SOC_QCA956X
|
|
+ select ATH79_DEV_GPIO_BUTTONS
|
|
+ select ATH79_DEV_LEDS_GPIO
|
|
+ select ATH79_DEV_M25P80
|
|
+ select ATH79_DEV_USB
|
|
+ select ATH79_DEV_WMAC
|
|
+ select ATH79_DEV_AP9X_PCI if PCI
|
|
+ help
|
|
+ Say 'Y' here if you want your kernel to support the
|
|
+ QCA AP152 reference boards.
|
|
+
|
|
+
|
|
config ATH79_MACH_AP81
|
|
bool "Atheros AP81 reference board"
|
|
select SOC_AR913X
|
|
--- a/arch/mips/ath79/Makefile
|
|
+++ b/arch/mips/ath79/Makefile
|
|
@@ -50,6 +50,7 @@ obj-$(CONFIG_ATH79_MACH_AP132) += mach-
|
|
obj-$(CONFIG_ATH79_MACH_AP136) += mach-ap136.o
|
|
obj-$(CONFIG_ATH79_MACH_AP143) += mach-ap143.o
|
|
obj-$(CONFIG_ATH79_MACH_AP147) += mach-ap147.o
|
|
+obj-$(CONFIG_ATH79_MACH_AP152) += mach-ap152.o
|
|
obj-$(CONFIG_ATH79_MACH_AP81) += mach-ap81.o
|
|
obj-$(CONFIG_ATH79_MACH_AP83) += mach-ap83.o
|
|
obj-$(CONFIG_ATH79_MACH_AP96) += mach-ap96.o
|
|
--- a/arch/mips/ath79/machtypes.h
|
|
+++ b/arch/mips/ath79/machtypes.h
|
|
@@ -32,6 +32,7 @@ enum ath79_mach_type {
|
|
ATH79_MACH_AP136_020, /* Atheros AP136-020 reference board */
|
|
ATH79_MACH_AP143, /* Atheros AP143 reference board */
|
|
ATH79_MACH_AP147_010, /* Atheros AP147-010 reference board */
|
|
+ ATH79_MACH_AP152, /* Atheros AP152 reference board */
|
|
ATH79_MACH_AP81, /* Atheros AP81 reference board */
|
|
ATH79_MACH_AP83, /* Atheros AP83 */
|
|
ATH79_MACH_AP96, /* Atheros AP96 */
|