ar71xx: Add support to DomyWifi DW33D
authorJing Lin <mumuqz@163.com>
Tue, 18 Oct 2016 08:18:50 +0000 (16:18 +0800)
committerJo-Philipp Wich <jo@mein.io>
Tue, 25 Oct 2016 15:51:08 +0000 (17:51 +0200)
Signed-off-by: Jing Lin <mumuqz@163.com>
12 files changed:
target/linux/ar71xx/base-files/etc/board.d/01_leds
target/linux/ar71xx/base-files/etc/board.d/02_network
target/linux/ar71xx/base-files/etc/diag.sh
target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
target/linux/ar71xx/base-files/lib/ar71xx.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/ar71xx/config-4.4
target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
target/linux/ar71xx/files/arch/mips/ath79/Makefile
target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c [new file with mode: 0644]
target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
target/linux/ar71xx/image/generic.mk

index 5011af6ec92b3b83868f2ff63cde9f92be579bbf..89d0b5892b548fa8ce28cf8c6d33319e478e9e12 100755 (executable)
@@ -142,6 +142,12 @@ dragino2)
        ucidef_set_led_netdev "lan" "LAN" "$board:red:lan" "eth0"
        ucidef_set_led_netdev "wan" "WAN" "$board:red:wan" "eth1"
        ;;
        ucidef_set_led_netdev "lan" "LAN" "$board:red:lan" "eth0"
        ucidef_set_led_netdev "wan" "WAN" "$board:red:wan" "eth1"
        ;;
+dw33d)
+       ucidef_set_led_usbdev "mmc" "MMC" "$board:blue:mmc" "1-1"
+       ucidef_set_led_usbdev "usb" "USB" "$board:blue:usb" "2-1"
+       ucidef_set_led_netdev "internet" "INTERNET" "$board:blue:internet" "eth0"
+       ucidef_set_led_wlan "wlan2g" "WLAN-2.4G" "$board:blue:wlan-2g" "phy1tpt"
+       ;;
 eap300v2)
        ucidef_set_led_netdev "lan" "LAN" "engenius:blue:lan" "eth0"
        ucidef_set_led_wlan "wlan" "WLAN" "engenius:blue:wlan" "phy0tpt"
 eap300v2)
        ucidef_set_led_netdev "lan" "LAN" "engenius:blue:lan" "eth0"
        ucidef_set_led_wlan "wlan" "WLAN" "engenius:blue:wlan" "phy0tpt"
index b7b91d0ad80e22eabcde208970728b2280f481eb..eaf67180e8f6376ceca4b66b290237d1ab5029d4 100755 (executable)
@@ -305,6 +305,7 @@ ar71xx_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0@eth0" "2:lan" "3:lan"
                ;;
                ucidef_add_switch "switch0" \
                        "0@eth0" "2:lan" "3:lan"
                ;;
+       dw33d|\
        f9k1115v2)
                ucidef_set_interfaces_lan_wan "eth1" "eth0"
                ucidef_add_switch "switch0" \
        f9k1115v2)
                ucidef_set_interfaces_lan_wan "eth1" "eth0"
                ucidef_add_switch "switch0" \
index 7a40f44e4a3f11031099d67c797ae9ca467d2d6d..e225ddbbb528d76e108f8c317600dd9724d3a212 100644 (file)
@@ -130,6 +130,9 @@ get_status_led() {
        oolite)
                status_led="$board:red:system"
                ;;
        oolite)
                status_led="$board:red:system"
                ;;
+       dw33d)
+               status_led="$board:blue:status"
+               ;;
        eap120)
                status_led="$(ar71xx_board_name):green:system"
                ;;
        eap120)
                status_led="$(ar71xx_board_name):green:system"
                ;;
index a0a111b3d1520d6c9d66e767b547cec579a22f7c..322998d2cfdfe561213923f563d1e1bc268de2c3 100644 (file)
@@ -50,6 +50,10 @@ case "$FIRMWARE" in
        dlan-pro-1200-ac)
                ath10kcal_extract "art" 20480 2116
                ;;
        dlan-pro-1200-ac)
                ath10kcal_extract "art" 20480 2116
                ;;
+       dw33d)
+               ath10kcal_extract "art" 20480 2116
+               ath10kcal_patch_mac $(mtd_get_mac_binary art 18)
+               ;;
        mc-mac1200r)
                ath10kcal_extract "art" 20480 2116
                ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1)
        mc-mac1200r)
                ath10kcal_extract "art" 20480 2116
                ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1)
