From 7ba9a3a504909ccf8f6d1aca9b1160443da7215b Mon Sep 17 00:00:00 2001 From: Jing Lin Date: Tue, 18 Oct 2016 16:18:50 +0800 Subject: [PATCH] ar71xx: Add support to DomyWifi DW33D Signed-off-by: Jing Lin --- .../ar71xx/base-files/etc/board.d/01_leds | 6 + .../ar71xx/base-files/etc/board.d/02_network | 1 + target/linux/ar71xx/base-files/etc/diag.sh | 3 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 4 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.4 | 1 + .../files/arch/mips/ath79/Kconfig.openwrt | 16 ++ .../ar71xx/files/arch/mips/ath79/Makefile | 1 + .../arch/mips/ath79/mach-domywifi-dw33d.c | 187 ++++++++++++++++++ .../ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/image/generic.mk | 11 ++ 12 files changed, 235 insertions(+) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c 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 5011af6ec9..89d0b5892b 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -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" ;; +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" diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index b7b91d0ad8..eaf67180e8 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -305,6 +305,7 @@ ar71xx_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "2:lan" "3:lan" ;; + dw33d|\ f9k1115v2) ucidef_set_interfaces_lan_wan "eth1" "eth0" ucidef_add_switch "switch0" \ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 7a40f44e4a..e225ddbbb5 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -130,6 +130,9 @@ get_status_led() { oolite) status_led="$board:red:system" ;; + dw33d) + status_led="$board:blue:status" + ;; eap120) status_led="$(ar71xx_board_name):green:system" ;; diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index a0a111b3d1..322998d2cf 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -50,6 +50,10 @@ case "$FIRMWARE" in 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) diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 1492b50774..85f5bf27dd 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -566,6 +566,9 @@ ar71xx_board_detect() { *"Domino Pi") name="gl-domino" ;; + *"DW33D") + name="dw33d" + ;; *"EAP120") name="eap120" tplink_pharos_board_detect diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 35e9bb4391..e98c3ce4e1 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -262,6 +262,7 @@ platform_check_image() { bxu2000n-2-a1|\ db120|\ dr344|\ + dw33d|\ f9k1115v2|\ hornet-ub|\ mr12|\ diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 77a594999d..3d7c4814b8 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -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_DOMYWIFI_DW33D=y CONFIG_ATH79_MACH_DR344=y CONFIG_ATH79_MACH_DR531=y CONFIG_ATH79_MACH_DRAGINO2=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 7c171ee2ac..85e1cde995 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -534,6 +534,22 @@ config ATH79_MACH_DLAN_PRO_1200_AC 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 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index c528c03e35..c3a0f68493 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -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_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 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 index 0000000000..52d9da4792 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c @@ -0,0 +1,187 @@ +/* + * DomyWifi DW33D support + * + * Copyright (c) 2012 Qualcomm Atheros + * Copyright (c) 2012-2013 Gabor Juhos + * + * 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 +#include +#include +#include +#include + +#include + +#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); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index aa8215bbeb..04fb82902a 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -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_DOMYWIFI_DW33D, /* DomyWifi DW33D */ ATH79_MACH_DR344, /* Wallys DR344 */ ATH79_MACH_DR531, /* Wallys DR531 */ ATH79_MACH_DRAGINO2, /* Dragino Version 2 */ diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 192f1a79c4..bf17814dda 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -27,6 +27,17 @@ define Device/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