From patchwork Sat Nov 7 01:09:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. D. Pinney" X-Patchwork-Id: 541200 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 6FBD31401F0 for ; Sat, 7 Nov 2015 12:11:04 +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=ujvcl+iq; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D0F4528BFD1; Sat, 7 Nov 2015 02:08:14 +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 7A94F28BFD0 for ; Sat, 7 Nov 2015 02:08:09 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-ob0-f174.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-ob0-f174.google.com (mail-ob0-f174.google.com [209.85.214.174]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 7 Nov 2015 02:08:06 +0100 (CET) Received: by obctp1 with SMTP id tp1so105601120obc.2 for ; Fri, 06 Nov 2015 17:09: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; bh=LZNqSf5k+unvlIeb2p0mbTWNRF8lvL318YeL3YdOZ0I=; b=ujvcl+iqQ9vytyAiyd6rP4O6TQRaLjYYOSwIjVKEw/J+KeP/VpcB5xMnCT42N+q3OY 79VCRIHEEoBXxumAgGObYyJE09B8RVHf0eIj+OeWXsn3UI2rBaGiPhEMzozfW2Hq5azN 4LaIvH6GwlrxMgroS8HDfa5mLAM33kqucWJEM+rioSGsOepHfJ0ehkDP7fS6Jss/ZvQd CvZrhW1qZ4vCYlR5LoFC2MqTNWFCaaes+cFn2DLwZgaURAx2WbjnXPved6CcHV6TI3qQ Hz2aOj5RmRIvBrpQh51MEcefWgHFKj/tCgS703AcI0jNIUc63bKdJB6u9oen95TyxAFJ gGZA== X-Received: by 10.182.117.233 with SMTP id kh9mr10077158obb.44.1446858594407; Fri, 06 Nov 2015 17:09:54 -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 z10sm1326337oig.25.2015.11.06.17.09.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 17:09:54 -0800 (PST) From: "L. D. Pinney" To: OpenWrt Development List Date: Fri, 6 Nov 2015 19:09:40 -0600 Message-Id: <1446858580-20280-1-git-send-email-ldpinney@gmail.com> X-Mailer: git-send-email 2.6.1 Subject: [OpenWrt-Devel] [PATCH] CC: ramips: Backport support for ZBT WG2626 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" Backport of r47351 Signed-off-by: L. D. Pinney --- target/linux/ramips/base-files/etc/board.d/01_leds | 5 +++ target/linux/ramips/base-files/etc/board.d/02_network | 3 +- target/linux/ramips/base-files/etc/diag.sh | 3 ++ target/linux/ramips/base-files/lib/ramips.sh | 3 ++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 5 +-- target/linux/ramips/dts/ZBT-WG2626.dts | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ target/linux/ramips/image/Makefile | 7 +++- target/linux/ramips/mt7621/profiles/zbt.mk | 19 +++++++++++ 8 files changed, 168 insertions(+), 4 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 545bd70..5946f98 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -258,6 +258,11 @@ case $board in set_usb_led "lenovo:blue:usb" set_wifi_led "lenovo:blue:wifi" ;; + zbt-wg2626) + ucidef_set_led_default "power" "power" "zbt-wg2626:green:power" "1" + set_wifi_led "zbt-wg2626:green:air" + set_usb_led "zbt-wg2626:green:usb" + ;; zte-q7) set_wifi_led "zte:blue:status" ;; diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 19ef3f7..d7d016b 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -145,7 +145,8 @@ ramips_setup_interfaces() wsr-1166 | \ wt1520 | \ xiaomi-miwifi-mini |\ - y1) + y1|\ + zbt-wg2626) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t" diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index d32d692..0747d70 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -247,6 +247,9 @@ get_status_led() { y1s) status_led="lenovo:blue:power" ;; + zbt-wg2626) + status_led="zbt-wg2626:green:power" + ;; zte-q7) status_led="zte:red:status" ;; diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 70f22a7..e4276d9 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -403,6 +403,9 @@ ramips_board_detect() { *"Zbtlink ZBT-WA05") name="zbt-wa05" ;; + *"ZBT-WG2626") + name="zbt-wg2626" + ;; *"ZBT WR8305RT") name="wr8305rt" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 11fee85..2f64d8c 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -126,8 +126,9 @@ platform_check_image() { xiaomi-miwifi-mini |\ y1 |\ y1s |\ - zte-q7 |\ - zbt-wa05) + zbt-wa05 |\ + zbt-wg2626 |\ + zte-q7) [ "$magic" != "27051956" ] && { echo "Invalid image type." return 1 diff --git a/target/linux/ramips/dts/ZBT-WG2626.dts b/target/linux/ramips/dts/ZBT-WG2626.dts new file mode 100644 index 0000000..6170454 --- /dev/null +++ b/target/linux/ramips/dts/ZBT-WG2626.dts @@ -0,0 +1,127 @@ +/dts-v1/; + +/include/ "mt7621.dtsi" + +/ { + compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc"; + model = "ZBT-WG2626"; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x1c000000>, <0x20000000 0x4000000>; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + sdhci@10130000 { + status = "okay"; + }; + + palmbus@1E000000 { + spi@b00 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "w25q128"; + reg = <0 0>; + linux,modalias = "m25p80"; + spi-max-frequency = <10000000>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0xfb0000>; + }; + + }; + }; + + i2c@900 { + compatible = "ralink,i2c-mt7621"; + reg = <0x900 0x100>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c_pins>; + status = "okay"; + }; + }; + + pcie@1e140000 { + status = "okay"; + + pcie0 { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + device_type = "pci"; + mediatek,mtd-eeprom = <&factory 0x8000>; + mediatek,2ghz = <0>; + }; + }; + + pcie1 { + mt76@1,0 { + reg = <0x0000 0 0 0 0>; + device_type = "pci"; + mediatek,mtd-eeprom = <&factory 0x0000>; + mediatek,5ghz = <0>; + }; + }; + }; + + ethernet@1e100000 { + mtd-mac-address = <&factory 0xe000>; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + reset { + label = "reset"; + gpios = <&gpio0 18 1>; + linux,code = <0x198>; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + + status { + label = "zbt-wg2626:green:status"; + gpios = <&gpio0 24 1>; + }; + }; + + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "wdt", "rgmii2", "wdt rst", "jtag", "mdio"; + ralink,function = "gpio"; + }; + }; + }; +}; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index b4d0897..0dd46ca 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -928,7 +928,7 @@ endif # ifeq ($(SUBTARGET),mt7621) - TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 + TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 zbt-wg2626 endif define Device/mt7621 @@ -974,6 +974,11 @@ define Device/pbr-m1 IMAGE_SIZE := $(ralink_default_fw_size_16M) endef +define Device/zbt-wg2626 + DTS := ZBT-WG2626 + IMAGE_SIZE := $(ralink_default_fw_size_16M) +endef + # # MT7628 Profiles # diff --git a/target/linux/ramips/mt7621/profiles/zbt.mk b/target/linux/ramips/mt7621/profiles/zbt.mk new file mode 100644 index 0000000..cf9beff --- /dev/null +++ b/target/linux/ramips/mt7621/profiles/zbt.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/ZBT-WG2626 + NAME:=ZBT-WG2626 Device + PACKAGES:=\ + kmod-usb-core kmod-usb3 kmod-sdhci-mt7620 \ + kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci \ + kmod-usb3-mt7621 +endef + +define Profile/ZBT-WG2626/Description + Package set for ZBT-WG2626 device +endef +$(eval $(call Profile,ZBT-WG2626))