@@ -143,6 +143,11 @@ carambola2)
ucidef_set_led_netdev "wan" "WAN" "$board:orange:eth1" "eth1"
ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
;;
+cf-e314n-v2)
+ ucidef_set_led_netdev "wan" "WAN" "$board:white:wan" "eth0"
+ ucidef_set_led_netdev "lan" "lAN" "$board:white:lan" "eth1"
+ ucidef_set_led_wlan "wlan" "WLAN" "$board:white:wlan" "phy0tpt"
+ ;;
cf-e316n-v2)
ucidef_set_led_netdev "lan" "LAN" "$board:blue:lan" "eth0"
ucidef_set_led_netdev "wan" "WAN" "$board:blue:wan" "eth1"
@@ -101,6 +101,7 @@ get_status_led() {
cap4200ag)
status_led="senao:green:pwr"
;;
+ cf-e314n-v2|\
cf-e316n-v2|\
cf-e520n|\
cf-e530n)
@@ -487,6 +487,9 @@ ar71xx_board_detect() {
*CAP4200AG)
name="cap4200ag"
;;
+ *"CF-E314N v2")
+ name="cf-e314n-v2"
+ ;;
*"CF-E316N v2")
name="cf-e316n-v2"
;;
@@ -209,6 +209,7 @@ platform_check_image() {
bullet-m|\
c-55|\
carambola2|\
+ cf-e314n-v2|\
cf-e316n-v2|\
cf-e320n-v2|\
cf-e380ac-v1|\
@@ -62,6 +62,7 @@ CONFIG_ATH79_MACH_C60=y
CONFIG_ATH79_MACH_CAP324=y
CONFIG_ATH79_MACH_CAP4200AG=y
CONFIG_ATH79_MACH_CARAMBOLA2=y
+CONFIG_ATH79_MACH_CF_E314N_V2=y
CONFIG_ATH79_MACH_CF_E316N_V2=y
CONFIG_ATH79_MACH_CF_E320N_V2=y
CONFIG_ATH79_MACH_CF_E380AC_V1=y
@@ -1765,6 +1765,16 @@ config ATH79_MACH_CARAMBOLA2
select ATH79_DEV_USB
select ATH79_DEV_WMAC
+config ATH79_MACH_CF_E314N_V2
+ bool "COMFAST CF-E314N v2 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_USB
+ select ATH79_DEV_WMAC
+
config ATH79_MACH_CF_E316N_V2
bool "COMFAST CF-E316N v2 support"
select SOC_AR934X
@@ -67,6 +67,7 @@ obj-$(CONFIG_ATH79_MACH_C60) += mach-c60.o
obj-$(CONFIG_ATH79_MACH_CAP324) += mach-cap324.o
obj-$(CONFIG_ATH79_MACH_CAP4200AG) += mach-cap4200ag.o
obj-$(CONFIG_ATH79_MACH_CARAMBOLA2) += mach-carambola2.o
+obj-$(CONFIG_ATH79_MACH_CF_E314N_V2) += mach-cf-e316n-v2.o
obj-$(CONFIG_ATH79_MACH_CF_E316N_V2) += mach-cf-e316n-v2.o
obj-$(CONFIG_ATH79_MACH_CF_E320N_V2) += mach-cf-e316n-v2.o
obj-$(CONFIG_ATH79_MACH_CF_E380AC_V1) += mach-cf-e316n-v2.o
@@ -1,5 +1,6 @@
/*
* Support for COMFAST boards:
+ * - CF-E314N v2 (QCA9531)
* - CF-E316N v2 (AR9341)
* - CF-E320N v2 (QCA9531)
* - CF-E380AC v1/v2 (QCA9558)
@@ -35,6 +36,63 @@
#define CF_EXXXN_KEYS_POLL_INTERVAL 20
#define CF_EXXXN_KEYS_DEBOUNCE_INTERVAL (3 * CF_EXXXN_KEYS_POLL_INTERVAL)
+/* CF-E314N */
+#define CF_E314N_V2_GPIO_LED_WLAN 0
+#define CF_E314N_V2_GPIO_LED_WAN 2
+#define CF_E314N_V2_GPIO_LED_LAN 3
+
+#define CF_E314N_V2_GPIO_LED_SIGNAL1 11
+#define CF_E314N_V2_GPIO_LED_SIGNAL2 12
+#define CF_E314N_V2_GPIO_LED_SIGNAL3 14
+#define CF_E314N_V2_GPIO_LED_SIGNAL4 16
+
+#define CF_E314N_V2_GPIO_EXT_WDT 13
+
+#define CF_E314N_V2_GPIO_BTN_RESET 17
+
+static struct gpio_led cf_e314n_v2_leds_gpio[] __initdata = {
+ {
+ .name = "cf-e314n-v2:white:lan",
+ .gpio = CF_E314N_V2_GPIO_LED_LAN,
+ .active_low = 1,
+ }, {
+ .name = "cf-e314n-v2:white:wan",
+ .gpio = CF_E314N_V2_GPIO_LED_WAN,
+ .active_low = 1,
+ }, {
+ .name = "cf-e314n-v2:white:wlan",
+ .gpio = CF_E314N_V2_GPIO_LED_WLAN,
+ .active_low = 1,
+ }, {
+ .name = "cf-e314n-v2:white:signal1",
+ .gpio = CF_E314N_V2_GPIO_LED_SIGNAL1,
+ .active_low = 1,
+ }, {
+ .name = "cf-e314n-v2:white:signal2",
+ .gpio = CF_E314N_V2_GPIO_LED_SIGNAL2,
+ .active_low = 1,
+ }, {
+ .name = "cf-e314n-v2:white:signal3",
+ .gpio = CF_E314N_V2_GPIO_LED_SIGNAL3,
+ .active_low = 1,
+ }, {
+ .name = "cf-e314n-v2:white:signal4",
+ .gpio = CF_E314N_V2_GPIO_LED_SIGNAL4,
+ .active_low = 1,
+ },
+};
+
+static struct gpio_keys_button cf_e314n_v2_gpio_keys[] __initdata = {
+ {
+ .desc = "Reset button",
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .debounce_interval = CF_EXXXN_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = CF_E314N_V2_GPIO_BTN_RESET,
+ .active_low = 1,
+ },
+};
+
/* CF-E316N v2 */
#define CF_E316N_V2_GPIO_LED_DIAG_B 0
#define CF_E316N_V2_GPIO_LED_DIAG_R 2
@@ -253,6 +311,69 @@ static void __init cf_exxxn_common_setup(unsigned long art_ofs, int gpio_wdt)
ath79_register_usb();
}
+static void __init cf_exxxn_qca953x_eth_setup(void)
+{
+ u8 *mac = (u8 *) KSEG1ADDR(0x1f010000);
+
+ ath79_setup_ar933x_phy4_switch(false, false);
+
+ ath79_register_mdio(0, 0x0);
+
+ ath79_switch_data.phy4_mii_en = 1;
+ ath79_switch_data.phy_poll_mask |= BIT(4);
+
+ /* LAN */
+ ath79_eth1_data.duplex = DUPLEX_FULL;
+ ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+ ath79_eth1_data.speed = SPEED_1000;
+ ath79_init_mac(ath79_eth1_data.mac_addr, mac, 2);
+ ath79_register_eth(1);
+
+ /* WAN */
+ ath79_eth0_data.duplex = DUPLEX_FULL;
+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+ ath79_eth0_data.speed = SPEED_100;
+ ath79_eth0_data.phy_mask = BIT(4);
+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+ ath79_register_eth(0);
+}
+
+static void __init cf_e314n_v2_setup(void)
+{
+ cf_exxxn_common_setup(0x10000, CF_E314N_V2_GPIO_EXT_WDT);
+
+ cf_exxxn_qca953x_eth_setup();
+
+ /* Disable JTAG (enables GPIO0-3) */
+ ath79_gpio_function_enable(AR934X_GPIO_FUNC_JTAG_DISABLE);
+
+ ath79_gpio_direction_select(CF_E314N_V2_GPIO_LED_LAN, true);
+ ath79_gpio_direction_select(CF_E314N_V2_GPIO_LED_WAN, true);
+ ath79_gpio_direction_select(CF_E314N_V2_GPIO_LED_WLAN, true);
+ ath79_gpio_direction_select(CF_E314N_V2_GPIO_LED_SIGNAL1, true);
+ ath79_gpio_direction_select(CF_E314N_V2_GPIO_LED_SIGNAL2, true);
+ ath79_gpio_direction_select(CF_E314N_V2_GPIO_LED_SIGNAL3, true);
+ ath79_gpio_direction_select(CF_E314N_V2_GPIO_LED_SIGNAL4, true);
+
+ ath79_gpio_output_select(CF_E314N_V2_GPIO_LED_LAN, 0);
+ ath79_gpio_output_select(CF_E314N_V2_GPIO_LED_WAN, 0);
+ ath79_gpio_output_select(CF_E314N_V2_GPIO_LED_WLAN, 0);
+ ath79_gpio_output_select(CF_E314N_V2_GPIO_LED_SIGNAL1, 0);
+ ath79_gpio_output_select(CF_E314N_V2_GPIO_LED_SIGNAL2, 0);
+ ath79_gpio_output_select(CF_E314N_V2_GPIO_LED_SIGNAL3, 0);
+ ath79_gpio_output_select(CF_E314N_V2_GPIO_LED_SIGNAL4, 0);
+
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(cf_e314n_v2_leds_gpio),
+ cf_e314n_v2_leds_gpio);
+
+ ath79_register_gpio_keys_polled(-1, CF_EXXXN_KEYS_POLL_INTERVAL,
+ ARRAY_SIZE(cf_e314n_v2_gpio_keys),
+ cf_e314n_v2_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_CF_E314N_V2, "CF-E314N-V2", "COMFAST CF-E314N v2",
+ cf_e314n_v2_setup);
+
static void __init cf_e316n_v2_setup(void)
{
u8 *mac = (u8 *) KSEG1ADDR(0x1f010000);
@@ -294,33 +415,6 @@ static void __init cf_e316n_v2_setup(void)
MIPS_MACHINE(ATH79_MACH_CF_E316N_V2, "CF-E316N-V2", "COMFAST CF-E316N v2",
cf_e316n_v2_setup);
-static void __init cf_exxxn_qca953x_eth_setup(void)
-{
- u8 *mac = (u8 *) KSEG1ADDR(0x1f010000);
-
- ath79_setup_ar933x_phy4_switch(false, false);
-
- ath79_register_mdio(0, 0x0);
-
- ath79_switch_data.phy4_mii_en = 1;
- ath79_switch_data.phy_poll_mask |= BIT(4);
-
- /* LAN */
- ath79_eth1_data.duplex = DUPLEX_FULL;
- ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
- ath79_eth1_data.speed = SPEED_1000;
- ath79_init_mac(ath79_eth1_data.mac_addr, mac, 2);
- ath79_register_eth(1);
-
- /* WAN */
- ath79_eth0_data.duplex = DUPLEX_FULL;
- ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
- ath79_eth0_data.speed = SPEED_100;
- ath79_eth0_data.phy_mask = BIT(4);
- ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
- ath79_register_eth(0);
-}
-
static void __init cf_e320n_v2_setup(void)
{
cf_exxxn_common_setup(0x10000, CF_E320N_V2_GPIO_EXT_WDT);
@@ -53,6 +53,7 @@ enum ath79_mach_type {
ATH79_MACH_CAP324, /* PowerCloud CAP324 */
ATH79_MACH_CAP4200AG, /* Senao CAP4200AG */
ATH79_MACH_CARAMBOLA2, /* 8devices Carambola2 */
+ ATH79_MACH_CF_E314N_V2, /* COMFAST CF-E314N v2 */
ATH79_MACH_CF_E316N_V2, /* COMFAST CF-E316N v2 */
ATH79_MACH_CF_E320N_V2, /* COMFAST CF-E320N v2 */
ATH79_MACH_CF_E380AC_V1, /* COMFAST CF-E380AC v1 */
@@ -40,6 +40,15 @@ define Device/carambola2
endef
TARGET_DEVICES += carambola2
+define Device/cf-e314n-v2
+ DEVICE_TITLE := COMFAST CF-E314N v2
+ BOARDNAME = CF-E314N-V2
+ IMAGE_SIZE = 16192k
+ CONSOLE = ttyS0,115200
+ MTDPARTS = spi0.0:64k(u-boot)ro,64k(art)ro,16192k(firmware),64k(art-backup)ro
+endef
+TARGET_DEVICES += cf-e314n-v2
+
define Device/cf-e316n-v2
DEVICE_TITLE := COMFAST CF-E316N v2
BOARDNAME = CF-E316N-V2