From patchwork Mon Aug 3 21:11:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1340562 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=pYXFKaXn; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4BL9dD6WDyz9sTX for ; Tue, 4 Aug 2020 07:14:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=QsyL81zw80Il/KZfVd2u4IpfK4PG4cwsNT/FgQlG6Xw=; b=pYXFKaXn8Zx267GGF7QHqRTczo QmYgN0Uw22L+R4ovG7yVsdmiIFSyz1Iz00AX8MFgYYa/7Yvsw0V79adpxHUQOcNfEYqv2QUmOYVbC wf5LzCaL5+qem8GxksZWxvbHTth7qUasasyKLw03Ew+ZrZYys+pV+eImPicGMGiw37iSv3dICpebI /3HXddh8aCIhUo0W+Qk3yZ33o25dw2pNOO0SCjZoLqMDkjDKxHF5WkvoEXGuc7zIj3ozIP6RpRlsQ Scg+WhTTQeul2O7QBvzhH6K+WORXBOE/eIKgRy/K5KTlO0Ky6Tki/kkngBLXuBj8p7sUvb3mkUsvq klzOb5NQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2hlk-0006V5-A1; Mon, 03 Aug 2020 21:13:16 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2hkc-0005t4-2G for openwrt-devel@lists.openwrt.org; Mon, 03 Aug 2020 21:12:27 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MLiPA-1kKEdL24kS-00Hj2s; Mon, 03 Aug 2020 23:11:59 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ramips: fix mediatek, portmap based on board.d port assignment Date: Mon, 3 Aug 2020 23:11:01 +0200 Message-Id: <20200803211101.22031-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:dDu3ASjV4lri8I3mjdPRBzFcByPqqGRhBzTWGbEV2ebx/khIXAF wP61aK771I/gpjqv3MaxPzrZ+VNJ9bCfJErml3tifHqMeozeqq1l6yYSXDXLLMQQGWvu7he +D8TAEuW9wjt2jp0TLYD335hIzfsDewZUhQH0tgqSFK9uXR/JFHKWwjoxnSAJJ1dnb3iyGB JsFPMbAhXoGV/rywYv+ew== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:IF+RI+D+Nhw=:UqlZK6GzdgzHlGD3hvLXVP oWn935o6t9KFPbWjJSejq/6FmYYamPHPvV+rvW1/Fjg6BRATMfMxYmQNLRHhfqd1HZNc1a/Dk 249TusVDNCeuzwPULXrh/8kn0CoV9oW57o6rzPVcssiWMdp7IgisnSlG/IaWTcMq3jXSU74iL yGHEolvuEiu4Ww7oopzx7b2GBKNi85WbRZmuCwOdoSNQGXu2RqOnIDBcPQ0Uf0mPK/ImX72iU hdwNtAHY5cF7hxFPldEKYLJufvKxOvFbMIOYoNRVSdTSRoqvBeA9JLpQRISOTgKnc12xbNJ/0 BEN3idT6HVJd2doMCLHONphzuAiFkCxaExTndiTOtWyt4hV4R8IFhHzPFIhL3YFPsG1Q1Ehe+ qUoZ4PaKSx1AwoH2cD/hrPAIurvPcRL7Tng7IQpunq0YL4bd0F7IK05DB86lY6bu5Ip5bjC94 wXiY/tTcaz6ob7y+BdekOGOvE4tyXs0L5NDYoMe0J3E4r03dhsVjj+oLOhX9e6PdN/8efqJoX 59sUlnfVfvekxgVcDNB2jydvkUbbm8j9chUWuX/6yOjz0XYE1reulBxRs418rLSLiD/5bfJhK fIOZfazJ9Ye4E4na4ZiYFA13SZiDqiXPAXv9kv1Kx8r5kuDbIxBcG28AfeUZ45ozpLUNRr1PR gFdAB/x4DlLf/o4iccpq8hpkuE2n1bAXYhseegWiLRp6OS04qbFMOX4G9CsBI9DOTR95+wtPL q5eIXua0h3m4h0wxdL6SlSx2L4VeX9eBZsjCxoiKumStQg8b5ohmSCLKOpBNlu61ASuFMo+8c 5DK59/jOFA8i99bCKkohcbVqwJejT2Fe1ci1Isvx5aCTM1yelLtlgq/VJ9mc+ikZHUKYJ0d3b PMi4jHq1moqVDEupIYnA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200803_171206_377012_A8D834B3 X-CRM114-Status: GOOD ( 11.52 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sungbo Eo Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org When comparing to the port assignment in board.d/02_network, many devices seem to use the wrong setup of mediatek,portmap. The corrects the values for mt7620 subtarget based on the location of the wan port. A previous cleanup of obviously wrong values has already been done in d3c0a944059b ("ramips: mt7620/mt7621: remove invalid mediatek,portmap") Cc: Sungbo Eo Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts | 2 +- target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts | 2 +- target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts | 2 +- target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts | 2 -- target/linux/ramips/dts/mt7620a_sanlinking_d240.dts | 2 +- target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts | 2 +- target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi | 2 +- target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts | 2 +- target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts index c9ecf78573..c8d67db884 100644 --- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts +++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts @@ -124,7 +124,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "llllw"; + mediatek,portmap = "wllll"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts index a772bca605..c9b2abd5fb 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts +++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts @@ -134,7 +134,7 @@ ðernet { mtd-mac-address = <&factory 0x4000>; - mediatek,portmap = "llllw"; + mediatek,portmap = "wllll"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts index 8951044f63..fc4b807ffd 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts @@ -76,7 +76,7 @@ mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; port@5 { status = "okay"; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts index 2932b5a3dc..f003df6859 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts @@ -46,6 +46,4 @@ pinctrl-0 = <&ephy_pins>; mtd-mac-address = <&factory 0x28>; - - mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts index 79649a5990..9a9201b6ae 100644 --- a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts +++ b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts @@ -171,7 +171,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index 4aa404542f..53d98cf35a 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts @@ -114,7 +114,7 @@ mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi index 9ebd10bbb0..0e3d689b4f 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi @@ -76,7 +76,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts index 5e610be862..64f32ac5d4 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts @@ -110,7 +110,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac { diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts index e5d3cc0a29..5f6925bb88 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts @@ -96,7 +96,7 @@ ðernet { mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "wllll"; + mediatek,portmap = "llllw"; }; &wmac {