From patchwork Tue Dec 1 13:48:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1408843 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=eOItPl98; 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 4Clk6P1c5Nz9sVq for ; Wed, 2 Dec 2020 00:51:41 +1100 (AEDT) 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=9W8NJesJoz46IfHwEixBqWoQeqsXCh+aFzumEeL22OE=; b=eOItPl98+bo0Y1bdTL1skdAvUS hdCt63mTLEdZW66jrF63PG3Twqjy3p1C2Cu+f0nyDJxeEO/UpPT/1C8vPPM9PhpHF5T5Ier5dq0lp Mal/FVp3+Mwn/PWpk6fPtPV4KQ5iMwbPyL6P04nTZRCAfX8QiB7hWqWy+dB4DjKpXimu5IRlpkgJ5 e9zazKkAae951mphtHqEXnU34Id2ORn7EIY62w5h90JlzF7SZmEH76qHm1zQICsPqEWnQaTtqIGyY 7tXgpdOvA1XXihwUJxo7WH1bTZd2dDEweEN4hguReLc1Em/TE6nNRzSPPp7SbYAZnFHKYWdDdu+WC LSbAvn/A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk62A-00018F-TD; Tue, 01 Dec 2020 13:49:34 +0000 Received: from mout.kundenserver.de ([212.227.126.135]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kk627-000163-Dq for openwrt-devel@lists.openwrt.org; Tue, 01 Dec 2020 13:49:33 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MPGBR-1kYDO63lmP-00Pg7Y for ; Tue, 01 Dec 2020 14:49:27 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] ramips: simplify status for ehci/ohci on mt7628 TP-Link devices Date: Tue, 1 Dec 2020 14:48:41 +0100 Message-Id: <20201201134842.2383-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:9CJH77wVicoBKNQu6HXWz0fhTjPgtkVLAfl2NW/cVchNplxEXO1 J1wy2eREmNDor6gDd8izxkaZo99AwlwaaemBq+62YhhnkM9+un6mXdG14IqNK76vHVyxPJa Z0d+nKpniZnCqVZfwsRp7/945TPPE56tcGEU48nrJ9hnmxLhbEoZjPsWvvqt7sGp1tm0PC2 mvikz6FrDJEVzqobmog+Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:kwjz4S4f8S4=:Bn2GeJ+IWva8kk7hzfV0dc fcExQPDvMwyYdCWvoMs2YZfaATxXbma80ZEc7VpRiYm7XXb69Eye6hrjvXtJbHsVFiQJ++gTZ thJsQAKtF60KtDrq/9C+3kKJ+lLWGB0k9o3Dotl1w1Z8wtm6g+I2YSUBEemHRLIwnJaFCFqsG Xbjh3fklo/jkQElTnSc05cxcD/rOUffP9ZpQC8enGbs9VCkaxCsCdzvZCDaVSa+vxBAZ6Ehad 7iqoGQA7DbNfYQLBCREdzn/dy0IoKj6vt7NWr51Zns2q6UUTPMX/HtyBDWIB7daVfHpeznove wA8tTIJmFwpybrj61dOsGnQRMO4HrC7A6grSHtDC3WW3RNwo0UiBWSG4Zpw0TjfKJdievjeRy yaS74l47JsolV9atiMJ4gyYLuTZn1LQ/N7u1B92IMnvrSc4IdyM/a/2NBNuURyFMwbohhwxxq i4peU5sZyw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201201_084931_751076_F21708A0 X-CRM114-Status: GOOD ( 11.16 ) 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.135 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.135 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 At the moment, ehci/ohci is enabled in mt7628an SoC DTSI, then disabled in the TP-Link-specific DTSI files, and finally enabled again in the DTS files of the devices needing it. This on-off-on scheme is hard to grasp on a quick look. Thus, this patch drops the status in the TP-Link-specific DTSI files, having the TP-Link devices treated like the rest of mt7628an DTSes, i.e. ehci/ohci is enabled by default and needs to be disabled explicitly where needed. Signed-off-by: Adrian Schmutzler --- .../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 8 -------- target/linux/ramips/dts/mt7628an_tplink_8m.dtsi | 8 -------- target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts | 8 -------- 16 files changed, 72 insertions(+), 56 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi index 7f7e5ac8b4..b6ce7b1f56 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi @@ -72,14 +72,6 @@ }; }; -&ehci { - status = "disabled"; -}; - -&ohci { - status = "disabled"; -}; - &wmac { status = "okay"; mtd-mac-address = <&rom 0xf100>; diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi index b134badb15..2faf8a87fe 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi @@ -53,14 +53,6 @@ }; }; -&ehci { - status = "disabled"; -}; - -&ohci { - status = "disabled"; -}; - &wmac { status = "okay"; mtd-mac-address = <&factory 0xf100>; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts index f6321bb15f..58743db6b4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -69,6 +69,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &wmac { mtd-mac-address-increment = <(-2)>; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts index 7969bfc733..d76ce34ca9 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts @@ -71,6 +71,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &state_default { gpio { groups = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts index ea53870eeb..4966d56a68 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts @@ -67,6 +67,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &state_default { gpio { groups = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an", diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts index 4ca0cd61a5..11bf903531 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts @@ -69,6 +69,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &state_default { gpio { groups = "i2c", "p0led_an", "p1led_an", "p2led_an", diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts index 8e602331f3..173b4cddca 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts @@ -69,14 +69,6 @@ }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &state_default { gpio { groups = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts index 787abfad55..a142be7870 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts @@ -70,14 +70,6 @@ }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &state_default { gpio { groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "uart1", "wdt", "wled_an"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts index 71e9694dde..7ab19632e8 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts @@ -70,14 +70,6 @@ }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &state_default { gpio { groups = "i2c", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "uart1", "wdt"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts index 21c09ec5d9..de9a48445a 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -58,6 +58,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &state_default { gpio { groups = "p0led_an", "p1led_an", "perst", "refclk", diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts index d6077b4c0e..bce34045c6 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts @@ -33,6 +33,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &state_default { gpio { groups = "refclk", "wdt"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts index f960a0ae8f..8a8ba81ec3 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts @@ -51,6 +51,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &state_default { gpio { groups = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts index c4c83b8549..5c7f9836b6 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts @@ -77,6 +77,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &state_default { gpio { groups = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts index e843672600..9077ec00ce 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts @@ -69,14 +69,6 @@ }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &state_default { gpio { groups = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts index 1fec73d4dc..7abeae9c07 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts @@ -54,6 +54,14 @@ }; }; +&ehci { + status = "disabled"; +}; + +&ohci { + status = "disabled"; +}; + &state_default { gpio { groups = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts index bce394747b..77a68acf34 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts @@ -83,14 +83,6 @@ }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &pcie { status = "okay"; };