From patchwork Mon Nov 23 03:13:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alzhao@gmail.com X-Patchwork-Id: 547372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B2D9714029E for ; Mon, 23 Nov 2015 14:15:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=HZkYLpMF; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 93C5C289096; Mon, 23 Nov 2015 04:12:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3C0DD28147C for ; Mon, 23 Nov 2015 04:11:53 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 23 Nov 2015 04:11:52 +0100 (CET) Received: by pabfh17 with SMTP id fh17so182167166pab.0 for ; Sun, 22 Nov 2015 19:13:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ClLMDngfE1/Em8mWcMatU1GQgH7V1Q0Ljl7b1y0xaeU=; b=HZkYLpMF9ICrex2fSu0oZBkAaKhURo+lSqtQS2lJqfvc8V+d61VLxTpkp8DF/xGNGE TrEo8kVOmQ+nGPt+epatasCFVG+zypBJhDDaC7nnylglJ5qSjYCYrJt8sIF3aE1Apr/Q A1L4wwPZ5PPyoMbeIcAevYCi0hqMYUES02dHXJ9otLCwSkJ8sfqMv4vt/V/ZVvkjZJnL uqKOg83X83/pyizsDtLD9WecYKOnK1+16lVT4QKgW+3dG7X5ZwU9GoJ98QR06lZsGUAo 5TtS1thAAu2B8psovZVhQ5++lxSl6vhYiNUAk6mkw12WtBjRCkdC5LOzvi37RiePxbz+ jkDQ== X-Received: by 10.68.87.227 with SMTP id bb3mr33011325pbb.160.1448248433906; Sun, 22 Nov 2015 19:13:53 -0800 (PST) Received: from localhost.localdomain ([119.63.98.57]) by smtp.gmail.com with ESMTPSA id h69sm7694800pfj.66.2015.11.22.19.13.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Nov 2015 19:13:53 -0800 (PST) From: alzhao To: openwrt-devel@lists.openwrt.org Date: Mon, 23 Nov 2015 11:13:43 +0800 Message-Id: <1448248423-28786-3-git-send-email-alzhao@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448248423-28786-1-git-send-email-alzhao@gmail.com> References: <1448248423-28786-1-git-send-email-alzhao@gmail.com> Subject: [OpenWrt-Devel] [PATCH 3/3] ar71xx: add GL-Domino Pi support V3 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This is the patch for GL-Domino Pi V3. Updated against the latest trunk. Signed-off-by: alzhao --- target/linux/ar71xx/base-files/etc/board.d/01_leds | 4 + .../linux/ar71xx/base-files/etc/board.d/02_network | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.1 | 1 + .../ar71xx/files/arch/mips/ath79/mach-gl-domino.c | 136 +++++++++++++++++++++ target/linux/ar71xx/generic/profiles/gli.mk | 11 ++ target/linux/ar71xx/image/Makefile | 8 ++ .../913-MIPS-ath79-add-domino-support.patch | 39 ++++++ 9 files changed, 204 insertions(+) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-gl-domino.c create mode 100644 target/linux/ar71xx/patches-4.1/913-MIPS-ath79-add-domino-support.patch 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 da3e561..244700f 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -225,6 +225,10 @@ gl-ar300) ucidef_set_led_wlan "wlan" "WLAN" "gl_ar300:wlan" "phy0tpt" ;; +gl-domino) + ucidef_set_led_wlan "wlan" "WLAN" "domino:blue:wlan" "phy0tpt" + ;; + gl-inet) ucidef_set_led_netdev "lan" "LAN" "gl-connect:green:lan" "eth1" ucidef_set_led_wlan "wlan" "WLAN" "gl-connect:red: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 a5a40a1..68e0caa 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -397,6 +397,7 @@ alfa-ap96 |\ alfa-nx |\ ap83 |\ gl-ar150 |\ +gl-domino |\ gl-inet |\ jwap003 |\ pb42 |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 8eb9266..df77040 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -466,6 +466,9 @@ ar71xx_board_detect() { *"Dragino v2") name="dragino2" ;; + *"Domino Pi") + name="gl-domino" + ;; *"EAP300 v2") name="eap300v2" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index e68a05b..41886e3 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -222,6 +222,7 @@ platform_check_image() { ew-dorin-router | \ gl-ar150 | \ gl-ar300 | \ + gl-domino | \ hiwifi-hc6361 | \ hornet-ub-x2 | \ mzk-w04nu | \ diff --git a/target/linux/ar71xx/config-4.1 b/target/linux/ar71xx/config-4.1 index b217a43..eff197a 100644 --- a/target/linux/ar71xx/config-4.1 +++ b/target/linux/ar71xx/config-4.1 @@ -66,6 +66,7 @@ CONFIG_ATH79_MACH_DIR_825_C1=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_GL_DOMINO=y CONFIG_ATH79_MACH_DRAGINO2=y CONFIG_ATH79_MACH_EAP300V2=y CONFIG_ATH79_MACH_EAP7660D=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-domino.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-domino.c new file mode 100644 index 0000000..a8a42ad --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-domino.c @@ -0,0 +1,136 @@ +/* + * Domino board support + * + * Copyright (C) 2011 dongyuqi <729650915@qq.com> + * Copyright (C) 2011-2012 Gabor Juhos + * Copyright (C) 2013 alzhao + * Copyright (C) 2014 Michel Stempin + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. +*/ + +#include + +#include + +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define DOMINO_GPIO_LED_WLAN 0 +#define DOMINO_GPIO_LED_WAN 17 +#define DOMINO_GPIO_LED_USB 1 +#define DOMINO_GPIO_LED_LAN1 13 +#define DOMINO_GPIO_LED_LAN2 14 +#define DOMINO_GPIO_LED_LAN3 15 +#define DOMINO_GPIO_LED_LAN4 16 +#define DOMINO_GPIO_LED_SYS 27 +#define DOMINO_GPIO_LED_WPS 26 +#define DOMINO_GPIO_USB_POWER 6 + +#define DOMINO_GPIO_BTN_RESET 11 +#define DOMINO_GPIO_BTN_WPS 20 + +#define DOMINO_KEYS_POLL_INTERVAL 20 /* msecs */ +#define DOMINO_KEYS_DEBOUNCE_INTERVAL (3 * DOMINO_KEYS_POLL_INTERVAL) + +#define DOMINO_MAC0_OFFSET 0x0000 +#define DOMINO_MAC1_OFFSET 0x0000 +#define DOMINO_CALDATA_OFFSET 0x1000 +#define DOMINO_WMAC_MAC_OFFSET 0x0000 + +static struct gpio_led domino_leds_gpio[] __initdata = { + { + .name = "domino:blue:wlan", + .gpio = DOMINO_GPIO_LED_WLAN, + .active_low = 0, + }, + { + .name = "domino:red:wan", + .gpio = DOMINO_GPIO_LED_WAN, + .active_low = 1, + }, + { + .name = "domino:white:usb", + .gpio = DOMINO_GPIO_LED_USB, + .active_low = 0, + }, + { + .name = "domino:green:lan1", + .gpio = DOMINO_GPIO_LED_LAN1, + .active_low = 0, + }, + { + .name = "domino:yellow:wps", + .gpio = DOMINO_GPIO_LED_WPS, + .active_low = 1, + }, + { + .name = "domino:orange:sys", + .gpio = DOMINO_GPIO_LED_SYS, + .active_low = 1, + }, +}; + +static struct gpio_keys_button domino_gpio_keys[] __initdata = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = DOMINO_KEYS_DEBOUNCE_INTERVAL, + .gpio = DOMINO_GPIO_BTN_RESET, + .active_low = 0, + }, + { + .desc = "wps", + .type = EV_KEY, + .code = KEY_WPS_BUTTON, + .debounce_interval = DOMINO_KEYS_DEBOUNCE_INTERVAL, + .gpio = DOMINO_GPIO_BTN_WPS, + .active_low = 0, + } +}; + +static void __init domino_setup(void) +{ + + /* ART base address */ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + + /* disable PHY_SWAP and PHY_ADDR_SWAP bits */ + ath79_setup_ar933x_phy4_switch(false, false); + + /* register flash. */ + ath79_register_m25p80(NULL); + + /* register gpio LEDs and keys */ + ath79_register_leds_gpio(-1, ARRAY_SIZE(domino_leds_gpio), + domino_leds_gpio); + ath79_register_gpio_keys_polled(-1, DOMINO_KEYS_POLL_INTERVAL, + ARRAY_SIZE(domino_gpio_keys), + domino_gpio_keys); + + gpio_request_one(DOMINO_GPIO_USB_POWER, + GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, + "USB power"); + /* enable usb */ + ath79_register_usb(); + + /* register eth0 as WAN, eth1 as LAN */ + ath79_init_mac(ath79_eth0_data.mac_addr, art+DOMINO_MAC0_OFFSET, 0); + ath79_init_mac(ath79_eth1_data.mac_addr, art+DOMINO_MAC1_OFFSET, 0); + ath79_register_mdio(0, 0x0); + ath79_register_eth(0); + ath79_register_eth(1); + + /* register wireless mac with cal data */ + ath79_register_wmac(art + DOMINO_CALDATA_OFFSET, art + DOMINO_WMAC_MAC_OFFSET); +} + +MIPS_MACHINE(ATH79_MACH_GL_DOMINO, "DOMINO", "Domino Pi", domino_setup); diff --git a/target/linux/ar71xx/generic/profiles/gli.mk b/target/linux/ar71xx/generic/profiles/gli.mk index c587376..a0fa714 100644 --- a/target/linux/ar71xx/generic/profiles/gli.mk +++ b/target/linux/ar71xx/generic/profiles/gli.mk @@ -36,3 +36,14 @@ define Profile/GL-AR300/Description endef $(eval $(call Profile,GL-AR300)) + +define Profile/DOMINO + NAME:=GL Domino Pi + PACKAGES:=kmod-usb-core kmod-usb2 +endef + +define Profile/DOMINO/Description + Configuration of Domino, Wifi for everything. +endef + +$(eval $(call Profile,DOMINO)) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index e0eea98..d12ad8b 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -204,6 +204,14 @@ define Device/gl-ar300 endef TARGET_DEVICES += gl-ar300 +define Device/gl-domino + BOARDNAME = DOMINO + IMAGE_SIZE = 16000k + CONSOLE = ttyATH0,115200 + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro +endef +TARGET_DEVICES += gl-domino + define Device/wndr3700 BOARDNAME = WNDR3700 diff --git a/target/linux/ar71xx/patches-4.1/913-MIPS-ath79-add-domino-support.patch b/target/linux/ar71xx/patches-4.1/913-MIPS-ath79-add-domino-support.patch new file mode 100644 index 0000000..80351cf --- /dev/null +++ b/target/linux/ar71xx/patches-4.1/913-MIPS-ath79-add-domino-support.patch @@ -0,0 +1,39 @@ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -597,6 +597,16 @@ config ATH79_MACH_GL_AR300 + select ATH79_DEV_USB + select ATH79_DEV_WMAC + ++config ATH79_MACH_GL_DOMINO ++ bool "DOMINO support" ++ select SOC_AR933X ++ 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_GL_INET + bool "GL-INET support" + select SOC_AR933X +--- a/arch/mips/ath79/Makefile ++++ b/arch/mips/ath79/Makefile +@@ -85,6 +85,7 @@ obj-$(CONFIG_ATH79_MACH_ESR1750) += mach + obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o + obj-$(CONFIG_ATH79_MACH_GL_AR150) += mach-gl-ar150.o + obj-$(CONFIG_ATH79_MACH_GL_AR300) += mach-gl-ar300.o ++obj-$(CONFIG_ATH79_MACH_GL_DOMINO) += mach-gl-domino.o + obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.o + obj-$(CONFIG_ATH79_MACH_GS_MINIBOX_V1) += mach-gs-minibox-v1.o + obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h +@@ -74,6 +74,7 @@ enum ath79_mach_type { + ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */ + ATH79_MACH_GL_AR150, /* GL-AR150 support */ + ATH79_MACH_GL_AR300, /* GL-AR300 */ ++ ATH79_MACH_GL_DOMINO, /* Domino */ + ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */ + ATH79_MACH_GS_MINIBOX_V1, /* Gainstrong MiniBox V1.0 */ + ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */