From patchwork Thu Sep 26 12:44:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1167903 X-Patchwork-Delegate: daniel@makrotopia.org 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=none (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="aW/HaQHR"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46fF4W1n45z9sDB for ; Thu, 26 Sep 2019 22:44:42 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JpS6SGu7/dTPnIhbNj44VZZgTMKVjZHIU47T1KsUuEc=; b=aW/HaQHRYrwgQ6 H2ldJsDAigHFLPNl/YWwrW4nD3b3XMGaUWVI6Y9CWUL8NS0WOVZJ3aEBvmI+8VrWlTdMwlNhXNMkr VyKyLW3HvDzjPTZJPGnUiciBDvCHW6Fo7HWxVPd/vQz3PF4CJPOi6jcRpef/ziftLegDvmaILz+vv ESp197v1j3OXQO7SspHT5PjvBtVR/uP7r2Q8BpwPK8VMDTGKCmDJxaZR5lGBCo2OfpgLzd688DN6W TM3ZPBsknYLQHAkqrJ78mhXuwNdd0bbpabsSVIl7wU0NDzTQbe9AmEmagsFvLcqP4PaAvra31uTC1 yQA6m4QJEQLObSc7+/WQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iDT8N-0003bL-Tn; Thu, 26 Sep 2019 12:44:35 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iDT8K-0003ag-QA for openwrt-devel@lists.openwrt.org; Thu, 26 Sep 2019 12:44:34 +0000 Received: from buildfff.adridolf.com ([188.192.136.78]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MkpjD-1hkR1x43Jf-00mIW3 for ; Thu, 26 Sep 2019 14:44:27 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Thu, 26 Sep 2019 14:44:22 +0200 Message-Id: <20190926124423.35613-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:DAUIIE++HnN1WWUvEEJWOsqFroxeUmshtVsHzNjka540dgKhUuV ajFayGg5ToC8002og6OijombN2QSqAr/tm68us86XVE2YxtO7yvIs8nSdEITlP7klcmimQD EV/IDnStmOBL9qgWrrAi5prJpstIKB9UHnJDnY2eCK4KRy7eJXXLJChBebkr3Q/BiDlAI+i 8rPfQ0iYtSgMWEToIQj6g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:nxK6MrZO+vc=:dFZ6vt41+mn0ULN/XCeuwH FHdxX3nZy8VRiTLDIZfirbrL1uM0ukNVgg4mKCg4MbGquhiBWFnzbEm0uvKmrmju9ceQMHW8R A+L+K1H6OS/w3tR8zfMZbynnPiFiGxA97RGhv7gPq9/tOlza2P4NywWn/fXjCAtrVKqUXGFv1 5+8UdupvhUCrYEAkHMbsB9zBhiBytHrbelwDawwBzhWiaUXiOG720BX12prFFfE2QwaYqWW4n 3ftnproF1P9tggg2JagIGonrX9vVgXr81WAQUYeEyPGMo2PIPMxuofxvQ5G/o3fVtiXlxboWI aUwwJYQ27t5rPOQpyucPHXSC5yFgBRl0Z+pDzNBmupajkJTOKhDR5I8vk+OVemAG975jJ569I 0BzyvKAt0MZjvpZ1OzngOKnTMMeYbFpxUgDvhGcx1pTkyJ7DvEJldWUitRWJxlv7/JpH/ni0s SYNYGcZcqd9ghVy0gznOP1Nh7uvY8qKwSAfqFqRMrZzqhp4oUV/4S5I6rPdWyIXw4xhLZrr2h FxjkQmpTrLxaz9iNdPDjnNj+bvFa/uopWZ840HEmllU32GZhTOxnJyMGmiWYE1UWw63YN1lOv 7IFoYrer3vCaQWjzXF3oa4G0Hxy5b9+P4cB3/mk8mLA4/ngZlEI7iEZWrpseDpNfSQA0zaf/H /IQByxw22pWBMh/38Jz5zYXmbFPRAcxLllBl2aXwXTD5r6Kxm+1rsDHu6s3q8mJupmkMV7+H6 UbwTH3q0j1A+2U7CreDjffTPp+Ze7KTolkROCNlLyoWNFdumd9USZuMInbWG2fkarG6Mghzfe szlmazmlcojIXoMeIFY0o7JXfg2nxIbaOsGvWNyvv4zaAJdBp0O1ciVoIsL8UWV2A+HmBKe5E VeXbZv1IgCqZCb+IGCWUL4TSc2Q5y3ueA1F/CsYZk= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190926_054433_144254_67430795 X-CRM114-Status: UNSURE ( 8.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] Subject: [OpenWrt-Devel] [PATCH v2 1/2] ramips: harmonize device vendor Zbtlink X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Spelling of Zbtlink varies across image definitions and DTS files. This patch uses Zbtlink consistently and also updates the model in DTS files to contain the vendor in all cases. This patch is cosmetical, as there should be no dependencies on device model name in ramips anymore. Signed-off-by: Adrian Schmutzler --- v2: No changes, just added second patch --- .../linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts | 2 +- .../linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts | 2 +- .../linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts | 2 +- .../linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts | 2 +- .../linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts | 2 +- target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts | 2 +- target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts | 2 +- target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts | 2 +- .../linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts | 2 +- .../linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts | 2 +- target/linux/ramips/image/mt7621.mk | 10 +++++----- target/linux/ramips/image/mt76x8.mk | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts b/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts index e2eb5b6329..a05e8d4b47 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts @@ -37,7 +37,7 @@ / { compatible = "zbtlink,we1026-5g-16m", "ralink,mt7620a-soc"; - model = "ZBT WE1026-5G (16M)"; + model = "Zbtlink ZBT-WE1026-5G (16M)"; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index 70ad0f0b58..665dd5ba3c 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts @@ -7,7 +7,7 @@ / { compatible = "zbtlink,zbt-ape522ii", "ralink,mt7620a-soc"; - model = "ZBT-APE522II"; + model = "Zbtlink ZBT-APE522II"; chosen { bootargs = "console=ttyS0,115200"; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts index 7f2b2646b2..d115b8a096 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts @@ -4,7 +4,7 @@ / { compatible = "zbtlink,zbt-we826-16m", "zbtlink,zbt-we826", "ralink,mt7620a-soc"; - model = "ZBT-WE826 (16M)"; + model = "Zbtlink ZBT-WE826 (16M)"; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts index e7cdcab5e9..94a67dd5de 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts @@ -4,7 +4,7 @@ / { compatible = "zbtlink,zbt-we826-32m", "zbtlink,zbt-we826", "ralink,mt7620a-soc"; - model = "ZBT-WE826 (32M)"; + model = "Zbtlink ZBT-WE826 (32M)"; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts index 243126125b..2496a16a29 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts @@ -5,7 +5,7 @@ / { compatible = "zbtlink,zbt-we826-e", "zbtlink,zbt-we826", "ralink,mt7620a-soc"; - model = "ZBT-WE826-E"; + model = "Zbtlink ZBT-WE826-E"; /delete-node/ leds; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts index 819c851c73..d7c48c6d9f 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts @@ -7,7 +7,7 @@ / { compatible = "zbtlink,zbt-we1326", "mediatek,mt7621-soc"; - model = "ZBT-WE1326"; + model = "Zbtlink ZBT-WE1326"; aliases { label-mac-device = &wifi1; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts index 7973626fad..b1d3e4e812 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts @@ -7,7 +7,7 @@ / { compatible = "zbtlink,zbt-we3526", "mediatek,mt7621-soc"; - model = "ZBT-WE3526"; + model = "Zbtlink ZBT-WE3526"; chosen { bootargs = "console=ttyS0,115200"; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts index ca2044f73e..1a2a89a31e 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts @@ -7,7 +7,7 @@ / { compatible = "zbtlink,zbt-wg2626", "mediatek,mt7621-soc"; - model = "ZBT-WG2626"; + model = "Zbtlink ZBT-WG2626"; aliases { led-boot = &led_status; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts index 9bf8b9bdb2..a9bd9180fd 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts @@ -4,7 +4,7 @@ / { compatible = "zbtlink,zbt-wg3526-16m", "zbtlink,zbt-wg3526", "mediatek,mt7621-soc"; - model = "ZBT-WG3526 (16M)"; + model = "Zbtlink ZBT-WG3526 (16M)"; }; &firmware { diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts index 8e49e48b2b..e7add46d32 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts @@ -4,7 +4,7 @@ / { compatible = "zbtlink,zbt-wg3526-32m", "zbtlink,zbt-wg3526", "mediatek,mt7621-soc"; - model = "ZBT-WG3526 (32M)"; + model = "Zbtlink ZBT-WG3526 (32M)"; }; &firmware { diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 816652ddaa..582fe3284e 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -805,7 +805,7 @@ TARGET_DEVICES += youku_yk-l2 define Device/zbtlink_zbt-we1326 MTK_SOC := mt7621 IMAGE_SIZE := 16064k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1326 DEVICE_PACKAGES := \ kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 wpad-basic @@ -816,7 +816,7 @@ TARGET_DEVICES += zbtlink_zbt-we1326 define Device/zbtlink_zbt-we3526 MTK_SOC := mt7621 IMAGE_SIZE := 16064k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE3526 DEVICE_PACKAGES := \ kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ @@ -827,7 +827,7 @@ TARGET_DEVICES += zbtlink_zbt-we3526 define Device/zbtlink_zbt-wg2626 MTK_SOC := mt7621 IMAGE_SIZE := 16064k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG2626 DEVICE_PACKAGES := \ kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \ @@ -839,7 +839,7 @@ TARGET_DEVICES += zbtlink_zbt-wg2626 define Device/zbtlink_zbt-wg3526-16m MTK_SOC := mt7621 IMAGE_SIZE := 16064k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 DEVICE_VARIANT := 16M DEVICE_PACKAGES := \ @@ -852,7 +852,7 @@ TARGET_DEVICES += zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-32m MTK_SOC := mt7621 IMAGE_SIZE := 32448k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 DEVICE_VARIANT := 32M DEVICE_PACKAGES := \ diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 3179adc472..9ab16db064 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -578,7 +578,7 @@ TARGET_DEVICES += xiaomi_miwifi-nano define Device/zbtlink_zbt-we1226 MTK_SOC := mt7628an IMAGE_SIZE := 7872k - DEVICE_VENDOR := ZBTlink + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1226 endef TARGET_DEVICES += zbtlink_zbt-we1226 From patchwork Thu Sep 26 12:44:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1167904 X-Patchwork-Delegate: daniel@makrotopia.org 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=none (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JEnSKJ2A"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46fF4k3svGz9sDB for ; Thu, 26 Sep 2019 22:44:54 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=/3Tbm9UAj3/EEIo0I5I2inrFS/IYrnxdyU5aiLOv2/0=; b=JEnSKJ2AThykdNzcGktZ8tlfly gfx+El2Kpd/Ebld4VhSyvFUj0hnjW/b2OxTP8OWs0qm3tEsm5yL5ea8t6Nxr/1bXJs7JDonJlDI0U 9h3syO03gEceBbBi889t7ZZh7SrHJmYh7AvhjzsLhToSW3EviWOCB4weZt0uuf4XOec3W6rbY2TQO AsJfEP3WbGTTIdw9olR51kG0lFtBKoggHwFc2WlGTskdTKGpAl+wStgrINhcdkVqzR1pdaoYMrnHU jbbom6rgJ0xMGFZHIQB22hPIjhKmCrFcawt/PH8a0qzyyn3O3sUp82o4mVc+ID+4BEJiGmzM4N1dE /kIeWt7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iDT8T-0003ny-74; Thu, 26 Sep 2019 12:44:41 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iDT8L-0003ah-8L for openwrt-devel@lists.openwrt.org; Thu, 26 Sep 2019 12:44:35 +0000 Received: from buildfff.adridolf.com ([188.192.136.78]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MEVBa-1iOyNl0OK2-00G06g for ; Thu, 26 Sep 2019 14:44:27 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Thu, 26 Sep 2019 14:44:23 +0200 Message-Id: <20190926124423.35613-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190926124423.35613-1-freifunk@adrianschmutzler.de> References: <20190926124423.35613-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:0O/4qBdp7WSYsgObz+7L2zQR4AxP6MtCzsuI7gUpdLAPsYU0+Ld rZlf7h/anYfS8EA4xWIOcBR9kYKmKCfrXSFGV+VLk9w8t1FkX2JVlXuuphixCfnHj7zvDTT 8IYQIN7MhCGFOmsVWmGE2cY9pZ8Lk/ldLlSgWKcoIm9C+Bbnkyt7Km/lwylt3yVnM1mXcWX UYlbrvnZBV4USWevC/yLQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:LPmmYa9qAes=:kgXNi9LKBIQoq1uWcRtftV nIMXeIy+jtqPI2xbGjP2clgYfIfTWfB0FahgRlPzJbky6z9HfgH58ycATsdvyosXQ/nQ8IyUC RYbHwxKy4t0oiuHhM6+Cfu9VHubIjOIVavA1P/iZhnVC4Vt1XaOLaFMM5/L6aFChuLgKB6e+W KNnPXtb467d6wF4Z5QDCzTv6e0nJ4GG7TuW3mNDV8SYtrZBHE6uSFx/9VY9DGD44rWoWRRGFU XUNlIM89BFJWcVf5lASwtg8CwcOkYCJYxQl5XyMEbvrdO1F7Sxsz+Rg6jKLFvx2C9gOeQt+nI uswiSDxssCRZb2dgQ1mED4/ov6niG7A+ZwAujy7BUCNwwXsWj4ArI52Z3udr19xaY8CYgrNSn lbkVRS8+PBzOSad/SASd7e8DicW+vEFtLDaFkzTcif5qJRseFN2CPmUAW+e0vhHH4ut3LEGQd vEFdycck7wxjJUFoThJrMB1w+PqmpJqnl5JrJAsjJBvhbOiiupplExHz/XgD5SULnoUwKofUh hKHhbP516ytiz5vV+V7W3SYyBtR9uddNYWwE6/IMD5BwUdMxhTtWYIzICmtLaHIe5XCgqMPZU IY9iOJ4l4ix8Bl5ZQ/7q4c2xp58xqvlk5z+DdGZkZNo2/SmgSwWNsi0IwSIN7dce4JO6WDOHP gJOKpU0IkYl8NFnFjLBW3Fgef1BDYZC17AsovtbhagGuBU4nnaxywT5vSRhHPH3jzRi73afQF Iy+y8DY4tfpxXFkA7pz4+lz3XpD89eAHZx9Kr9uVoI/EW33YBq+Y/U7QqsSv8YzkmKm5yuRDO WBxRZEGqOjXOEk13zc1stRTwmlYg6RZZQx39AoJdar6I8uZ/6WX8McD/1zR155+TSAgPMiROw 9BZDoex3T0JvZYkS25llirEeNSpS+g7A/993SJ39o= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190926_054433_584071_463903A1 X-CRM114-Status: UNSURE ( 9.03 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.133 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH v2 2/2] ramips: apply consistent device name/compatible to ZBT-WE1026-5G X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org All Zbtlink ramips devices except the ZBT-WE1026-5G include the zbt-/ZBT- prefix in their model name. This changes ZBT-WE1026-5G to also follow that scheme. The patch moves some block to keep alphatical order. Signed-off-by: Adrian Schmutzler --- v2: new in v2 This is not tested on device and is only meant as base for Kristian Evensen's patches (DTSI rearrangement and addition of WE1026-H). --- .../ramips/base-files/etc/board.d/01_leds | 8 +++---- .../ramips/base-files/etc/board.d/02_network | 2 +- ... => mt7620a_zbtlink_zbt-we1026-5g-16m.dts} | 4 ++-- ...tsi => mt7620a_zbtlink_zbt-we1026-5g.dtsi} | 2 +- target/linux/ramips/image/mt7620.mk | 22 +++++++++---------- 5 files changed, 19 insertions(+), 19 deletions(-) rename target/linux/ramips/dts/{mt7620a_zbtlink_we1026-5g-16m.dts => mt7620a_zbtlink_zbt-we1026-5g-16m.dts} (95%) rename target/linux/ramips/dts/{mt7620a_zbtlink_we1026-5g.dtsi => mt7620a_zbtlink_zbt-we1026-5g.dtsi} (98%) 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 46202b4117..f8a270b6b0 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -445,10 +445,6 @@ youku,yk1) set_wifi_led "$boardname:blue:air" ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10" ;; -zbtlink,we1026-5g-16m) - ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0" - set_wifi_led "we1026-5g:green:wifi" - ;; zbtlink,zbt-ape522ii) ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$boardname:green:wlan2g4" "wlan1" ucidef_set_led_netdev "sys1" "wlan1" "$boardname:green:sys1" "wlan1" "tx rx" @@ -461,6 +457,10 @@ zbtlink,zbt-we826-16m|\ zbtlink,zbt-we826-32m) set_wifi_led "zbt-we826:green:wifi" ;; +zbtlink,zbt-we1026-5g-16m) + ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0" + set_wifi_led "we1026-5g:green:wifi" + ;; zbtlink,zbt-we1226) set_wifi_led "$boardname:green:wlan" ucidef_set_led_switch "lan1" "LAN1" "$boardname:green:lan1" "switch0" "0x01" 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 947bf1428d..ae05c827bc 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -451,7 +451,7 @@ ramips_setup_interfaces() "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "9@eth0" ;; sparklan,wcr-150gn|\ - zbtlink,we1026-5g-16m) + zbtlink,zbt-we1026-5g-16m) ucidef_add_switch "switch0" \ "0:lan" "6t@eth0" ;; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g-16m.dts similarity index 95% rename from target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts rename to target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g-16m.dts index a05e8d4b47..feba29763b 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g-16m.dts @@ -33,10 +33,10 @@ /dts-v1/; -#include "mt7620a_zbtlink_we1026-5g.dtsi" +#include "mt7620a_zbtlink_zbt-we1026-5g.dtsi" / { - compatible = "zbtlink,we1026-5g-16m", "ralink,mt7620a-soc"; + compatible = "zbtlink,zbt-we1026-5g-16m", "ralink,mt7620a-soc"; model = "Zbtlink ZBT-WE1026-5G (16M)"; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi similarity index 98% rename from target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi rename to target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi index e7e64e251a..68a74ede39 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi @@ -37,7 +37,7 @@ #include / { - compatible = "zbtlink,we1026-5g", "ralink,mt7620a-soc"; + compatible = "zbtlink,zbt-we1026-5g", "ralink,mt7620a-soc"; chosen { bootargs = "console=ttyS0,115200"; diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 36898c99bc..6543958bd0 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -943,17 +943,6 @@ define Device/yukai_bocco endef TARGET_DEVICES += yukai_bocco -define Device/zbtlink_we1026-5g-16m - MTK_SOC := mt7620a - IMAGE_SIZE := 16064k - DEVICE_VENDOR := Zbtlink - DEVICE_MODEL := ZBT-WE1026-5G - DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 - SUPPORTED_DEVICES += we1026-5g-16m -endef -TARGET_DEVICES += zbtlink_we1026-5g-16m - define Device/zbtlink_zbt-ape522ii MTK_SOC := mt7620a IMAGE_SIZE := 15872k @@ -984,6 +973,17 @@ define Device/zbtlink_zbt-wa05 endef TARGET_DEVICES += zbtlink_zbt-wa05 +define Device/zbtlink_zbt-we1026-5g-16m + MTK_SOC := mt7620a + IMAGE_SIZE := 16064k + DEVICE_VENDOR := Zbtlink + DEVICE_MODEL := ZBT-WE1026-5G + DEVICE_VARIANT := 16M + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 + SUPPORTED_DEVICES += we1026-5g-16m zbtlink,we1026-5g-16m +endef +TARGET_DEVICES += zbtlink_zbt-we1026-5g-16m + define Device/zbtlink_zbt-we2026 MTK_SOC := mt7620n IMAGE_SIZE := 7552k