From patchwork Thu Mar 10 00:40:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. D. Pinney" X-Patchwork-Id: 595572 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 30972140322 for ; Thu, 10 Mar 2016 11:40:28 +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=iibzlzLc; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B010BB804F2; Thu, 10 Mar 2016 01:40:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Thu, 10 Mar 2016 01:40:17 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 5F2ECB803FB for ; Thu, 10 Mar 2016 01:40:15 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-ob0-f172.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mail-ob0-f172.google.com (mail-ob0-f172.google.com [209.85.214.172]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 10 Mar 2016 01:40:14 +0100 (CET) Received: by mail-ob0-f172.google.com with SMTP id fp4so64946037obb.2 for ; Wed, 09 Mar 2016 16:40:14 -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; bh=ibheIUmlUWkJxoU+uq4sFLdEa3GYTovYVII+eaInmU8=; b=iibzlzLcwz/qc+dLNraW2l8od19dGKtskWuZNQSNQYcGKjvROEP0TBJ+0p7byiC4dw o3nJXaPUnJzrA5008i4jBnSsx63VZubepWlBpu+MOUDpb0Kl3meHuOBJbrCPLT5a8s0W 6yF/8MOa0PUIYF9dS3HgaWjYfwAr1IIQpXg4rItsWAF1HIBO5fIDGRSQSW13VYjm3hvK y8tbXkqzcrMLOqnwfrnhxHJIvmNRtvAKgJC18BNujJabk7ICcoH0kIn7vFqs71KqqecB vij+NBycdXPWEUWJqNcYTN128/PNOCJXECa2Ngvw0q1cieBxO928od0Q0Wtj4OenpPwM w+2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ibheIUmlUWkJxoU+uq4sFLdEa3GYTovYVII+eaInmU8=; b=NRZo8kNNr5l538EMRqJvR6/OmKENsg/OvFYuQ95JBK1y8es3c1m7GKlKgOYPpSZP9K uHc96vzePZOnRMUdxql8liXNc/9iNC5cG1TmTD9dYKUKAQzqD7UbwrJaWBDwaJL5Rx4e G+68tLZVZ3Pu1nxeKhjpHi3oJvMRYwH8+uLSgI5N47zYrqGt+Tu+JNELCEt3VYWgN990 b/oTWQc02ihAs7ITFaeUwqUos9O1Wbw/nukyyDlXqkmYHWsnuaeMkeHcYkLi5C//hXjv O0M+0OHfLI6QmMpjTXTB7zoQ/H4xQ9tz02WzbVwxHPTqwGLZBjK19XHd3lqwEN9RpVEs +qhg== X-Gm-Message-State: AD7BkJJ/ezSgLT80ZkAJyn3sDkq1zpc7WY3QKAN8zx27S99y6Sax2GlYVBU9TtCu/FtpFg== X-Received: by 10.60.232.162 with SMTP id tp2mr376603oec.49.1457570412968; Wed, 09 Mar 2016 16:40:12 -0800 (PST) Received: from black.lan (ip70-189-80-78.ok.ok.cox.net. [70.189.80.78]) by smtp.gmail.com with ESMTPSA id jb1sm655753obb.15.2016.03.09.16.40.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Mar 2016 16:40:12 -0800 (PST) From: "L. D. Pinney" To: OpenWrt Development List Date: Wed, 9 Mar 2016 18:40:04 -0600 Message-Id: <1457570404-14786-1-git-send-email-ldpinney@gmail.com> X-Mailer: git-send-email 2.7.0 Subject: [OpenWrt-Devel] [PATCH] ar71xx: Add support for the OMYlink OMY-X1 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 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" https://wiki.openwrt.org/toh/omylink/omy-x1 http://www.omylink.com/ Signed-off-by: L. D. Pinney --- target/linux/ar71xx/base-files/etc/board.d/01_leds | 5 +++ target/linux/ar71xx/base-files/etc/board.d/02_network | 1 + target/linux/ar71xx/base-files/etc/diag.sh | 3 ++ target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 ++ target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.1 | 1 + target/linux/ar71xx/config-4.4 | 1 + target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 9 ++++++ target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 + target/linux/ar71xx/files/arch/mips/ath79/mach-omy-x1.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ target/linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/generic/profiles/omy.mk | 16 ++++++++++ target/linux/ar71xx/image/Makefile | 8 +++++ tools/firmware-utils/src/mktplinkfw.c | 6 ++++ 14 files changed, 166 insertions(+) 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 6cec5df..355c391 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -394,6 +394,11 @@ om5p-an) ucidef_set_led_netdev "port2" "port2" "om5p:blue:lan" "eth1" ;; +omy-x1) + ucidef_set_led_default "power" "POWER" "omy:green:power" "1" + ucidef_set_led_default "wan" "WAN" "omy:green:wan" "eth0" + ;; + qihoo-c301) ucidef_set_led_wlan "wlan2g" "WLAN2G" "qihoo:red:status" "phy1tpt" ;; 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 799d98e..56ea451 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -384,6 +384,7 @@ gl-ar150 |\ gl-domino |\ gl-inet |\ jwap003 |\ +omy-x1 |\ pb42 |\ pb44 |\ routerstation|\ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index db69757..9167808 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -214,6 +214,9 @@ get_status_led() { om5p-an) status_led="om5p:blue:power" ;; + omy-x1) + status_led="omy:green:power" + ;; onion-omega) status_led="onion:amber:system" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 804f622..8e9d1ea 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -120,6 +120,9 @@ tplink_board_detect() { "120000"*) model="MERCURY MAC1200R" ;; + "066602"*) + model="OMYlink OMY-X1" + ;; "3C0001"*) model="OOLITE" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 8a70502..c8687c9 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -333,6 +333,7 @@ platform_check_image() { gl-inet | \ mc-mac1200r | \ minibox-v1 |\ + omy-x1 |\ onion-omega | \ oolite | \ smart-300 | \ diff --git a/target/linux/ar71xx/config-4.1 b/target/linux/ar71xx/config-4.1 index 0ccb278..a682c11 100644 --- a/target/linux/ar71xx/config-4.1 +++ b/target/linux/ar71xx/config-4.1 @@ -108,6 +108,7 @@ CONFIG_ATH79_MACH_NBG460N=y CONFIG_ATH79_MACH_NBG6716=y CONFIG_ATH79_MACH_OM2P=y CONFIG_ATH79_MACH_OM5P=y +CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y CONFIG_ATH79_MACH_PB44=y diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index bef1863..73d552d 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -111,6 +111,7 @@ CONFIG_ATH79_MACH_NBG460N=y CONFIG_ATH79_MACH_NBG6716=y CONFIG_ATH79_MACH_OM2P=y CONFIG_ATH79_MACH_OM5P=y +CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y CONFIG_ATH79_MACH_PB44=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 3d6dc4d..12f8c55 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -843,6 +843,15 @@ config ATH79_MACH_OM5P select ATH79_DEV_M25P80 select ATH79_DEV_WMAC +config ATH79_MACH_OMY_X1 + bool "OMYlink OMY X1 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_WMAC + config ATH79_MACH_ONION_OMEGA bool "ONION OMEGA support" select SOC_AR933X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index c1bbee1..c24e80d 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -114,6 +114,7 @@ obj-$(CONFIG_ATH79_MACH_MZK_W300NH) += mach-mzk-w300nh.o obj-$(CONFIG_ATH79_MACH_NBG460N) += mach-nbg460n.o obj-$(CONFIG_ATH79_MACH_OM2P) += mach-om2p.o obj-$(CONFIG_ATH79_MACH_OM5P) += mach-om5p.o +obj-$(CONFIG_ATH79_MACH_OMY_X1) += mach-omy-x1.o obj-$(CONFIG_ATH79_MACH_ONION_OMEGA) += mach-onion-omega.o obj-$(CONFIG_ATH79_MACH_PB42) += mach-pb42.o obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-omy-x1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-omy-x1.c new file mode 100644 index 0000000..2299a24 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-omy-x1.c @@ -0,0 +1,110 @@ +/* + * OMYlink OMY-X1 board support + * + * Copyright (C) 2016 L. D. Pinney + * + * 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 +#include + +#include "common.h" +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-wmac.h" +#include "machtypes.h" + + + +#define OMY_X1_GPIO_LED_POWER 19 +#define OMY_X1_GPIO_LED_WAN 22 + +#define OMY_X1_GPIO_BTN_RESET 17 + +#define OMY_X1_KEYS_POLL_INTERVAL 22 /* msecs */ +#define OMY_X1_KEYS_DEBOUNCE_INTERVAL (3 * OMY_X1_KEYS_POLL_INTERVAL) + +static const char *omy_x1_part_probes[] = { + "tp-link", + NULL, +}; + +static struct flash_platform_data omy_x1_flash_data = { + .part_probes = omy_x1_part_probes, +}; + +static struct gpio_led omy_x1_leds_gpio[] __initdata = { + { + .name = "omy:green:wan", + .gpio = OMY_X1_GPIO_LED_WAN, + .active_low = 1, + }, { + .name = "omy:green:power", + .gpio = OMY_X1_GPIO_LED_POWER, + .active_low = 1, + }, +}; + +static struct gpio_keys_button omy_x1_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = OMY_X1_KEYS_DEBOUNCE_INTERVAL, + .gpio = OMY_X1_GPIO_BTN_RESET, + .active_low = 1, + } +}; + +static void __init tl_ap123_setup(void) +{ + u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); + u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); + + ath79_gpio_function_setup(AR934X_GPIO_FUNC_JTAG_DISABLE, + AR934X_GPIO_FUNC_CLK_OBS4_EN); + + ath79_register_m25p80(&omy_x1_flash_data); + + ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP); + + ath79_register_mdio(1, 0x0); + + ath79_init_mac(ath79_eth0_data.mac_addr, mac, -1); + ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0); + + 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_register_eth(0); + + ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII; + ath79_register_eth(1); + + ath79_register_wmac(ee, mac); +} + +static void __init omy_x1_setup(void) +{ + tl_ap123_setup(); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(omy_x1_leds_gpio), + omy_x1_leds_gpio); + + ath79_register_gpio_keys_polled(1, OMY_X1_KEYS_POLL_INTERVAL, + ARRAY_SIZE(omy_x1_gpio_keys), + omy_x1_gpio_keys); +} + +MIPS_MACHINE(ATH79_MACH_OMY_X1, "OMY-X1", "OMYlink OMY-X1", + omy_x1_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 97de9f0..0030e57 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -114,6 +114,7 @@ enum ath79_mach_type { ATH79_MACH_OM2P, /* OpenMesh OM2P */ ATH79_MACH_OM5P_AN, /* OpenMesh OM5P-AN */ ATH79_MACH_OM5P, /* OpenMesh OM5P */ + ATH79_MACH_OMY_X1, /* OMYlink OMY-X1 */ ATH79_MACH_ONION_OMEGA, /* ONION OMEGA */ ATH79_MACH_PB42, /* Atheros PB42 */ ATH79_MACH_PB92, /* Atheros PB92 */ diff --git a/target/linux/ar71xx/generic/profiles/omy.mk b/target/linux/ar71xx/generic/profiles/omy.mk new file mode 100644 index 0000000..4055dfc --- /dev/null +++ b/target/linux/ar71xx/generic/profiles/omy.mk @@ -0,0 +1,16 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/OMYX1 + NAME:=OMYlink OMY-X1 + PACKAGES:= +endef + +define Profile/OMYX1/Description + Package set optimized for the OMYlink OMY-X1. +endef +$(eval $(call Profile,OMYX1)) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index ca4437b..2987df0 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -531,6 +531,14 @@ define Device/minibox-v1 endef TARGET_DEVICES += minibox-v1 +define Device/omy-x1 + $(Device/tplink-8mlzma) + BOARDNAME := OMY-X1 + DEVICE_PROFILE := OMYX1 + TPLINK_HWID := 0x06660201 +endef +TARGET_DEVICES += omy-x1 + define Device/onion-omega $(Device/tplink-16mlzma) BOARDNAME := ONION-OMEGA diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index 9fd5e38..692e48b 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -35,6 +35,7 @@ #define HWID_ANTMINER_S3 0x04440301 #define HWID_GL_INET_V1 0x08000001 #define HWID_GS_OOLITE_V1 0x3C000101 +#define HWID_OMY_X1 0x06660201 #define HWID_ONION_OMEGA 0x04700001 #define HWID_TL_MR10U_V1 0x00100101 #define HWID_TL_MR13U_V1 0x00130101 @@ -430,6 +431,11 @@ static struct board_info boards[] = { .hw_rev = 1, .layout_id = "16Mlzma", }, { + .id = "OMY-X1", + .hw_id = HWID_OMY_X1, + .hw_rev = 1, + .layout_id = "8Mlzma", + }, { .id = "ONION-OMEGA", .hw_id = HWID_ONION_OMEGA, .hw_rev = 1,