diff options
6 files changed, 96 insertions, 124 deletions
| diff --git a/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch b/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch index c8d610600..3f57443e2 100644 --- a/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch +++ b/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch @@ -56,7 +56,7 @@   static struct gpio_led ap136_leds_gpio[] __initdata = {   	{ -@@ -98,64 +104,136 @@ static struct gpio_keys_button ap136_gpi +@@ -98,64 +104,156 @@ static struct gpio_keys_button ap136_gpi   	},   }; @@ -224,22 +224,63 @@  +	ath79_eth1_pll_data.pll_1000 = 0x03000101;  +  +	ap136_common_setup(); ++} ++ ++MIPS_MACHINE(ATH79_MACH_AP136_020, "AP136-020", ++	     "Atheros AP136-020 reference board", ++	     ap136_020_setup); ++ ++/* ++ * AP135-020 is similar to AP136-020, any future AP135 specific init ++ * code can be added here. ++ */ ++static void __init ap135_020_setup(void) ++{ ++	ap136_leds_gpio[0].name = "ap135:green:status"; ++	ap136_leds_gpio[1].name = "ap135:red:status"; ++	ap136_leds_gpio[2].name = "ap135:green:wps"; ++	ap136_leds_gpio[3].name = "ap135:red:wps"; ++	ap136_leds_gpio[4].name = "ap135:red:wlan-2g"; ++	ap136_leds_gpio[5].name = "ap135:red:usb"; ++ ++	ap136_020_setup();   }  -MIPS_MACHINE(ATH79_MACH_AP136, "AP136", "Atheros AP136 reference board",  -	     ap136_setup); -+MIPS_MACHINE(ATH79_MACH_AP136_020, "AP136-020", -+	     "Atheros AP136-020 reference board", -+	     ap136_020_setup); ++MIPS_MACHINE(ATH79_MACH_AP135_020, "AP135-020", ++	     "Atheros AP135-020 reference board", ++	     ap135_020_setup);  --- a/arch/mips/ath79/machtypes.h  +++ b/arch/mips/ath79/machtypes.h -@@ -18,7 +18,8 @@ enum ath79_mach_type { +@@ -18,7 +18,9 @@ enum ath79_mach_type {   	ATH79_MACH_GENERIC = 0,   	ATH79_MACH_AP121,		/* Atheros AP121 reference board */   	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */  -	ATH79_MACH_AP136,		/* Atheros AP136 reference board */ ++	ATH79_MACH_AP135_020,		/* Atheros AP135-020 reference board */  +	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */  +	ATH79_MACH_AP136_020,		/* Atheros AP136-020 reference board */   	ATH79_MACH_AP81,		/* Atheros AP81 reference board */   	ATH79_MACH_DB120,		/* Atheros DB120 reference board */   	ATH79_MACH_PB44,		/* Atheros PB44 reference board */ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -16,7 +16,7 @@ config ATH79_MACH_AP121 + 	  Atheros AP121 reference board. +  + config ATH79_MACH_AP136 +-	bool "Atheros AP136 reference board" ++	bool "Atheros AP136/AP135 reference board" + 	select SOC_QCA955X + 	select ATH79_DEV_GPIO_BUTTONS + 	select ATH79_DEV_LEDS_GPIO +@@ -25,7 +25,7 @@ config ATH79_MACH_AP136 + 	select ATH79_DEV_WMAC + 	help + 	  Say 'Y' here if you want your kernel to support the +-	  Atheros AP136 reference board. ++	  Atheros AP136 or AP135 reference boards. +  + config ATH79_MACH_AP81 + 	bool "Atheros AP81 reference board" diff --git a/target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch index 6eb4e5ab3..7e3005898 100644 --- a/target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch @@ -1,6 +1,6 @@  --- a/arch/mips/ath79/machtypes.h  +++ b/arch/mips/ath79/machtypes.h -@@ -16,21 +16,111 @@ +@@ -16,22 +16,112 @@   enum ath79_mach_type {   	ATH79_MACH_GENERIC = 0, @@ -12,6 +12,7 @@  +	ATH79_MACH_AP113,		/* Atheros AP113 reference board */   	ATH79_MACH_AP121,		/* Atheros AP121 reference board */   	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */ + 	ATH79_MACH_AP135_020,		/* Atheros AP135-020 reference board */   	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */   	ATH79_MACH_AP136_020,		/* Atheros AP136-020 reference board */   	ATH79_MACH_AP81,		/* Atheros AP81 reference board */ diff --git a/target/linux/ar71xx/patches-3.6/611-MIPS-ath79-ap135-support.patch b/target/linux/ar71xx/patches-3.6/611-MIPS-ath79-ap135-support.patch deleted file mode 100644 index a53eb5f7b..000000000 --- a/target/linux/ar71xx/patches-3.6/611-MIPS-ath79-ap135-support.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/arch/mips/ath79/Kconfig -+++ b/arch/mips/ath79/Kconfig -@@ -71,7 +71,7 @@ config ATH79_MACH_AP121 - 	  Atheros AP121 reference board. -  - config ATH79_MACH_AP136 --	bool "Atheros AP136 reference board" -+	bool "Atheros AP136/AP135 reference board" - 	select SOC_QCA955X - 	select ATH79_DEV_GPIO_BUTTONS - 	select ATH79_DEV_LEDS_GPIO -@@ -80,7 +80,7 @@ config ATH79_MACH_AP136 - 	select ATH79_DEV_WMAC - 	help - 	  Say 'Y' here if you want your kernel to support the --	  Atheros AP136 reference board. -+	  Atheros AP136 or AP135 reference boards. -  - config ATH79_MACH_AP81 - 	bool "Atheros AP81 reference board" ---- a/arch/mips/ath79/mach-ap136.c -+++ b/arch/mips/ath79/mach-ap136.c -@@ -237,3 +237,23 @@ static void __init ap136_020_setup(void) - MIPS_MACHINE(ATH79_MACH_AP136_020, "AP136-020", - 	     "Atheros AP136-020 reference board", - 	     ap136_020_setup); -+ -+/* -+ * AP135-020 is similar to AP136-020, any future AP135 specific init -+ * code can be added here. -+ */ -+static void __init ap135_020_setup(void) -+{ -+	ap136_leds_gpio[0].name = "ap135:green:status"; -+	ap136_leds_gpio[1].name = "ap135:red:status"; -+	ap136_leds_gpio[2].name = "ap135:green:wps"; -+	ap136_leds_gpio[3].name = "ap135:red:wps"; -+	ap136_leds_gpio[4].name = "ap135:red:wlan-2g"; -+	ap136_leds_gpio[5].name = "ap135:red:usb"; -+ -+	ap136_020_setup(); -+} -+ -+MIPS_MACHINE(ATH79_MACH_AP135_020, "AP135-020", -+	     "Atheros AP135-020 reference board", -+	     ap135_020_setup); ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -24,6 +24,7 @@ enum ath79_mach_type { - 	ATH79_MACH_AP113,		/* Atheros AP113 reference board */ - 	ATH79_MACH_AP121,		/* Atheros AP121 reference board */ - 	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */ -+	ATH79_MACH_AP135_020,		/* Atheros AP135-020 reference board */ - 	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */ - 	ATH79_MACH_AP136_020,		/* Atheros AP136-020 reference board */ - 	ATH79_MACH_AP81,		/* Atheros AP81 reference board */ diff --git a/target/linux/ar71xx/patches-3.7/609-MIPS-ath79-ap136-fixes.patch b/target/linux/ar71xx/patches-3.7/609-MIPS-ath79-ap136-fixes.patch index c8d610600..3f57443e2 100644 --- a/target/linux/ar71xx/patches-3.7/609-MIPS-ath79-ap136-fixes.patch +++ b/target/linux/ar71xx/patches-3.7/609-MIPS-ath79-ap136-fixes.patch @@ -56,7 +56,7 @@   static struct gpio_led ap136_leds_gpio[] __initdata = {   	{ -@@ -98,64 +104,136 @@ static struct gpio_keys_button ap136_gpi +@@ -98,64 +104,156 @@ static struct gpio_keys_button ap136_gpi   	},   }; @@ -224,22 +224,63 @@  +	ath79_eth1_pll_data.pll_1000 = 0x03000101;  +  +	ap136_common_setup(); ++} ++ ++MIPS_MACHINE(ATH79_MACH_AP136_020, "AP136-020", ++	     "Atheros AP136-020 reference board", ++	     ap136_020_setup); ++ ++/* ++ * AP135-020 is similar to AP136-020, any future AP135 specific init ++ * code can be added here. ++ */ ++static void __init ap135_020_setup(void) ++{ ++	ap136_leds_gpio[0].name = "ap135:green:status"; ++	ap136_leds_gpio[1].name = "ap135:red:status"; ++	ap136_leds_gpio[2].name = "ap135:green:wps"; ++	ap136_leds_gpio[3].name = "ap135:red:wps"; ++	ap136_leds_gpio[4].name = "ap135:red:wlan-2g"; ++	ap136_leds_gpio[5].name = "ap135:red:usb"; ++ ++	ap136_020_setup();   }  -MIPS_MACHINE(ATH79_MACH_AP136, "AP136", "Atheros AP136 reference board",  -	     ap136_setup); -+MIPS_MACHINE(ATH79_MACH_AP136_020, "AP136-020", -+	     "Atheros AP136-020 reference board", -+	     ap136_020_setup); ++MIPS_MACHINE(ATH79_MACH_AP135_020, "AP135-020", ++	     "Atheros AP135-020 reference board", ++	     ap135_020_setup);  --- a/arch/mips/ath79/machtypes.h  +++ b/arch/mips/ath79/machtypes.h -@@ -18,7 +18,8 @@ enum ath79_mach_type { +@@ -18,7 +18,9 @@ enum ath79_mach_type {   	ATH79_MACH_GENERIC = 0,   	ATH79_MACH_AP121,		/* Atheros AP121 reference board */   	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */  -	ATH79_MACH_AP136,		/* Atheros AP136 reference board */ ++	ATH79_MACH_AP135_020,		/* Atheros AP135-020 reference board */  +	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */  +	ATH79_MACH_AP136_020,		/* Atheros AP136-020 reference board */   	ATH79_MACH_AP81,		/* Atheros AP81 reference board */   	ATH79_MACH_DB120,		/* Atheros DB120 reference board */   	ATH79_MACH_PB44,		/* Atheros PB44 reference board */ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -16,7 +16,7 @@ config ATH79_MACH_AP121 + 	  Atheros AP121 reference board. +  + config ATH79_MACH_AP136 +-	bool "Atheros AP136 reference board" ++	bool "Atheros AP136/AP135 reference board" + 	select SOC_QCA955X + 	select ATH79_DEV_GPIO_BUTTONS + 	select ATH79_DEV_LEDS_GPIO +@@ -25,7 +25,7 @@ config ATH79_MACH_AP136 + 	select ATH79_DEV_WMAC + 	help + 	  Say 'Y' here if you want your kernel to support the +-	  Atheros AP136 reference board. ++	  Atheros AP136 or AP135 reference boards. +  + config ATH79_MACH_AP81 + 	bool "Atheros AP81 reference board" diff --git a/target/linux/ar71xx/patches-3.7/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.7/610-MIPS-ath79-openwrt-machines.patch index 6eb4e5ab3..7e3005898 100644 --- a/target/linux/ar71xx/patches-3.7/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.7/610-MIPS-ath79-openwrt-machines.patch @@ -1,6 +1,6 @@  --- a/arch/mips/ath79/machtypes.h  +++ b/arch/mips/ath79/machtypes.h -@@ -16,21 +16,111 @@ +@@ -16,22 +16,112 @@   enum ath79_mach_type {   	ATH79_MACH_GENERIC = 0, @@ -12,6 +12,7 @@  +	ATH79_MACH_AP113,		/* Atheros AP113 reference board */   	ATH79_MACH_AP121,		/* Atheros AP121 reference board */   	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */ + 	ATH79_MACH_AP135_020,		/* Atheros AP135-020 reference board */   	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */   	ATH79_MACH_AP136_020,		/* Atheros AP136-020 reference board */   	ATH79_MACH_AP81,		/* Atheros AP81 reference board */ diff --git a/target/linux/ar71xx/patches-3.7/611-MIPS-ath79-ap135-support.patch b/target/linux/ar71xx/patches-3.7/611-MIPS-ath79-ap135-support.patch deleted file mode 100644 index a53eb5f7b..000000000 --- a/target/linux/ar71xx/patches-3.7/611-MIPS-ath79-ap135-support.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/arch/mips/ath79/Kconfig -+++ b/arch/mips/ath79/Kconfig -@@ -71,7 +71,7 @@ config ATH79_MACH_AP121 - 	  Atheros AP121 reference board. -  - config ATH79_MACH_AP136 --	bool "Atheros AP136 reference board" -+	bool "Atheros AP136/AP135 reference board" - 	select SOC_QCA955X - 	select ATH79_DEV_GPIO_BUTTONS - 	select ATH79_DEV_LEDS_GPIO -@@ -80,7 +80,7 @@ config ATH79_MACH_AP136 - 	select ATH79_DEV_WMAC - 	help - 	  Say 'Y' here if you want your kernel to support the --	  Atheros AP136 reference board. -+	  Atheros AP136 or AP135 reference boards. -  - config ATH79_MACH_AP81 - 	bool "Atheros AP81 reference board" ---- a/arch/mips/ath79/mach-ap136.c -+++ b/arch/mips/ath79/mach-ap136.c -@@ -237,3 +237,23 @@ static void __init ap136_020_setup(void) - MIPS_MACHINE(ATH79_MACH_AP136_020, "AP136-020", - 	     "Atheros AP136-020 reference board", - 	     ap136_020_setup); -+ -+/* -+ * AP135-020 is similar to AP136-020, any future AP135 specific init -+ * code can be added here. -+ */ -+static void __init ap135_020_setup(void) -+{ -+	ap136_leds_gpio[0].name = "ap135:green:status"; -+	ap136_leds_gpio[1].name = "ap135:red:status"; -+	ap136_leds_gpio[2].name = "ap135:green:wps"; -+	ap136_leds_gpio[3].name = "ap135:red:wps"; -+	ap136_leds_gpio[4].name = "ap135:red:wlan-2g"; -+	ap136_leds_gpio[5].name = "ap135:red:usb"; -+ -+	ap136_020_setup(); -+} -+ -+MIPS_MACHINE(ATH79_MACH_AP135_020, "AP135-020", -+	     "Atheros AP135-020 reference board", -+	     ap135_020_setup); ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -24,6 +24,7 @@ enum ath79_mach_type { - 	ATH79_MACH_AP113,		/* Atheros AP113 reference board */ - 	ATH79_MACH_AP121,		/* Atheros AP121 reference board */ - 	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */ -+	ATH79_MACH_AP135_020,		/* Atheros AP135-020 reference board */ - 	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */ - 	ATH79_MACH_AP136_020,		/* Atheros AP136-020 reference board */ - 	ATH79_MACH_AP81,		/* Atheros AP81 reference board */ | 
