ar71xx: add support for YunCore CPE830

CPE830 is a clone of AP90Q, with different type of antenna (panel)
and additional 4 LEDs for WiFi signal level indication.

Use the same flash approach as for YunCore AP90Q.

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index 2cf72d61d3891c7de7636d3c19c0d0ca4b590ed7..383695ca87a80060d1e4a98655ecc47fd579e67a 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -58,6 +58,7 @@ ap147-010)
        ucidef_set_led_wlan "wlan2g" "WLAN 2.4 GHz" "ap147:green:wlan-2g" "phy0tpt"
        ;;
 ap90q|\
+cpe830|\
 cpe870|\
 dr531)
        ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth0"
@@ -67,6 +68,7 @@ dr531)
        ap90q)
                ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
                ;;
+       cpe830|\
        cpe870)
                ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
                ucidef_set_rssimon "wlan0" "200000" "1"

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index e619749609f40c37f1d48995e0d06621f5703d95..b18a096b59f1ae50f7d54096ba4c9f2d8ca8651a 100644 (file)
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -48,6 +48,7 @@ get_status_led() {
                status_led="$board:green:power"
                ;;
        ap90q|\
+       cpe830|\
        cpe870|\
        gl-inet)
                status_led="$board:green:lan"

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 0d4c1e0a4968fbdc46888a3e5340dd649e37c480..37af9d44d4ecaefc8e269ba4602e132afb1ba91e 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -526,6 +526,9 @@ ar71xx_board_detect() {
                name="cpe510"
                tplink_pharos_board_detect
                ;;
+       *CPE830)
+               name="cpe830"
+               ;;
        *CPE870)
                name="cpe870"
                ;;

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 66f630884fd2bbc8c74734fb8ffc6360d41568a2..887a0f0c1ea6d545a0426fbf85ac84f026d865c0 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -188,6 +188,7 @@ platform_check_image() {
        cf-e380ac-v2|\
        cf-e520n|\
        cf-e530n|\
+       cpe830|\
        cpe870|\
        dgl-5500-a1|\
        dhp-1565-a1|\

diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index 794e7f809c59db7e636843a264ceed278f93d628..c6a757a7eb7209693c8333846a8354e5b57d6fb9 100644 (file)
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -69,6 +69,7 @@ CONFIG_ATH79_MACH_CF_E380AC_V2=y
 CONFIG_ATH79_MACH_CF_E520N=y
 CONFIG_ATH79_MACH_CF_E530N=y
 CONFIG_ATH79_MACH_CPE510=y
+CONFIG_ATH79_MACH_CPE830=y
 CONFIG_ATH79_MACH_CPE870=y
 CONFIG_ATH79_MACH_CR3000=y
 CONFIG_ATH79_MACH_CR5000=y

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 6daa093a012a120d2f404c1a0cb52633ed0a09ab..001edbeb17390dbd507055262c74430d0b92516c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -1211,6 +1211,15 @@ config ATH79_MACH_CPE510
        select ATH79_DEV_M25P80
        select ATH79_DEV_WMAC
 
+config ATH79_MACH_CPE830
+       bool "YunCore CPE830 support"
+       select SOC_QCA953X
+       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_CPE870
        bool "YunCore CPE870 support"
        select SOC_AR934X

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
index b718d6bfd3c482a6f3eebb4ed7050bae6fb2c14e..ac2dbbb23fe53a9292b11176bf78a77f6f3893e0 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
@@ -75,6 +75,7 @@ obj-$(CONFIG_ATH79_MACH_CF_E380AC_V2)         += mach-cf-e316n-v2.o
 obj-$(CONFIG_ATH79_MACH_CF_E520N)              += mach-cf-e316n-v2.o
 obj-$(CONFIG_ATH79_MACH_CF_E530N)              += mach-cf-e316n-v2.o
 obj-$(CONFIG_ATH79_MACH_CPE510)                        += mach-cpe510.o
+obj-$(CONFIG_ATH79_MACH_CPE830)                        += mach-ap90q.o
 obj-$(CONFIG_ATH79_MACH_CPE870)                        += mach-cpe870.o
 obj-$(CONFIG_ATH79_MACH_CR3000)                        += mach-cr3000.o
 obj-$(CONFIG_ATH79_MACH_CR5000)                        += mach-cr5000.o

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ap90q.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ap90q.c
index 35e578122ef161c4a05d3daed40ea8abfe30c491..2e9d34d658f210fce938b9ffa8b45fec66e4e243 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ap90q.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ap90q.c
@@ -1,5 +1,7 @@
 /*
- * YunCore AP90Q board support
+ * Support for YunCore boards:
+ * - AP90Q
+ * - CPE830
  *
  * Copyright (C) 2016 Piotr Dymacz <pepe2k@gmail.com>
  *
@@ -23,6 +25,7 @@
 #include "dev-wmac.h"
 #include "machtypes.h"
 
+/* AP90Q */
 #define AP90Q_GPIO_LED_WAN     4
 #define AP90Q_GPIO_LED_WLAN    12
 #define AP90Q_GPIO_LED_LAN     16
@@ -61,40 +64,62 @@ static struct gpio_keys_button ap90q_gpio_keys[] __initdata = {
        },
 };
 
-static void __init ap90q_gpio_setup(void)
-{
-       /* For LED on GPIO4 */
-       ath79_gpio_function_disable(AR934X_GPIO_FUNC_CLK_OBS4_EN);
-
-       ath79_gpio_direction_select(AP90Q_GPIO_LED_LAN, true);
-       ath79_gpio_direction_select(AP90Q_GPIO_LED_WAN, true);
-       ath79_gpio_direction_select(AP90Q_GPIO_LED_WLAN, true);
-
-       /* Mute LEDs on boot */
-       gpio_set_value(AP90Q_GPIO_LED_LAN, 1);
-       gpio_set_value(AP90Q_GPIO_LED_WAN, 1);
-
-       ath79_gpio_output_select(AP90Q_GPIO_LED_LAN, 0);
-       ath79_gpio_output_select(AP90Q_GPIO_LED_WAN, 0);
-       ath79_gpio_output_select(AP90Q_GPIO_LED_WLAN, 0);
+/* CPE830 */
+#define CPE830_GPIO_LED_LINK4  0
+#define CPE830_GPIO_LED_LINK1  1
+#define CPE830_GPIO_LED_LINK2  2
+#define CPE830_GPIO_LED_LINK3  3
+#define CPE830_GPIO_LED_WAN    4
+#define CPE830_GPIO_LED_WLAN   12
+#define CPE830_GPIO_LED_LAN    16
 
-       ath79_register_leds_gpio(-1, ARRAY_SIZE(ap90q_leds_gpio),
-                                ap90q_leds_gpio);
+#define CPE830_GPIO_BTN_RESET  17
 
-       ath79_register_gpio_keys_polled(-1, AP90Q_KEYS_POLL_INTERVAL,
-                                       ARRAY_SIZE(ap90q_gpio_keys),
-                                       ap90q_gpio_keys);
-}
+static struct gpio_led cpe830_leds_gpio[] __initdata = {
+       {
+               .name           = "cpe830:green:lan",
+               .gpio           = CPE830_GPIO_LED_LAN,
+               .active_low     = 1,
+       },
+       {
+               .name           = "cpe830:green:wan",
+               .gpio           = CPE830_GPIO_LED_WAN,
+               .active_low     = 1,
+       },
+       {
+               .name           = "cpe830:green:wlan",
+               .gpio           = CPE830_GPIO_LED_WLAN,
+               .active_low     = 1,
+       },
+       {
+               .name           = "cpe830:green:link1",
+               .gpio           = CPE830_GPIO_LED_LINK1,
+               .active_low     = 1,
+       },
+       {
+               .name           = "cpe830:green:link2",
+               .gpio           = CPE830_GPIO_LED_LINK2,
+               .active_low     = 1,
+       },
+       {
+               .name           = "cpe830:green:link3",
+               .gpio           = CPE830_GPIO_LED_LINK3,
+               .active_low     = 1,
+       },
+       {
+               .name           = "cpe830:green:link4",
+               .gpio           = CPE830_GPIO_LED_LINK4,
+               .active_low     = 1,
+       },
+};
 
-static void __init ap90q_setup(void)
+static void __init ap90q_cpe830_common_setup(void)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1fff1000);
        u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
 
        ath79_register_m25p80(NULL);
 
-       ap90q_gpio_setup();
-
        ath79_setup_ar933x_phy4_switch(false, false);
 
        ath79_register_mdio(0, 0x0);
@@ -118,6 +143,59 @@ static void __init ap90q_setup(void)
        ath79_register_eth(0);
 
        ath79_register_wmac(art, NULL);
