From patchwork Sat May 25 14:53:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hoffmann X-Patchwork-Id: 1105342 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=3e8.eu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DDLaDOXD"; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=3e8.eu header.i=@3e8.eu header.b="vVQAFSlQ"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45B5pd04wrz9s55 for ; Sun, 26 May 2019 00:53:44 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=dUeCibcmqCCW6nDn8LI+Hpqcgy2jU8nkWelUmZvww1E=; b=DDLaDOXDDPqrpr V16DtWRHvLbZB/jqdNV/tHPfJSzR0GUmiDSrDQJfBnifQvFtvrtFHujSQuvkoH7ZaSbZ4zX5HERQO EjcWSESveCqYIuXjdvAmmDzRCfpzQEL2LVSC5CiomlsJCHv8vBD744nvC+f4o/uY5pQRZZfu/jvEw PeULqkhMtUGr56aGO9GqWLod9H8ZOI7iCE8j/pdmah152V4lsyOpS7TFKqLv8iwWqnFga+TgYZLwZ JQzm8WLIWEet7d1+lmk+8vnFbeCIqp/bZ/iM0WonUmAWVNsQrFXPm7iInghsBeRO2AtLCQG2R/U58 ZWYZ4U/uKQcU9nrcgGtQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hUY30-0004F0-FU; Sat, 25 May 2019 14:53:22 +0000 Received: from srv4.3e8.eu ([193.25.101.238]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hUY2v-0004E7-FW for openwrt-devel@lists.openwrt.org; Sat, 25 May 2019 14:53:20 +0000 Received: from localhost.localdomain (p200300C6CF1098A0A4681A9B853BC5F2.dip0.t-ipconnect.de [IPv6:2003:c6:cf10:98a0:a468:1a9b:853b:c5f2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by srv4.3e8.eu (Postfix) with ESMTPSA id 77CED60081; Sat, 25 May 2019 16:53:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=3e8.eu; s=mail20170724; t=1558795985; bh=3BVrMMnQeC4v7G+jhZBxjRaeFJi0UzrCUVUu2aoOuaA=; h=From:To:Cc:Subject:Date:From; b=vVQAFSlQkh4RU8/wk1219wlCMR+KCL5H+/JnsQnGb3ipxV6aJqMFg7HxlhCSzYl/w V3Ah6QIGgokVOGkr98noEBSXmBdlLGEuEGbSHMTE0o7A8ux6Z7ZM7DPg2wMwNzcPV/ VHJ42Bq3VtYKNi258XaezzOO8KPqr2tzlP1spvq+PDlA8+XNuYh+/rZq9TAIk9bEi5 gcvvBqfwIBZx/5EHiB/czD4Zy5QKOYa227nSYTAMJ9OSGwRfpunlF1NFlxzMl06G95 e7gNJa7Wh32GSf6jnlDHObcgYy569+HPX2OmO82495kMoiqIp+KX0JqGKScuohcXB1 I4mtlscMRLliA== From: jan@3e8.eu To: openwrt-devel@lists.openwrt.org Date: Sat, 25 May 2019 16:53:03 +0200 Message-Id: <20190525145303.6574-1-jan@3e8.eu> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190525_075317_962741_15BE5F8D X-CRM114-Status: GOOD ( 13.95 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH] ramips: create R6220 dtsi and improve WNDR3700v5 support X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Hoffmann MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Jan Hoffmann The R6220 and WNDR3700v5 are identical apart from using NAND/SPI flash and having a different casing. This moves the common bits into R6220.dtsi, based on the existing R6220 dts. Now all LEDs work on WNDR3700v5 and the ethernet MAC addresses are correct. Signed-off-by: Jan Hoffmann --- .../ramips/base-files/etc/board.d/01_leds | 5 +- .../ramips/base-files/etc/board.d/02_network | 3 +- target/linux/ramips/dts/R6220.dts | 127 +++--------------- target/linux/ramips/dts/R6220.dtsi | 120 +++++++++++++++++ target/linux/ramips/dts/WNDR3700V5.dts | 109 +++------------ target/linux/ramips/image/mt7621.mk | 3 +- 6 files changed, 161 insertions(+), 206 deletions(-) create mode 100644 target/linux/ramips/dts/R6220.dtsi 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 ccbe53d770..ce9e87fb9d 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -282,8 +282,9 @@ px-4885-8M) set_wifi_led "px-4885:orange:wifi" ;; r6220|\ -netgear,r6350) - ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2 +netgear,r6350|\ +wndr3700v5) + ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" set_wifi_led "$boardname:green:wifi" ;; rakwireless,rak633) 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 dcc7b4a747..0c10118dfb 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -614,7 +614,8 @@ ramips_setup_macs() wan_mac=$(mtd_get_mac_binary factory 46) ;; r6220|\ - netgear,r6350) + netgear,r6350|\ + wndr3700v5) wan_mac=$(mtd_get_mac_binary factory 4) lan_mac=$(macaddr_add "$wan_mac" 1) ;; diff --git a/target/linux/ramips/dts/R6220.dts b/target/linux/ramips/dts/R6220.dts index 335351c825..35042494e7 100644 --- a/target/linux/ramips/dts/R6220.dts +++ b/target/linux/ramips/dts/R6220.dts @@ -1,6 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7621.dtsi" +#include "R6220.dtsi" #include #include @@ -8,87 +9,26 @@ / { compatible = "netgear,r6220", "mediatek,mt7621-soc"; model = "Netgear R6220"; +}; - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x8000000>; - }; - - chosen { - bootargs = "console=ttyS0,57600"; - }; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "r6220:green:power"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; - }; - - usb { - label = "r6220:green:usb"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; - trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; - linux,default-trigger = "usbport"; - }; - - internet { - label = "r6220:green:wan"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; - }; - - wifi { - label = "r6220:green:wifi"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; - }; - - wps { - label = "r6220:green:wps"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; - }; - }; - - keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; - - wps { - label = "wps"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; +&led_power { + label = "r6220:green:power"; +}; - wifi { - label = "wifi"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; +&led_usb { + label = "r6220:green:usb"; +}; - reset { - label = "reset"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; - }; +&led_internet { + label = "r6220:green:wan"; +}; - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; +&led_wifi { + label = "r6220:green:wifi"; +}; - usbpower { - gpio-export,name = "usbpower"; - gpio-export,output = <1>; - gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; - }; - }; +&led_wps { + label = "r6220:green:wps"; }; &nand { @@ -134,36 +74,3 @@ }; }; }; - -&pcie { - status = "okay"; -}; - -&pcie0 { - mt76@0,0 { - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x8000>; - ieee80211-freq-limit = <5000000 6000000>; - }; -}; - -&pcie1 { - mt76@0,0 { - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x0000>; - ieee80211-freq-limit = <2400000 2500000>; - }; -}; - -ðernet { - mtd-mac-address = <&factory 0x00000004>; -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "uart3", "jtag"; - ralink,function = "gpio"; - }; - }; -}; diff --git a/target/linux/ramips/dts/R6220.dtsi b/target/linux/ramips/dts/R6220.dtsi new file mode 100644 index 0000000000..8e840fee9d --- /dev/null +++ b/target/linux/ramips/dts/R6220.dtsi @@ -0,0 +1,120 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { + compatible = "mediatek,mt7621-soc"; + + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x8000000>; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + }; + + led_usb: usb { + gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; + trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; + linux,default-trigger = "usbport"; + }; + + led_internet: internet { + gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + }; + + led_wifi: wifi { + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + }; + + led_wps: wps { + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <20>; + + wps { + label = "wps"; + gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + + wifi { + label = "wifi"; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + + reset { + label = "reset"; + gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + }; + + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + + usbpower { + gpio-export,name = "usbpower"; + gpio-export,output = <1>; + gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +&pcie1 { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0000>; + ieee80211-freq-limit = <2400000 2500000>; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x00000004>; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "uart3", "uart2", "jtag", "wdt"; + ralink,function = "gpio"; + }; + }; +}; diff --git a/target/linux/ramips/dts/WNDR3700V5.dts b/target/linux/ramips/dts/WNDR3700V5.dts index 4ef0d70f18..7b9812fc52 100644 --- a/target/linux/ramips/dts/WNDR3700V5.dts +++ b/target/linux/ramips/dts/WNDR3700V5.dts @@ -1,6 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7621.dtsi" +#include "R6220.dtsi" #include #include @@ -8,70 +9,26 @@ / { compatible = "netgear,wndr3700-v5", "mediatek,mt7621-soc"; model = "Netgear WNDR3700v5"; +}; - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x8000000>; - }; - - chosen { - bootargs = "console=ttyS0,57600 maxcpus=2"; - }; - - leds { - compatible = "gpio-leds"; - - wps { - label = "wndr3700v5:green:wps"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "wndr3700v5:green:power"; - gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; - }; - }; - - keys { - compatible = "gpio-keys-polled"; - poll-interval = <20>; - - wps { - label = "wndr3700v5:wps"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; +&led_power { + label = "wndr3700v5:green:power"; +}; - wifi { - label = "wndr3700v5:wifi"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; +&led_usb { + label = "wndr3700v5:green:usb"; +}; - reset { - label = "wndr3700v5:reset"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; - }; +&led_internet { + label = "wndr3700v5:green:wan"; +}; - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; +&led_wifi { + label = "wndr3700v5:green:wifi"; +}; - usbpower { - gpio-export,name = "usbpower"; - gpio-export,output = <1>; - gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; - }; - }; +&led_wps { + label = "wndr3700v5:green:wps"; }; &spi0 { @@ -113,35 +70,3 @@ }; }; }; - -&pcie { - status = "okay"; -}; - -&pcie0 { - mt76@0,0 { - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x8000>; - ieee80211-freq-limit = <5000000 6000000>; - }; -}; - -&pcie1 { - mt76@0,0 { - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x0000>; - }; -}; - -ðernet { - mtd-mac-address = <&factory 0x0000000c>; -}; - -&pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "rgmii2", "mdio", "wdt"; - ralink,function = "gpio"; - }; - }; -}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index c21b9b4b63..2eb7feb5bf 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -550,7 +550,8 @@ define Device/wndr3700v5 IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | pad-to $$$$(BLOCKSIZE) | \ sercom-footer | pad-to 128 | zip WNDR3700v5.bin | sercom-seal DEVICE_TITLE := Netgear WNDR3700v5 - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic + DEVICE_PACKAGES := \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += wndr3700v5