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 e101d55..1c506d0 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -182,6 +182,11 @@ carambola2)
      ucidef_set_led_netdev "wan" "WAN" "$board:orange:eth1" "eth1"
      ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
      ;;
+cf-e312a)
+    ucidef_set_led_netdev "lan" "LAN" "$board:white:lan" "eth0"
+    ucidef_set_led_netdev "wan" "WAN" "$board:white:wan" "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"
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index 5ef620b..6274841 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -118,6 +118,7 @@ get_status_led() {
      cap4200ag)
          status_led="senao:green:pwr"
          ;;
+    cf-e312a|\
      cf-e316n-v2|\
      cf-e520n|\
      cf-e530n)
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 9903563..98ed277 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -504,6 +504,9 @@ ar71xx_board_detect() {
      *"Carambola2"*)
          name="carambola2"
          ;;
+    *"CF-E312A")
+        name="cf-e312a"
+        ;;
      *"CF-E316N v2")
          name="cf-e316n-v2"
          ;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 18e5e41..1b13230 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -215,6 +215,7 @@ platform_check_image() {
      bullet-m|\
      c-55|\
      carambola2|\
+    cf-e312a|\
      cf-e316n-v2|\
      cf-e320n-v2|\
      cf-e355ac|\
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index 4793bf4..e86837f 100644
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -67,6 +67,7 @@ CONFIG_ATH79_MACH_C55=y
  CONFIG_ATH79_MACH_CAP324=y
  CONFIG_ATH79_MACH_CAP4200AG=y
  CONFIG_ATH79_MACH_CARAMBOLA2=y
+CONFIG_ATH79_MACH_CF_E312A=y
  CONFIG_ATH79_MACH_CF_E316N_V2=y
  CONFIG_ATH79_MACH_CF_E320N_V2=y
  CONFIG_ATH79_MACH_CF_E355AC=y
diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9
index 84b2a0b..231e78e 100644
--- a/target/linux/ar71xx/config-4.9
+++ b/target/linux/ar71xx/config-4.9
@@ -65,6 +65,7 @@ CONFIG_ATH79_MACH_C55=y
  CONFIG_ATH79_MACH_CAP324=y
  CONFIG_ATH79_MACH_CAP4200AG=y
  CONFIG_ATH79_MACH_CARAMBOLA2=y
+CONFIG_ATH79_MACH_CF_E312A=y
  CONFIG_ATH79_MACH_CF_E316N_V2=y
  CONFIG_ATH79_MACH_CF_E320N_V2=y
  CONFIG_ATH79_MACH_CF_E355AC=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt 
b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 5cb4f7e..e0484f2 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -2021,6 +2021,16 @@ config ATH79_MACH_RAMBUTAN
      select ATH79_DEV_USB
      select ATH79_DEV_WMAC

+config ATH79_MACH_CF_E312A
+    bool "COMFAST CF-E312A support"
+    select SOC_AR934X
+    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
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile 
b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
index 7d12282..3cf8e69 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
@@ -74,6 +74,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_E312A)        += 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_E355AC)        += mach-cf-e316n-v2.o
diff --git 
a/target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c 
b/target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c
index 82fe83f..554f2b0 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c
@@ -1,5 +1,6 @@
  /*
   *  Support for COMFAST boards:
+ *  - CF-E312A (AR9341)
   *  - CF-E316N v2 (AR9341)
   *  - CF-E320N v2 (QCA9531)
   *  - CF-E355AC (QCA9531)
@@ -36,6 +37,80 @@
  #define CF_EXXXN_KEYS_POLL_INTERVAL    20
  #define CF_EXXXN_KEYS_DEBOUNCE_INTERVAL    (3 * 
CF_EXXXN_KEYS_POLL_INTERVAL)

+/* CF-E312A */
+#define CF_E312A_GPIO_LED_LAN           2
+#define CF_E312A_GPIO_LED_WAN           3
+#define CF_E312A_GPIO_LED_WLAN          0
+#define CF_E312A_GPIO_LED_SIGNAL1       14
+#define CF_E312A_GPIO_LED_SIGNAL2       15
+#define CF_E312A_GPIO_LED_SIGNAL3       16
+#define CF_E312A_GPIO_LED_SIGNAL4       17
+#define CF_E312A_GPIO_BTN_SUITE         11
+#define CF_E312A_GPIO_BTN_RESET         22
+#define CF_E312A_GPIO_SDA               1
+#define CF_E312A_GPIO_SCL               12
+
+#define CF_E312A_GPIO_XWDT_TRIGGER      19
+
+static struct gpio_led cf_e312a_leds_gpio[] __initdata = {
+    {
+        .name        = "cf-e312a:white:lan",
+        .gpio        = CF_E312A_GPIO_LED_LAN,
+        .active_low    = 0,
+    }, {
+        .name        = "cf-e312a:white:wan",
+        .gpio        = CF_E312A_GPIO_LED_WAN,
+        .active_low    = 0,
+    }, {
+        .name        = "cf-e312a:white:wlan",
+        .gpio        = CF_E312A_GPIO_LED_WLAN,
+        .active_low    = 1,
+    }, {
+        .name        = "cf-e312a:white:signal1",
+        .gpio        = CF_E312A_GPIO_LED_SIGNAL1,
+        .active_low    = 1,
+    }, {
+        .name        = "cf-e312a:white:signal2",
+        .gpio        = CF_E312A_GPIO_LED_SIGNAL2,
+        .active_low    = 1,
+    }, {
+        .name        = "cf-e312a:white:signal3",
+        .gpio        = CF_E312A_GPIO_LED_SIGNAL3,
+        .active_low    = 1,
+    }, {
+        .name        = "cf-e312a:white:signal4",
+        .gpio        = CF_E312A_GPIO_LED_SIGNAL4,
+        .active_low    = 1,
+
+    }, {
+        .name        = "cf-e312a:sda",
+        .gpio        = CF_E312A_GPIO_SDA,
+        .active_low    = 0,
+    }, {
+        .name        = "cf-e312a:scl",
+        .gpio        = CF_E312A_GPIO_SCL,
+        .active_low    = 0,
+    },
+};
+
+static struct gpio_keys_button cf_e312a_gpio_keys[] __initdata = {
+    {
+        .desc        = "reset",
+        .type        = EV_KEY,
+        .code        = KEY_RESTART,
+        .debounce_interval = CF_EXXXN_KEYS_DEBOUNCE_INTERVAL,
+        .gpio        = CF_E312A_GPIO_BTN_RESET,
+        .active_low    = 0,
+    }, {
+        .desc        = "suite button",
+        .type        = EV_KEY,
+        .code        = KEY_POWER,
+        .debounce_interval = CF_EXXXN_KEYS_DEBOUNCE_INTERVAL,
+        .gpio        = CF_E312A_GPIO_BTN_SUITE,
+        .active_low    = 1,
+    },
+};
+
  /* CF-E316N v2 */
  #define CF_E316N_V2_GPIO_LED_DIAG_B    0
  #define CF_E316N_V2_GPIO_LED_DIAG_R    2
