From: John Crispin Date: Tue, 26 Apr 2016 11:44:36 +0000 (+0000) Subject: ar71xx: Add support for the OMYlink OMY-G1 X-Git-Tag: reboot^0 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee53a240ac902dc83209008a2671e7fdcf55957a;p=oweals%2Fopenwrt.git ar71xx: Add support for the OMYlink OMY-G1 https://wiki.openwrt.org/toh/omylink/omy-g1 http://www.omylink.com/ Signed-off-by: L. D. Pinney SVN-Revision: 49258 --- 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 b2469bf4d8..39b21ca519 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -399,6 +399,12 @@ om5p-ac) ucidef_set_led_netdev "port2" "port2" "om5pac:blue:wan" "eth1" ;; +omy-g1) + ucidef_set_led_wlan "wlan" "WLAN" "omy:green:wlan" "phy0tpt" + ucidef_set_led_netdev "wan" "WAN" "omy:green:wan" "eth0" + ucidef_set_led_netdev "lan" "LAN" "omy:green:lan" "eth1" + ;; + omy-x1) ucidef_set_led_default "power" "POWER" "omy:green:power" "1" ucidef_set_led_default "wan" "WAN" "omy:green:wan" "eth0" 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 8fdfa0700e..7724a08a0e 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -220,6 +220,7 @@ tl-wr941nd) ;; dir-615-i1 |\ +omy-g1 |\ r6100 |\ smart-300 |\ tl-mr3420-v2 |\ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 1f9bd3f706..77fa398a66 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -218,6 +218,9 @@ get_status_led() { om5p-acv2) status_led="om5pac:blue:power" ;; + omy-g1) + status_led="omy:green:wlan" + ;; omy-x1) status_led="omy:green:power" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 3d4541ea00..588affd9cd 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -123,6 +123,9 @@ tplink_board_detect() { "007260"*) model="TellStick ZNet Lite" ;; + "066601"*) + model="OMYlink OMY-G1" + ;; "066602"*) model="OMYlink OMY-X1" ;; @@ -655,6 +658,9 @@ ar71xx_board_detect() { *"OMY-X1") name="omy-x1" ;; + *"OMY-G1") + name="omy-g1" + ;; *"Onion Omega") name="onion-omega" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index d44ece560c..5334600070 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -340,6 +340,7 @@ platform_check_image() { gl-inet | \ mc-mac1200r | \ minibox-v1 |\ + omy-g1 |\ omy-x1 |\ onion-omega | \ oolite | \ diff --git a/target/linux/ar71xx/config-4.1 b/target/linux/ar71xx/config-4.1 index fa9864339a..40cf453564 100644 --- a/target/linux/ar71xx/config-4.1 +++ b/target/linux/ar71xx/config-4.1 @@ -111,6 +111,7 @@ CONFIG_ATH79_MACH_OM2P=y CONFIG_ATH79_MACH_OM5P=y CONFIG_ATH79_MACH_OM5P_AC=y CONFIG_ATH79_MACH_OM5P_ACv2=y +CONFIG_ATH79_MACH_OMY_G1=y CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index c925ab16c3..9c0eac485f 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -114,6 +114,7 @@ CONFIG_ATH79_MACH_OM2P=y CONFIG_ATH79_MACH_OM5P=y CONFIG_ATH79_MACH_OM5P_AC=y CONFIG_ATH79_MACH_OM5P_ACv2=y +CONFIG_ATH79_MACH_OMY_G1=y CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 8c7764592e..e6879a91f1 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -890,6 +890,16 @@ config ATH79_MACH_OM5P_ACv2 select ATH79_DEV_M25P80 select ATH79_DEV_WMAC +config ATH79_MACH_OMY_G1 + bool "OMYlink OMY G1 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_OMY_X1 bool "OMYlink OMY X1 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 862a2e3c38..61dfccccb1 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -117,6 +117,7 @@ obj-$(CONFIG_ATH79_MACH_OM2P) += mach-om2p.o obj-$(CONFIG_ATH79_MACH_OM5P) += mach-om5p.o obj-$(CONFIG_ATH79_MACH_OM5P_AC) += mach-om5pac.o obj-$(CONFIG_ATH79_MACH_OM5P_ACv2) += mach-om5pacv2.o +obj-$(CONFIG_ATH79_MACH_OMY_G1) += mach-omy-g1.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 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-omy-g1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-omy-g1.c new file mode 100644 index 0000000000..25ca27cba8 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-omy-g1.c @@ -0,0 +1,123 @@ +/* + * OMYlink OMY-G1 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-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define OMY_G1_GPIO_LED_WLAN 13 +#define OMY_G1_GPIO_LED_WAN 18 +#define OMY_G1_GPIO_LED_LAN 19 + +#define OMY_G1_GPIO_USB_POWER 4 + +#define OMY_G1_GPIO_BTN_RESET 17 + +#define OMY_G1_KEYS_POLL_INTERVAL 20 /* msecs */ +#define OMY_G1_KEYS_DEBOUNCE_INTERVAL (3 * OMY_G1_KEYS_POLL_INTERVAL) + +static const char *omy_g1_part_probes[] = { + "tp-link", + NULL, +}; + +static struct flash_platform_data omy_g1_flash_data = { + .part_probes = omy_g1_part_probes, +}; + +static struct gpio_led omy_g1_leds_gpio[] __initdata = { + { + .name = "omy:green:wlan", + .gpio = OMY_G1_GPIO_LED_WLAN, + .active_low = 1, + },{ + .name = "omy:green:wan", + .gpio = OMY_G1_GPIO_LED_WAN, + .active_low = 1, + }, { + .name = "omy:green:lan", + .gpio = OMY_G1_GPIO_LED_LAN, + .active_low = 1, + }, +}; + +static struct gpio_keys_button omy_g1_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = OMY_G1_KEYS_DEBOUNCE_INTERVAL, + .gpio = OMY_G1_GPIO_BTN_RESET, + .active_low = 1, + } +}; + +static void __init omy_g1_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_g1_flash_data); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(omy_g1_leds_gpio), + omy_g1_leds_gpio); + + ath79_register_gpio_keys_polled(1, OMY_G1_KEYS_POLL_INTERVAL, + ARRAY_SIZE(omy_g1_gpio_keys), + omy_g1_gpio_keys); + + ath79_gpio_output_select(OMY_G1_GPIO_USB_POWER, + AR934X_GPIO_OUT_GPIO); + + 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); + + ath79_gpio_output_select(OMY_G1_GPIO_USB_POWER, + AR934X_GPIO_OUT_GPIO); + + gpio_request_one(OMY_G1_GPIO_USB_POWER, + GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, + "USB power"); + + ath79_register_usb(); +} + +MIPS_MACHINE(ATH79_MACH_OMY_G1, "OMY-G1", "OMYlink OMY-G1", + omy_g1_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 0363c88650..b2df9c4977 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -117,6 +117,7 @@ enum ath79_mach_type { ATH79_MACH_OM5P_ACv2, /* OpenMesh OM5P-ACv2 */ ATH79_MACH_OM5P_AN, /* OpenMesh OM5P-AN */ ATH79_MACH_OM5P, /* OpenMesh OM5P */ + ATH79_MACH_OMY_G1, /* OMYlink OMY-G1 */ ATH79_MACH_OMY_X1, /* OMYlink OMY-X1 */ ATH79_MACH_ONION_OMEGA, /* ONION OMEGA */ ATH79_MACH_PB42, /* Atheros PB42 */ diff --git a/target/linux/ar71xx/generic/profiles/omy.mk b/target/linux/ar71xx/generic/profiles/omy.mk index 4055dfc2e9..397de54742 100644 --- a/target/linux/ar71xx/generic/profiles/omy.mk +++ b/target/linux/ar71xx/generic/profiles/omy.mk @@ -5,6 +5,16 @@ # See /LICENSE for more information. # +define Profile/OMYG1 + NAME:=OMYlink OMY-G1 + PACKAGES:= kmod-usb-core kmod-usb2 +endef + +define Profile/OMYX1/Description + Package set optimized for the OMYlink OMY-G1. +endef +$(eval $(call Profile,OMYG1)) + define Profile/OMYX1 NAME:=OMYlink OMY-X1 PACKAGES:= diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 85966db12a..3bf005f50a 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -563,13 +563,20 @@ define Device/minibox-v1 endef TARGET_DEVICES += minibox-v1 +define Device/omy-g1 + $(Device/tplink-16mlzma) + BOARDNAME := OMY-G1 + DEVICE_PROFILE := OMYG1 + TPLINK_HWID := 0x06660101 +endef + define Device/omy-x1 $(Device/tplink-8mlzma) BOARDNAME := OMY-X1 DEVICE_PROFILE := OMYX1 TPLINK_HWID := 0x06660201 endef -TARGET_DEVICES += omy-x1 +TARGET_DEVICES += omy-g1 omy-x1 define Device/onion-omega $(Device/tplink-16mlzma)