+
+       /* For LED on GPIO4 */
+       ath79_gpio_function_disable(AR934X_GPIO_FUNC_CLK_OBS4_EN);
+
+       ath79_gpio_direction_select(AP90Q_GPIO_LED_LAN, true);
+       ath79_gpio_direction_select(AP90Q_GPIO_LED_WAN, true);
+       ath79_gpio_direction_select(AP90Q_GPIO_LED_WLAN, true);
+
+       /* Mute LEDs on boot */
+       gpio_set_value(AP90Q_GPIO_LED_LAN, 1);
+       gpio_set_value(AP90Q_GPIO_LED_WAN, 1);
+
+       ath79_gpio_output_select(AP90Q_GPIO_LED_LAN, 0);
+       ath79_gpio_output_select(AP90Q_GPIO_LED_WAN, 0);
+       ath79_gpio_output_select(AP90Q_GPIO_LED_WLAN, 0);
+
+       ath79_register_gpio_keys_polled(-1, AP90Q_KEYS_POLL_INTERVAL,
+                                       ARRAY_SIZE(ap90q_gpio_keys),
+                                       ap90q_gpio_keys);
+}
+
+static void __init ap90q_setup(void)
+{
+       ap90q_cpe830_common_setup();
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(ap90q_leds_gpio),
+                                ap90q_leds_gpio);
 }
 
 MIPS_MACHINE(ATH79_MACH_AP90Q, "AP90Q", "YunCore AP90Q", ap90q_setup);
+
+static void __init cpe830_setup(void)
+{
+       ap90q_cpe830_common_setup();
+
+       ath79_gpio_direction_select(CPE830_GPIO_LED_LINK1, true);
+       ath79_gpio_direction_select(CPE830_GPIO_LED_LINK2, true);
+       ath79_gpio_direction_select(CPE830_GPIO_LED_LINK3, true);
+       ath79_gpio_direction_select(CPE830_GPIO_LED_LINK4, true);
+
+       /* Mute LEDs on boot */
+       gpio_set_value(CPE830_GPIO_LED_LINK1, 1);
+       gpio_set_value(CPE830_GPIO_LED_LINK2, 1);
+       gpio_set_value(CPE830_GPIO_LED_LINK3, 1);
+       gpio_set_value(CPE830_GPIO_LED_LINK4, 1);
+
+       ath79_gpio_output_select(CPE830_GPIO_LED_LINK1, 0);
+       ath79_gpio_output_select(CPE830_GPIO_LED_LINK2, 0);
+       ath79_gpio_output_select(CPE830_GPIO_LED_LINK3, 0);
+       ath79_gpio_output_select(CPE830_GPIO_LED_LINK4, 0);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(cpe830_leds_gpio),
+                                cpe830_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_CPE830, "CPE830", "YunCore CPE830", cpe830_setup);

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
index 50ecff46f5f8aa5fc7973780819537b66763ee81..9a8da22f65e51b2f740081b3e5131a4fe65e5ec5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
@@ -61,6 +61,7 @@ enum ath79_mach_type {
        ATH79_MACH_CF_E530N,                    /* COMFAST CF-E530N */
        ATH79_MACH_CPE210,                      /* TP-LINK CPE210 */
        ATH79_MACH_CPE510,                      /* TP-LINK CPE510 */
+       ATH79_MACH_CPE830,                      /* YunCore CPE830 */
        ATH79_MACH_CPE870,                      /* YunCore CPE870 */
        ATH79_MACH_CR3000,                      /* PowerCloud CR3000 */
        ATH79_MACH_CR5000,                      /* PowerCloud CR5000 */

diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 0b8a216a25bb1beb17a18bb09d1bdb9d1d8ba37d..331509a15abcd648cf7f9dc977c30c7f6d44eed4 100644 (file)
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -80,6 +80,14 @@ define Device/cf-e530n
 endef
 TARGET_DEVICES += cf-e530n
 
+define Device/cpe830
+  $(Device/ap90q)
+  DEVICE_TITLE := YunCore CPE830
+  DEVICE_PACKAGES := rssileds
+  BOARDNAME = CPE830
+endef
+TARGET_DEVICES += cpe830
+
 define Device/cpe870
   DEVICE_TITLE := YunCore CPE870
   DEVICE_PACKAGES := rssileds