From patchwork Fri Aug 14 13:09:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1345023 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=vmJsbmrm; 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 4BSkP335bpz9sTH for ; Fri, 14 Aug 2020 23:12:07 +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:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject: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=oSkf3MDjwxsg0JASBtOqATSbmFcLo7HRNdcn5T9LmUo=; b=vmJsbmrmVLfLa5ATUn3qBHra7u gjkhi5AizIeLVH8mvma07NxE5ODRvabNCKlrQ/x706OigspDB9t5pWXc9bWeT/DyMp9jm1+fWoAvR 8IKv34l0tfmsJnZEhcH4ka9abFLJFnOuIhzCVMs5xdmAk/RDk+bdUXUa2pKIwOLalLSmHOn8rzocC WL7iPVOKiQd2z22uLOwyvjdj53FeagBa8StgXZemQO1ebis+6NIShEtGtc/0xAAWBl5RkylcjRe9q WxJ07cNaF//A/M68NUydZtqIa3/dolrOh9KRVXVYHDSGoZ9mSE/n9sNme4kW0//kB65dHBQVEecnU SB3ym84w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6ZTR-0000HC-S5; Fri, 14 Aug 2020 13:10:21 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6ZTP-0000Gm-GI for openwrt-devel@lists.openwrt.org; Fri, 14 Aug 2020 13:10:21 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MqapC-1kSU4u2XTs-00mcJy for ; Fri, 14 Aug 2020 15:10:16 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ath79: ar724x: make sure builtin-switch is enabled in DT Date: Fri, 14 Aug 2020 15:09:29 +0200 Message-Id: <20200814130929.13772-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:cmziH5xcLdxWVkWLV13YZfzg5QypCxqYgfkCVi+CwUJ2YJWf1cQ /HCCCvFzq57N2eDiYepTRY1gZFElprJWvy8sURiPtI+3aGyzB2o2Rlbci77pxu4b2Ipyq6Q 5wlLkDc06KXbtyLVJEX7iuZMS5BPoVzFD60nOYqIeSE/Paw85hoNpC7+EsXpiVV3rTuMTIu 6c5SHuStklLBlKVtTXPPQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:EOFHujwQ9Z4=:0ULPzXBrEA+frVlgPTXt2j xRzLcQ/v3y+52MjsNa78MlmKoW92XEf6GHm+tsZ6Bdw1TU3BfFmK8qdijuKM/jmLKnPV6UvNN P9o2nMDSZGprQ/NS83LmN+0MYVzxy/Gv6yVsOycNu70SESNaCwLGz4I0Xr9V3iVhXcFkVTxcx GvqljshAiL70DA2wFCYD/U87D3ywo34V0+UqabldwYrakT3kntb1LKCGK9z+sVDkju2lEuqY1 Ce/hSWqWzmGUppr2qV/YzynNwSTc9oJ/EWJu02ZhDozwd+jsd2dCXcVzghXMBtzwUQMDHV9lf x7olmv/LREuIYlm9Np6oxlxkLCUVgkHZr4g55gJ7N3rUAi8SOBKAjUr4ahiX+LGCUjHqFiTCe y0CBM79RLqcq4d1HVxJY8RaPtOy2q3Lf9hAlghuu0YWvCqx5itGUZl8pmE58jiXXiilmqrMHp Sb+evpT2e0Qz68siVEtyT9JoColowcUjDHE5MaDS7wsPrylMXD34VNJJmuvD2uWy+abLK9eX/ gl21/o20ZOUfXu0qurUvPxJKm1SXpeq9Kp2FiP57UqCA2UssJvWCEco0/M1zlJ9nks4e/hhDK ijnR+m/VKl0HBzBGT6NRWfFsOEXWWDktDz1EgfofJ3eV7W4+6gotxC005dMBtAB50LaSxgCmX h6wpY+k+8q19NdssVwSnDdQi2pOpR8DrPhvM0qmiLr9Mw4A16HVKLQmEqwDd0pfi8FJcVJQPB TkPpGIeifiO+3b9qDsqflMpCzaFWmCj2WEefpw4wrqzOo+stZzWUIKugbdU46+D7c6NLclvAF AmT7lF99YvzlDDvazmIPtf8IXQFnQTOc4lrci63+jdaisH4E/4sTt2x4hB5QGinuvvVuLR3bZ xzRomrA0ntxWcHC+hs8Q== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200814_091019_815729_A015B1C4 X-CRM114-Status: GOOD ( 13.32 ) 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.17.24 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.24 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org On ar7240/ar7241 the mdioX node with the builtin-switch is enabled in the DTSI files, but the parent ethX node is left disabled. It only gets enabled per device or device family, and has not been enabled at all yet for the TP-Link WA devices with ar7240, making the switch unavailable there. This patch makes sure ð0/ð1 nodes are enabled together with the &mdio0/&mdio1 nodes containing the builtin-switch. For ar7240_tplink_tl-wa.dtsi, ð0 is properly hidden again via compatible = "syscon", "simple-mfd"; This partially fixes FS#2887, however it seems dmesg still does not show cable (dis)connect in dmesg for ar7240 TP-Link WA devices. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/ar7240.dtsi | 2 ++ target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts | 2 -- target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts | 4 ---- target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts | 2 -- target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi | 2 -- target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi | 4 ++++ target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi | 2 -- target/linux/ath79/dts/ar7241.dtsi | 2 ++ target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts | 3 +-- target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi | 3 +-- target/linux/ath79/dts/ar7241_tplink.dtsi | 2 -- target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts | 2 -- target/linux/ath79/dts/ar7241_ubnt_unifi.dts | 2 -- 13 files changed, 10 insertions(+), 22 deletions(-) diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index 5382a710f9..730c509d7b 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -59,6 +59,8 @@ }; ð0 { + status = "okay"; + compatible = "qca,ar7240-eth", "syscon"; pll-data = <0x00110000 0x00001099 0x00991099>; diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts index a2d3a99430..cd61bdb45f 100644 --- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts +++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts @@ -156,8 +156,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x120c>; }; diff --git a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts index 537a99b8db..22a1aeb0dc 100644 --- a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts +++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts @@ -139,10 +139,6 @@ }; }; -ð0 { - status = "okay"; -}; - ð1 { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts index c231f4721c..8ae2a128ee 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts +++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts @@ -174,8 +174,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x0>; }; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi index a7e6b49c1f..e270dfa5c2 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi @@ -106,8 +106,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&art 0x0>; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi index ac5a4d5ee9..7f671ee4bf 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi @@ -9,6 +9,10 @@ }; }; +ð0 { + compatible = "syscon", "simple-mfd"; +} + ð1 { mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi index 7621b1d53c..5ceada8375 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi @@ -30,8 +30,6 @@ }; ð0 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <(-1)>; }; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index 59fcd05f5e..4044cdee0e 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -77,6 +77,8 @@ }; ð1 { + status = "okay"; + compatible = "qca,ar7241-eth", "syscon"; pll-data = <0x00110000 0x00001099 0x00991099>; diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts index 4d080c82f8..b4765d1a14 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts @@ -183,9 +183,8 @@ }; ð1 { - status = "okay"; - compatible = "qca,ar7241-eth", "syscon", "simple-mfd"; + mtd-mac-address = <&art 0x6>; }; diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi index 49b869f718..afd521b670 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi @@ -159,9 +159,8 @@ }; ð1 { - status = "okay"; - compatible = "qca,ar7241-eth", "syscon", "simple-mfd"; + mtd-mac-address = <&art 0x6>; }; diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi index bb5d6d95da..f83985cc56 100644 --- a/target/linux/ath79/dts/ar7241_tplink.dtsi +++ b/target/linux/ath79/dts/ar7241_tplink.dtsi @@ -103,8 +103,6 @@ }; ð1 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <1>; }; diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts index 4d2741fbe6..72913bfa2d 100644 --- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts +++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts @@ -150,8 +150,6 @@ }; ð1 { - status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <1>; }; diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts index e7369f0dbf..4bccdd2e4c 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts @@ -126,7 +126,5 @@ }; ð1 { - status = "okay"; - compatible = "syscon", "simple-mfd"; };