index 1492b5077449db7a7038d1467f674e02308a59b9..85f5bf27ddf6398c7d9e9bd0d5ac4f14fcddbf9e 100755 (executable)
@@ -566,6 +566,9 @@ ar71xx_board_detect() {
        *"Domino Pi")
                name="gl-domino"
                ;;
        *"Domino Pi")
                name="gl-domino"
                ;;
+       *"DW33D")
+               name="dw33d"
+               ;;
        *"EAP120")
                name="eap120"
                tplink_pharos_board_detect
        *"EAP120")
                name="eap120"
                tplink_pharos_board_detect
index 35e9bb4391e8a409eabfd2b56a59e02fa3c48252..e98c3ce4e1a2c64c97e71ba9c8f19c385b6e4249 100755 (executable)
@@ -262,6 +262,7 @@ platform_check_image() {
        bxu2000n-2-a1|\
        db120|\
        dr344|\
        bxu2000n-2-a1|\
        db120|\
        dr344|\
+       dw33d|\
        f9k1115v2|\
        hornet-ub|\
        mr12|\
        f9k1115v2|\
        hornet-ub|\
        mr12|\
index 77a594999d0b3916dbe3c94c91354cd402f4018d..3d7c4814b8601191cc43c2374d2871515cff1dff 100644 (file)
@@ -77,6 +77,7 @@ CONFIG_ATH79_MACH_DIR_869_A1=y
 CONFIG_ATH79_MACH_DLAN_HOTSPOT=y
 CONFIG_ATH79_MACH_DLAN_PRO_1200_AC=y
 CONFIG_ATH79_MACH_DLAN_PRO_500_WP=y
 CONFIG_ATH79_MACH_DLAN_HOTSPOT=y
 CONFIG_ATH79_MACH_DLAN_PRO_1200_AC=y
 CONFIG_ATH79_MACH_DLAN_PRO_500_WP=y
+CONFIG_ATH79_MACH_DOMYWIFI_DW33D=y
 CONFIG_ATH79_MACH_DR344=y
 CONFIG_ATH79_MACH_DR531=y
 CONFIG_ATH79_MACH_DRAGINO2=y
 CONFIG_ATH79_MACH_DR344=y
 CONFIG_ATH79_MACH_DR531=y
 CONFIG_ATH79_MACH_DRAGINO2=y
index 7c171ee2acb80227d84fe3389edba3246987e454..85e1cde995147873f4b36967f07af68ac764d46a 100644 (file)
@@ -534,6 +534,22 @@ config ATH79_MACH_DLAN_PRO_1200_AC
        select ATH79_DEV_NFC
        select ATH79_DEV_USB
 
        select ATH79_DEV_NFC
        select ATH79_DEV_USB
 
+config ATH79_MACH_DOMYWIFI_DW33D
+       bool "DomyWifi DW33D support"
+       select SOC_QCA955X
+       select ATH79_DEV_AP9X_PCI if PCI
+       select ATH79_DEV_ETH
+       select ATH79_DEV_GPIO_BUTTONS
+       select ATH79_DEV_LEDS_GPIO
+       select ATH79_DEV_M25P80
+       select ATH79_DEV_NFC
+       select ATH79_DEV_WMAC
+       select ATH79_DEV_USB
+       select MTD_NAND
+       select MTD_NAND_ECC
+       select MTD_NAND_AR934X
+       select MTD_NAND_AR934X_HW_ECC
+
 config ATH79_MACH_DR344
        bool "Wallys DR344 board support"
        select SOC_AS934X
 config ATH79_MACH_DR344
        bool "Wallys DR344 board support"
        select SOC_AS934X
index c528c03e357f043c6322846fd73131d5665190b9..c3a0f68493300c072386f0d55e7d7a3673e94014 100644 (file)
@@ -83,6 +83,7 @@ obj-$(CONFIG_ATH79_MACH_DIR_869_A1)           += mach-dir-869-a1.o
 obj-$(CONFIG_ATH79_MACH_DLAN_HOTSPOT)          += mach-dlan-hotspot.o
 obj-$(CONFIG_ATH79_MACH_DLAN_PRO_1200_AC)      += mach-dlan-pro-1200-ac.o
 obj-$(CONFIG_ATH79_MACH_DLAN_PRO_500_WP)       += mach-dlan-pro-500-wp.o
 obj-$(CONFIG_ATH79_MACH_DLAN_HOTSPOT)          += mach-dlan-hotspot.o
 obj-$(CONFIG_ATH79_MACH_DLAN_PRO_1200_AC)      += mach-dlan-pro-1200-ac.o
 obj-$(CONFIG_ATH79_MACH_DLAN_PRO_500_WP)       += mach-dlan-pro-500-wp.o
+obj-$(CONFIG_ATH79_MACH_DOMYWIFI_DW33D)                += mach-domywifi-dw33d.o
 obj-$(CONFIG_ATH79_MACH_DR344)                 += mach-dr344.o
 obj-$(CONFIG_ATH79_MACH_DR531)                 += mach-dr531.o
 obj-$(CONFIG_ATH79_MACH_DRAGINO2)              += mach-dragino2.o
 obj-$(CONFIG_ATH79_MACH_DR344)                 += mach-dr344.o
 obj-$(CONFIG_ATH79_MACH_DR531)                 += mach-dr531.o
 obj-$(CONFIG_ATH79_MACH_DRAGINO2)              += mach-dragino2.o
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c
new file mode 100644 (file)
index 0000000..52d9da4
--- /dev/null
@@ -0,0 +1,187 @@
+/*
+ * DomyWifi DW33D support
+ *
+ * Copyright (c) 2012 Qualcomm Atheros
+ * Copyright (c) 2012-2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/platform/ar934x_nfc.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "pci.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-nfc.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define DW33D_GPIO_LED_MMC             4
+#define DW33D_GPIO_LED_WLAN_2G         13
+#define DW33D_GPIO_LED_STATUS          14
+#define DW33D_GPIO_LED_USB             15
+#define DW33D_GPIO_LED_INTERNET                22
+
+#define DW33D_GPIO_BTN_RESET           17
+
+#define DW33D_KEYS_POLL_INTERVAL       20      /* msecs */
+#define DW33D_KEYS_DEBOUNCE_INTERVAL   (3 * DW33D_KEYS_POLL_INTERVAL)
+
+#define DW33D_MAC0_OFFSET              0
+#define DW33D_MAC1_OFFSET              6
+#define DW33D_WMAC_OFFSET              12
+#define DW33D_WMAC_CALDATA_OFFSET      0x1000
+#define DW33D_PCIE_CALDATA_OFFSET      0x5000
+
+static struct gpio_led dw33d_leds_gpio[] __initdata = {
+       {
+               .name           = "dw33d:blue:status",
+               .gpio           = DW33D_GPIO_LED_STATUS,
+               .active_low     = 1,
+       },
+       {
+               .name           = "dw33d:blue:mmc",
+               .gpio           = DW33D_GPIO_LED_MMC,
+               .active_low     = 1,
+       },
+       {
+               .name           = "dw33d:blue:usb",
+               .gpio           = DW33D_GPIO_LED_USB,
+               .active_low     = 1,
+       },
+       {
+               .name           = "dw33d:blue:wlan-2g",
+               .gpio           = DW33D_GPIO_LED_WLAN_2G,
+               .active_low     = 1,
+       },
+       {
+               .name           = "dw33d:blue:internet",
+               .gpio           = DW33D_GPIO_LED_INTERNET,
+               .active_low     = 1,
+       }
+};
+
+static struct gpio_keys_button dw33d_gpio_keys[] __initdata = {
+       {
+               .desc           = "Reset button",
+               .type           = EV_KEY,
+               .code           = KEY_RESTART,
+               .debounce_interval = DW33D_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = DW33D_GPIO_BTN_RESET,
+               .active_low     = 1,
+       }
+};
+
+/* GMAC6 of the QCA8337 switch is connected to the QCA9558 SoC via SGMII */
+static struct ar8327_pad_cfg dw33d_qca8337_pad6_cfg = {
+       .mode = AR8327_PAD_MAC_SGMII,
+       .sgmii_delay_en = true,
+};
+
+/* GMAC0 of the QCA8337 switch is connected to the QCA9558 SoC via RGMII */
+static struct ar8327_pad_cfg dw33d_qca8337_pad0_cfg = {
+       .mode = AR8327_PAD_MAC_RGMII,
+       .txclk_delay_en = true,
+       .rxclk_delay_en = true,
+       .txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+       .rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_platform_data dw33d_qca8337_data = {
+       .pad0_cfg = &dw33d_qca8337_pad0_cfg,
+       .pad6_cfg = &dw33d_qca8337_pad6_cfg,
+       .port0_cfg = {
+               .force_link = 1,
+               .speed = AR8327_PORT_SPEED_1000,
+               .duplex = 1,
+               .txpause = 1,
+               .rxpause = 1,
+       },
+       .port6_cfg = {
+               .force_link = 1,
+               .speed = AR8327_PORT_SPEED_1000,
+               .duplex = 1,
+               .txpause = 1,
+               .rxpause = 1,
+       },
+};
+
+static struct mdio_board_info dw33d_mdio0_info[] = {
+       {
+               .bus_id = "ag71xx-mdio.0",
+               .phy_addr = 0,
+               .platform_data = &dw33d_qca8337_data,
+       },
+};
+
+static void __init dw33d_setup(void)
+{
+       u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+       ath79_register_m25p80(NULL);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(dw33d_leds_gpio),
+                                dw33d_leds_gpio);
+       ath79_register_gpio_keys_polled(-1, DW33D_KEYS_POLL_INTERVAL,
+                                       ARRAY_SIZE(dw33d_gpio_keys),
+                                       dw33d_gpio_keys);
+
+       ath79_register_usb();
+       ath79_nfc_set_ecc_mode(AR934X_NFC_ECC_HW);
+       ath79_register_nfc();
+       ath79_register_pci();
+
+       ath79_register_wmac(art + DW33D_WMAC_CALDATA_OFFSET, art + DW33D_WMAC_OFFSET);
+
+       ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+       ath79_register_mdio(0, 0x0);
+
+       ath79_init_mac(ath79_eth0_data.mac_addr, art + DW33D_MAC0_OFFSET, 0);
+       ath79_init_mac(ath79_eth1_data.mac_addr, art + DW33D_MAC1_OFFSET, 0);
+
+       mdiobus_register_board_info(dw33d_mdio0_info,
+                                   ARRAY_SIZE(dw33d_mdio0_info));
+
+       /* GMAC0 is connected to the RMGII interface */
+       ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+       ath79_eth0_data.phy_mask = BIT(0);
+       ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+        ath79_eth0_pll_data.pll_1000 = 0x56000000;
+
+       ath79_register_eth(0);
+
+       /* GMAC1 is connected tot eh SGMII interface */
+       ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+       ath79_eth1_data.speed = SPEED_1000;
+       ath79_eth1_data.duplex = DUPLEX_FULL;
+        ath79_eth1_pll_data.pll_1000 = 0x03000101;
+
+       ath79_register_eth(1);
+}
+
+MIPS_MACHINE(ATH79_MACH_DOMYWIFI_DW33D, "DW33D",
+            "DomyWifi DW33D",
+            dw33d_setup);
index aa8215bbeb7c0b9c533eaccda8697cbc46fc0344..04fb82902a486f6745b0825bc0554e3a1b3ebc00 100644 (file)
@@ -72,6 +72,7 @@ enum ath79_mach_type {
        ATH79_MACH_DLAN_HOTSPOT,                /* devolo dLAN Hotspot */
        ATH79_MACH_DLAN_PRO_1200_AC,            /* devolo dLAN pro 1200+ WiFi ac*/
        ATH79_MACH_DLAN_PRO_500_WP,             /* devolo dLAN pro 500 Wireless+ */
        ATH79_MACH_DLAN_HOTSPOT,                /* devolo dLAN Hotspot */
        ATH79_MACH_DLAN_PRO_1200_AC,            /* devolo dLAN pro 1200+ WiFi ac*/
        ATH79_MACH_DLAN_PRO_500_WP,             /* devolo dLAN pro 500 Wireless+ */
+       ATH79_MACH_DOMYWIFI_DW33D,              /* DomyWifi DW33D */
        ATH79_MACH_DR344,                       /* Wallys DR344 */
        ATH79_MACH_DR531,                       /* Wallys DR531 */
        ATH79_MACH_DRAGINO2,                    /* Dragino Version 2 */
        ATH79_MACH_DR344,                       /* Wallys DR344 */
        ATH79_MACH_DR531,                       /* Wallys DR531 */
        ATH79_MACH_DRAGINO2,                    /* Dragino Version 2 */
index 192f1a79c456a67b856534202c35875649e719a7..bf17814ddaa67c1cfd24785a4a3646249c4f03f8 100644 (file)
@@ -27,6 +27,17 @@ define Device/cf-e316n-v2
 endef
 TARGET_DEVICES += cf-e316n-v2
 
 endef
 TARGET_DEVICES += cf-e316n-v2
 
+define Device/domywifi-dw33d
+  DEVICE_TITLE := DomyWifi DW33D
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ledtrig-usbdev kmod-ath10k
+  BOARDNAME = DW33D
+  IMAGE_SIZE = 16000k
+  CONSOLE = ttyS0,115200
+  MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware);ar934x-nfc:96m(rootfs_data),32m(backup)ro
+  IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | pad-to 14528k | append-kernel | check-size $$$$(IMAGE_SIZE)
+endef
+TARGET_DEVICES += domywifi-dw33d
+
 define Device/dragino2
   BOARDNAME := DRAGINO2
   CONSOLE := ttyATH0,115200
 define Device/dragino2
   BOARDNAME := DRAGINO2
   CONSOLE := ttyATH0,115200