@@ -290,6 +365,41 @@ static void __init cf_exxxn_common_setup(unsigned 
long art_ofs, int gpio_wdt)
      ath79_register_usb();
  }

+static void __init cf_e312a_setup(void)
+{
+    u8 *mac = (u8 *) KSEG1ADDR(0x1f010000);
+
+    cf_exxxn_common_setup(0x10000, CF_E312A_GPIO_XWDT_TRIGGER);
+
+    ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
+
+    ath79_register_mdio(1, 0x0);
+
+    /* GMAC0 is connected to the PHY0 of the internal switch */
+    ath79_switch_data.phy4_mii_en = 1;
+    ath79_switch_data.phy_poll_mask = BIT(0);
+    ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+    ath79_eth0_data.phy_mask = BIT(0);
+    ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+    ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+    ath79_register_eth(0);
+
+    /* GMAC1 is connected to the internal switch */
+    ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+    ath79_init_mac(ath79_eth1_data.mac_addr, mac, 2);
+    ath79_register_eth(1);
+
+    ath79_register_leds_gpio(-1, ARRAY_SIZE(cf_e312a_leds_gpio),
+                 cf_e312a_leds_gpio);
+
+    ath79_register_gpio_keys_polled(1, CF_EXXXN_KEYS_POLL_INTERVAL,
+                    ARRAY_SIZE(cf_e312a_gpio_keys),
+                    cf_e312a_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_CF_E312A, "CF-E312A", "COMFAST CF-E312A",
+         cf_e312a_setup);
+
  static void __init cf_e316n_v2_setup(void)
  {
      u8 *mac = (u8 *) KSEG1ADDR(0x1f010000);
@@ -524,4 +634,4 @@ static void __init cf_e530n_setup(void)
  }

  MIPS_MACHINE(ATH79_MACH_CF_E530N, "CF-E530N", "COMFAST CF-E530N",
-         cf_e530n_setup);
+        cf_e530n_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h 
b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
index 01472b6..949c5fd 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
@@ -60,6 +60,7 @@ enum ath79_mach_type {
      ATH79_MACH_CAP324,            /* PowerCloud CAP324 */
      ATH79_MACH_CAP4200AG,            /* Senao CAP4200AG */
      ATH79_MACH_CARAMBOLA2,            /* 8devices Carambola2 */
+    ATH79_MACH_CF_E312A,            /* COMFAST CF-E312A */
      ATH79_MACH_CF_E316N_V2,            /* COMFAST CF-E316N v2 */
      ATH79_MACH_CF_E320N_V2,            /* COMFAST CF-E320N v2 */
      ATH79_MACH_CF_E355AC,            /* COMFAST CF-E355AC */
diff --git a/target/linux/ar71xx/image/generic.mk 
b/target/linux/ar71xx/image/generic.mk
index 3c5fcc3..134360a 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -135,6 +135,14 @@ define Device/carambola2
  endef
  TARGET_DEVICES += carambola2

+define Device/cf-e312a
+  DEVICE_TITLE := COMFAST CF-E312A
+  BOARDNAME := CF-E312A
+  IMAGE_SIZE := 16192k
+  MTDPARTS := 
spi0.0:64k(u-boot)ro,64k(art)ro,16192k(firmware),64k(art-backup)ro
+endef
+TARGET_DEVICES += cf-e312a
+
  define Device/cf-e316n-v2
    DEVICE_TITLE := COMFAST CF-E316N v2
