From nobody Sat Sep 21 05:49:28 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D7B3C05027 for ; Wed, 1 Feb 2023 18:57:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232283AbjBAS5K (ORCPT ); Wed, 1 Feb 2023 13:57:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232261AbjBAS5I (ORCPT ); Wed, 1 Feb 2023 13:57:08 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DE187D6D6; Wed, 1 Feb 2023 10:57:06 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id k4so7956582edo.12; Wed, 01 Feb 2023 10:57:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XuwRMKnXVYShc3P97jDcb26qSE0+haHJPdzfJ4jdlqw=; b=qmcO0TsXrFJNMB1blLN1OeISeDhx5W/vxRLQQfdyvpO7OLnUH8thmpVDbHr/FlRMJl ABTEEI2YgQuyaKsB+ruF4q8sEkGGlJg0313P52N2Eo0QIIDXh7PGesqm/PBViVMWJOIK nHPx6wtL7dTikU/IBhclK797ushAwPJ40cHnvE0Xk8hgcvG0fDOCpzz01Ic6Y+BunKM1 +58w+IsUC7Lg8/4xjj2/bJhJdL47W+rd1LALXI5l2alh0qSck5hdAWTRPczsSJzjR9o5 uMQzu3kaX2KYqupTPTiJrEG8sZyN2B9H43+U+CZYXxm0nKZ4xJVpeW/yszQVj1Si6Xsb ObqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XuwRMKnXVYShc3P97jDcb26qSE0+haHJPdzfJ4jdlqw=; b=6zW1Y7b/9cfiwLdizYKaqa8HlWDtPmq8pMskNzLZC3ZxNrNhigtSewYUOzmpU+7cKB GNAcC37ICsbE45GampC5k+hpGkLwq1IyIlLGnll74ahsxWRElZUkXMlotXlNizsefYof 4Uvotmml6dLq7S6VKj5JxMxAyCBCjL11aLbuAVpSSoJhGGJnVog4JeLMIzC7mjPw+egs T2DSZkDC41C9wfYoB/BEokKIECCW8ikKKNEjMC6i8ColYMHcniX9X3R4qzbqQxqlJeqT /oDQ6W/SpFb8wGcrqfoOPUy+kNudZGtNlWSsl1zHjV0tVxbfFSVLD4x9bFAhuNRpfaQO 5Dlw== X-Gm-Message-State: AO0yUKVMNYZsFLOFXWq4tmdEtX4nqy2WMUTbdV6YgHqy+G1CpBtj+fAQ x2+7od47nEBTOovr/A0kXk4= X-Google-Smtp-Source: AK7set91GJkEZxaPNp8C1RCo1CWg9qYFPezo1BrwwNKJSy/zr2IdMXM+suS5sMEjj9ygXka+SU820Q== X-Received: by 2002:a50:fb81:0:b0:498:b9ea:1894 with SMTP id e1-20020a50fb81000000b00498b9ea1894mr3819082edq.15.1675277825071; Wed, 01 Feb 2023 10:57:05 -0800 (PST) Received: from arinc9-PC.lan ([37.120.152.236]) by smtp.gmail.com with ESMTPSA id dy25-20020a05640231f900b0049e210884dasm10100883edb.15.2023.02.01.10.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 10:57:04 -0800 (PST) From: arinc9.unal@gmail.com X-Google-Original-From: arinc.unal@arinc9.com To: Rob Herring , Krzysztof Kozlowski , Matthias Brugger Cc: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Wunderlich , erkin.bozoglu@xeront.com, Sean Wang , DENG Qingfang Subject: [PATCH v2 1/5] arm: dts: mt7623: add gmacs to mt7623.dtsi Date: Wed, 1 Feb 2023 21:56:52 +0300 Message-Id: <20230201185656.17164-2-arinc.unal@arinc9.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230201185656.17164-1-arinc.unal@arinc9.com> References: <20230201185656.17164-1-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ar=C4=B1n=C3=A7 =C3=9CNAL There are two gigabit MACs on the MT7623AI and MT7623NI SoCs. Add them to mt7623.dtsi and adjust the DTs that call mt7623.dtsi. Now that there are labels for the MACs, remove them from under ð on the DTs that call mt7623.dtsi. Remove the unnecessary mdio label from Bananapi BPI-R2. Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL --- arch/arm/boot/dts/mt7623.dtsi | 12 +++++++ arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 21 ++++++------ arch/arm/boot/dts/mt7623a-rfb-nand.dts | 21 ++++++------ arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 23 +++++++------ arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 32 +++++++++---------- 5 files changed, 58 insertions(+), 51 deletions(-) diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi index 25d31e40a553..2bc3c49dc3df 100644 --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi @@ -981,6 +981,18 @@ eth: ethernet@1b100000 { #address-cells =3D <1>; #size-cells =3D <0>; status =3D "disabled"; + + gmac0: mac@0 { + compatible =3D "mediatek,eth-mac"; + reg =3D <0>; + status =3D "disabled"; + }; + + gmac1: mac@1 { + compatible =3D "mediatek,eth-mac"; + reg =3D <1>; + status =3D "disabled"; + }; }; =20 crypto: crypto@1b240000 { diff --git a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts b/arch/arm/boot/dts/mt7= 623a-rfb-emmc.dts index e8b4b6d30d19..a64d68b6e165 100644 --- a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts @@ -112,20 +112,19 @@ &crypto { status =3D "okay"; }; =20 -ð { +&gmac0 { status =3D "okay"; + phy-mode =3D "trgmii"; =20 - gmac0: mac@0 { - compatible =3D "mediatek,eth-mac"; - reg =3D <0>; - phy-mode =3D "trgmii"; - - fixed-link { - speed =3D <1000>; - full-duplex; - pause; - }; + fixed-link { + speed =3D <1000>; + full-duplex; + pause; }; +}; + +ð { + status =3D "okay"; =20 mdio-bus { #address-cells =3D <1>; diff --git a/arch/arm/boot/dts/mt7623a-rfb-nand.dts b/arch/arm/boot/dts/mt7= 623a-rfb-nand.dts index 61f5da68d4b0..fac3ca0322c8 100644 --- a/arch/arm/boot/dts/mt7623a-rfb-nand.dts +++ b/arch/arm/boot/dts/mt7623a-rfb-nand.dts @@ -116,20 +116,19 @@ &crypto { status =3D "okay"; }; =20 -ð { +&gmac0 { status =3D "okay"; + phy-mode =3D "trgmii"; =20 - gmac0: mac@0 { - compatible =3D "mediatek,eth-mac"; - reg =3D <0>; - phy-mode =3D "trgmii"; - - fixed-link { - speed =3D <1000>; - full-duplex; - pause; - }; + fixed-link { + speed =3D <1000>; + full-duplex; + pause; }; +}; + +ð { + status =3D "okay"; =20 mdio-bus { #address-cells =3D <1>; diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/= dts/mt7623n-bananapi-bpi-r2.dts index 5008115d2494..1e03a3de654f 100644 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -171,22 +171,21 @@ dpi0_out: endpoint { }; }; =20 -ð { +&gmac0 { status =3D "okay"; + phy-mode =3D "trgmii"; =20 - gmac0: mac@0 { - compatible =3D "mediatek,eth-mac"; - reg =3D <0>; - phy-mode =3D "trgmii"; - - fixed-link { - speed =3D <1000>; - full-duplex; - pause; - }; + fixed-link { + speed =3D <1000>; + full-duplex; + pause; }; +}; + +ð { + status =3D "okay"; =20 - mdio: mdio-bus { + mdio-bus { #address-cells =3D <1>; #size-cells =3D <0>; =20 diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7= 623n-rfb-emmc.dts index bf67a8e9be59..5e328c2a6a6e 100644 --- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts @@ -156,27 +156,25 @@ dpi0_out: endpoint { }; }; =20 -ð { +&gmac0 { status =3D "okay"; + phy-mode =3D "trgmii"; =20 - gmac0: mac@0 { - compatible =3D "mediatek,eth-mac"; - reg =3D <0>; - phy-mode =3D "trgmii"; - - fixed-link { - speed =3D <1000>; - full-duplex; - pause; - }; + fixed-link { + speed =3D <1000>; + full-duplex; + pause; }; +}; =20 - mac@1 { - compatible =3D "mediatek,eth-mac"; - reg =3D <1>; - phy-mode =3D "rgmii"; - phy-handle =3D <&phy5>; - }; +&gmac1 { + status =3D "okay"; + phy-mode =3D "rgmii"; + phy-handle =3D <&phy5>; +}; + +ð { + status =3D "okay"; =20 mdio-bus { #address-cells =3D <1>; --=20 2.37.2 From nobody Sat Sep 21 05:49:28 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FEAEC636D4 for ; Wed, 1 Feb 2023 18:57:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232338AbjBAS5N (ORCPT ); Wed, 1 Feb 2023 13:57:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232262AbjBAS5J (ORCPT ); Wed, 1 Feb 2023 13:57:09 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 715497D6E6; Wed, 1 Feb 2023 10:57:08 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id m8so9492088edd.10; Wed, 01 Feb 2023 10:57:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=916XgVZ9fASoqPZFrOcZBdhhHsdFw2GVlGXOTRIHOcg=; b=j4jCT3RNd4Fl3IhtsLOweL6JFnXgXuaJ/jZ7h5FNY5pcpO0mVtox0Bw4f9DvCnj+Gy TlaDzjmQcLkuQ5UfFWUPAEWCMVbM/Qii1P9+/lfII9nl99vUtkf9Os/1pizWpKOQjnoi lm/VQiytbkIqkefka60dSPUHl72SVAij0U/DbvLRldYFD5pyuGYvtZaqYPveBlWqk/NC HwoeqEjQK/c8BwCYzH4SZDRlqh3qMcu8bPUDYb08FqXAMGz6ap8C5r1ROOGK0pSuO1Jb 5xnmaoxSdB6IxJ5byRjWV6mAMFnUVHJ4n93zietmRiYVRZXXUJn7Pfkcf0QR58k6nQl+ iM+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=916XgVZ9fASoqPZFrOcZBdhhHsdFw2GVlGXOTRIHOcg=; b=yqCXGTuL8dSPQO7weqjzO5XVioWoyoidB8Z5BzaAYBKxMATu/83xIrsFgQf/q2W/uw tmJ1sKE9lTqSx1JnAO/RpqgfkTgtiORy54uiiEhuDXSPzH0zr1z2B3bnlr4657X9Vc3N 57OViRCSkkaL4nSWBTpNCSDReRsG/CTzJh4Yf0QKr/NA/2+RpcRGgMVZOpHyKdpL+adp Hz044yW81Qu/n6livk7tsYxIHrTwu/GzJCh+ai08NNg41SK41lzUJuKkigGayaMh9UNs xgzfsnHw3NZsR4vRxTVIHIwVVf44W0q9QOq2ssJkvP3K2EBaTo1vFne3UcApIibHkvfp H6dA== X-Gm-Message-State: AO0yUKX/44W94Rp21WCYpTxk4KDkfHKb4k6pXsP4O+razBmcfh29Ojv1 83YE4FMRa2O+osGlpS0LNaCHCS/WkkmV9U0E X-Google-Smtp-Source: AK7set+2KbiCTcddKLi6FlDnx9PjS8pp/NRXkaAMusiSZph4MTOlIO/4yg8XJu6FxV/4hlEXoGy56g== X-Received: by 2002:a05:6402:1950:b0:4a2:260f:3bbe with SMTP id f16-20020a056402195000b004a2260f3bbemr3759756edz.23.1675277826917; Wed, 01 Feb 2023 10:57:06 -0800 (PST) Received: from arinc9-PC.lan ([37.120.152.236]) by smtp.gmail.com with ESMTPSA id dy25-20020a05640231f900b0049e210884dasm10100883edb.15.2023.02.01.10.57.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 10:57:06 -0800 (PST) From: arinc9.unal@gmail.com X-Google-Original-From: arinc.unal@arinc9.com To: Rob Herring , Krzysztof Kozlowski , Matthias Brugger Cc: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Wunderlich , erkin.bozoglu@xeront.com, Sean Wang , DENG Qingfang Subject: [PATCH v2 2/5] arm: dts: mt7623: add mt7530 switch to mt7623a.dtsi Date: Wed, 1 Feb 2023 21:56:53 +0300 Message-Id: <20230201185656.17164-3-arinc.unal@arinc9.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230201185656.17164-1-arinc.unal@arinc9.com> References: <20230201185656.17164-1-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ar=C4=B1n=C3=A7 =C3=9CNAL The MT7530 switch is included as a part of the multi-chip module on the MT7623AI SoC. Add it to mt7623a.dtsi and adjust DTs that call mt7623a.dtsi. Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL --- arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 87 +++++++------------------- arch/arm/boot/dts/mt7623a-rfb-nand.dts | 87 +++++++------------------- arch/arm/boot/dts/mt7623a.dtsi | 74 ++++++++++++++++++++++ 3 files changed, 118 insertions(+), 130 deletions(-) diff --git a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts b/arch/arm/boot/dts/mt7= 623a-rfb-emmc.dts index a64d68b6e165..5654284bab01 100644 --- a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts @@ -112,74 +112,31 @@ &crypto { status =3D "okay"; }; =20 -&gmac0 { - status =3D "okay"; - phy-mode =3D "trgmii"; +&switch0 { + ports { + port@0 { + status =3D "okay"; + label =3D "lan0"; + }; =20 - fixed-link { - speed =3D <1000>; - full-duplex; - pause; - }; -}; + port@1 { + status =3D "okay"; + label =3D "lan1"; + }; =20 -ð { - status =3D "okay"; + port@2 { + status =3D "okay"; + label =3D "lan2"; + }; + + port@3 { + status =3D "okay"; + label =3D "lan3"; + }; =20 - mdio-bus { - #address-cells =3D <1>; - #size-cells =3D <0>; - - switch@0 { - compatible =3D "mediatek,mt7530"; - reg =3D <0>; - mediatek,mcm; - resets =3D <ðsys MT2701_ETHSYS_MCM_RST>; - reset-names =3D "mcm"; - core-supply =3D <&mt6323_vpa_reg>; - io-supply =3D <&mt6323_vemc3v3_reg>; - - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; - - port@0 { - reg =3D <0>; - label =3D "lan0"; - }; - - port@1 { - reg =3D <1>; - label =3D "lan1"; - }; - - port@2 { - reg =3D <2>; - label =3D "lan2"; - }; - - port@3 { - reg =3D <3>; - label =3D "lan3"; - }; - - port@4 { - reg =3D <4>; - label =3D "wan"; - }; - - port@6 { - reg =3D <6>; - label =3D "cpu"; - ethernet =3D <&gmac0>; - phy-mode =3D "trgmii"; - - fixed-link { - speed =3D <1000>; - full-duplex; - }; - }; - }; + port@4 { + status =3D "okay"; + label =3D "wan"; }; }; }; diff --git a/arch/arm/boot/dts/mt7623a-rfb-nand.dts b/arch/arm/boot/dts/mt7= 623a-rfb-nand.dts index fac3ca0322c8..afd177b3b516 100644 --- a/arch/arm/boot/dts/mt7623a-rfb-nand.dts +++ b/arch/arm/boot/dts/mt7623a-rfb-nand.dts @@ -116,74 +116,31 @@ &crypto { status =3D "okay"; }; =20 -&gmac0 { - status =3D "okay"; - phy-mode =3D "trgmii"; +&switch0 { + ports { + port@0 { + status =3D "okay"; + label =3D "lan0"; + }; =20 - fixed-link { - speed =3D <1000>; - full-duplex; - pause; - }; -}; + port@1 { + status =3D "okay"; + label =3D "lan1"; + }; =20 -ð { - status =3D "okay"; + port@2 { + status =3D "okay"; + label =3D "lan2"; + }; =20 - mdio-bus { - #address-cells =3D <1>; - #size-cells =3D <0>; - - switch@0 { - compatible =3D "mediatek,mt7530"; - reg =3D <0>; - mediatek,mcm; - resets =3D <ðsys MT2701_ETHSYS_MCM_RST>; - reset-names =3D "mcm"; - core-supply =3D <&mt6323_vpa_reg>; - io-supply =3D <&mt6323_vemc3v3_reg>; - - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; - - port@0 { - reg =3D <0>; - label =3D "lan0"; - }; - - port@1 { - reg =3D <1>; - label =3D "lan1"; - }; - - port@2 { - reg =3D <2>; - label =3D "lan2"; - }; - - port@3 { - reg =3D <3>; - label =3D "lan3"; - }; - - port@4 { - reg =3D <4>; - label =3D "wan"; - }; - - port@6 { - reg =3D <6>; - label =3D "cpu"; - ethernet =3D <&gmac0>; - phy-mode =3D "trgmii"; - - fixed-link { - speed =3D <1000>; - full-duplex; - }; - }; - }; + port@3 { + status =3D "okay"; + label =3D "lan3"; + }; + + port@4 { + status =3D "okay"; + label =3D "wan"; }; }; }; diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi index d304b62d24b5..fbb5731a3a53 100644 --- a/arch/arm/boot/dts/mt7623a.dtsi +++ b/arch/arm/boot/dts/mt7623a.dtsi @@ -17,8 +17,82 @@ &crypto { power-domains =3D <&scpsys MT7623A_POWER_DOMAIN_ETH>; }; =20 +&gmac0 { + status =3D "okay"; + phy-mode =3D "trgmii"; + + fixed-link { + speed =3D <1000>; + full-duplex; + pause; + }; +}; + ð { + status =3D "okay"; power-domains =3D <&scpsys MT7623A_POWER_DOMAIN_ETH>; + + mdio: mdio-bus { + #address-cells =3D <1>; + #size-cells =3D <0>; + + switch0: switch@0 { + compatible =3D "mediatek,mt7530"; + reg =3D <0>; + mediatek,mcm; + resets =3D <ðsys MT2701_ETHSYS_MCM_RST>; + reset-names =3D "mcm"; + core-supply =3D <&mt6323_vpa_reg>; + io-supply =3D <&mt6323_vemc3v3_reg>; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + status =3D "disabled"; + reg =3D <0>; + label =3D "swp0"; + }; + + port@1 { + status =3D "disabled"; + reg =3D <1>; + label =3D "swp1"; + }; + + port@2 { + status =3D "disabled"; + reg =3D <2>; + label =3D "swp2"; + }; + + port@3 { + status =3D "disabled"; + reg =3D <3>; + label =3D "swp3"; + }; + + port@4 { + status =3D "disabled"; + reg =3D <4>; + label =3D "swp4"; + }; + + port@6 { + reg =3D <6>; + label =3D "cpu"; + ethernet =3D <&gmac0>; + phy-mode =3D "trgmii"; + + fixed-link { + speed =3D <1000>; + full-duplex; + }; + }; + }; + }; + }; }; =20 &nandc { --=20 2.37.2 From nobody Sat Sep 21 05:49:28 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 177B5C05027 for ; Wed, 1 Feb 2023 18:57:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232301AbjBAS5P (ORCPT ); Wed, 1 Feb 2023 13:57:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232299AbjBAS5L (ORCPT ); Wed, 1 Feb 2023 13:57:11 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 037787CCB5; Wed, 1 Feb 2023 10:57:09 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id f7so11480177edw.5; Wed, 01 Feb 2023 10:57:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zQ2TcNqdLFOAVmLP5M0cy768AQ+LH1yHfkoCaBZyfHc=; b=RdzQM9UxdzXFHlTygjnB05HaKkfeckDFaoC0sQILZA8OjUcHc46SFz7RLBKN/jXBE6 sBSjrAxxSLEPVES5uw9VQVE7SsY8rcvVATXQ/kOT+o6zRsoNLYMG9G9SEAd8qICEofgP 138j1q+gS5EwFUGWHaMPifgTEMUvZVPZZ+1qrZyStRMn8odP7pPH1oVDIxpNEtJkUA+1 SowWyQkWJ9cyG9mr+K6BQ0EvAjLWTbg4cYrNbCgHOfOhtocVQmQ+hmweRqQgbm1p3vdc 6Ioru6D1UEh4F7Vwk9mc/+pE/P2P44cnRJs3gVIGl0W9j+7jHF0M1g99hL+mdYFPUFW3 NJaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zQ2TcNqdLFOAVmLP5M0cy768AQ+LH1yHfkoCaBZyfHc=; b=RaXZexS5rfNWSeg5ua3pjjB1vBOQSY5uZPOu+H2LKmJKYwHk9Hwuh29kl3gomx5S25 P6gW+6JvJ84q7Viu/DVPPbqVKhAXV6+HeprJiMtE8ayzphBPUxhP5sIypPHhWnawWjJe yhroMpMC278g9mdV/p8V2Wk8ni6dJcn4rz9n8LGF2TzYJFPkjIlRU48NtbmTj4ENyLza j/d5YXFzQEDDc2knTKyjgitFV4SX9OQhYRKqkUqQQrbwZe2Q34kvZoFeM7yJQhKcWhPK xq4boyDtP1Tej/WN/bZZduI/Cc5JIjhv9qFoRqyvosaP9SNnrc0FPL+KtJdaTI2B86JI Qlsw== X-Gm-Message-State: AO0yUKVN+qq7onEkpz1rW+TN2UgUQ39krER2PovAAzVMtF8wCm7px9XO nRwkpVREoVqD8MzI5Gc2hkQ= X-Google-Smtp-Source: AK7set9skUgnmhi1dYpijfocB0rlZ+p6Q6V2+UCwzZI/enK59SfnsKbNtQF2gvImI2edWtLPb7F3Cg== X-Received: by 2002:a05:6402:35c7:b0:499:cc32:6a52 with SMTP id z7-20020a05640235c700b00499cc326a52mr8873964edc.16.1675277828527; Wed, 01 Feb 2023 10:57:08 -0800 (PST) Received: from arinc9-PC.lan ([37.120.152.236]) by smtp.gmail.com with ESMTPSA id dy25-20020a05640231f900b0049e210884dasm10100883edb.15.2023.02.01.10.57.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 10:57:08 -0800 (PST) From: arinc9.unal@gmail.com X-Google-Original-From: arinc.unal@arinc9.com To: Rob Herring , Krzysztof Kozlowski , Matthias Brugger Cc: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Wunderlich , erkin.bozoglu@xeront.com, Sean Wang , DENG Qingfang Subject: [PATCH v2 3/5] arm: dts: mt7623: change mt7530 switch address Date: Wed, 1 Feb 2023 21:56:54 +0300 Message-Id: <20230201185656.17164-4-arinc.unal@arinc9.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230201185656.17164-1-arinc.unal@arinc9.com> References: <20230201185656.17164-1-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ar=C4=B1n=C3=A7 =C3=9CNAL In the case of muxing phy0 of the MT7530 switch, the switch and the phy will have the same address on the mdio bus, 0. This causes the ethernet driver to fail since devices on the mdio bus cannot share an address. Any address can be used for the switch, therefore, change the switch address to 0x1f. Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL --- arch/arm/boot/dts/mt7623a.dtsi | 4 ++-- arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 4 ++-- arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi index fbb5731a3a53..dd522e508eb3 100644 --- a/arch/arm/boot/dts/mt7623a.dtsi +++ b/arch/arm/boot/dts/mt7623a.dtsi @@ -36,9 +36,9 @@ mdio: mdio-bus { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0: switch@0 { + switch0: switch@1f { compatible =3D "mediatek,mt7530"; - reg =3D <0>; + reg =3D <0x1f>; mediatek,mcm; resets =3D <ðsys MT2701_ETHSYS_MCM_RST>; reset-names =3D "mcm"; diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/= dts/mt7623n-bananapi-bpi-r2.dts index 1e03a3de654f..dc9b4f99eb8b 100644 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -189,9 +189,9 @@ mdio-bus { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch@0 { + switch@1f { compatible =3D "mediatek,mt7530"; - reg =3D <0>; + reg =3D <0x1f>; reset-gpios =3D <&pio 33 0>; core-supply =3D <&mt6323_vpa_reg>; io-supply =3D <&mt6323_vemc3v3_reg>; diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7= 623n-rfb-emmc.dts index 5e328c2a6a6e..6b0c3d1006ab 100644 --- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts @@ -185,9 +185,9 @@ phy5: ethernet-phy@5 { phy-mode =3D "rgmii-rxid"; }; =20 - switch@0 { + switch@1f { compatible =3D "mediatek,mt7530"; - reg =3D <0>; + reg =3D <0x1f>; reset-gpios =3D <&pio 33 0>; core-supply =3D <&mt6323_vpa_reg>; io-supply =3D <&mt6323_vemc3v3_reg>; --=20 2.37.2 From nobody Sat Sep 21 05:49:28 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35032C38142 for ; Wed, 1 Feb 2023 18:57:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232261AbjBAS5Z (ORCPT ); Wed, 1 Feb 2023 13:57:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232344AbjBAS5N (ORCPT ); Wed, 1 Feb 2023 13:57:13 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA8D47F303; Wed, 1 Feb 2023 10:57:11 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id bk15so54230959ejb.9; Wed, 01 Feb 2023 10:57:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yR+4t71uvOrNwbzfT6rMlJz6ZARDL9nMPAtxzDTp2O8=; b=hAE9xFTNI1lnwpIuE40P7XM3zdPBSWs6oC1K4LIIIi3QjXVHNPzxV0kaKrVltoyw1a nr3pcOkDNFrPu6kunubdEh0/jBS5AkgdI0jnU/1TadEQm4SFGN5nsqT9v90fjBmd/mU+ jK2DrE/mUYa5oJaoSnXXmTh3BpKMu3qRl2gegfK/I51wfNok4JCz0nijSTBHqkQJ1KMr QC9X1Oj0ZBCu6aglye0rahH1MWdFaacyXZQOVt9GC7g0mGMOfYoxEJL/UtylpGx9nfA9 /0hqC4xxAMVvUIuY4PDD1KDCzYcgI1jUPwxHYRWBC/zfce2oh62xKctLUcE0wYrVyY2A 94Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yR+4t71uvOrNwbzfT6rMlJz6ZARDL9nMPAtxzDTp2O8=; b=bZ26BUng2jOzIidDsqmkLQLfFUCNhdCdNeZYcybP3CLWDcbhq/NSZEwnifFG9D180l IMPJZf6klhIeIqC727rPNnPhVuR7IyP/WJThLJufJvzA9FbjHcx9Y6QvDJP2BF3wfZVF LMJRjuCIS9tAMVbIvtU7KgcNaYtXMmYbJuTJo3FZaldgGRO/U3jQVu37L+JfUMbivB89 LSnFuB1qoX0tXMc9j1/zOsvL+Tsk/brSFZPhAxk3ru9Z6u/ruxkjVdlhOUz8zq873sYu +Xic2YouW96obLzudcX9tAz3+BYIm7oYFKwx9g1M27XyAW0tJqsNbT/0fv6f0tycjGjd StFg== X-Gm-Message-State: AO0yUKUmb/V9GHLy29Z/+b0EiUw0uSk/vWNWQVvWVGEh3Z1VNP+ML2ht bq8AKYUkH72jWY0xrrT7Z5M= X-Google-Smtp-Source: AK7set8Vhjr4qyafeIDSZSc3Eb1qSQaqtTm5MaSmxLU9rQXRso14GgRsj8YWD3pwarp3ZDG7RMCdYw== X-Received: by 2002:a17:906:34d3:b0:82e:a57b:cc9b with SMTP id h19-20020a17090634d300b0082ea57bcc9bmr7270754ejb.24.1675277830106; Wed, 01 Feb 2023 10:57:10 -0800 (PST) Received: from arinc9-PC.lan ([37.120.152.236]) by smtp.gmail.com with ESMTPSA id dy25-20020a05640231f900b0049e210884dasm10100883edb.15.2023.02.01.10.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 10:57:09 -0800 (PST) From: arinc9.unal@gmail.com X-Google-Original-From: arinc.unal@arinc9.com To: Rob Herring , Krzysztof Kozlowski , Matthias Brugger Cc: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Wunderlich , erkin.bozoglu@xeront.com, Sean Wang , DENG Qingfang Subject: [PATCH v2 4/5] arm: dts: mt7623: mux phy0 on Bananapi BPI-R2 Date: Wed, 1 Feb 2023 21:56:55 +0300 Message-Id: <20230201185656.17164-5-arinc.unal@arinc9.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230201185656.17164-1-arinc.unal@arinc9.com> References: <20230201185656.17164-1-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ar=C4=B1n=C3=A7 =C3=9CNAL Mux the MT7530 switch's phy0 to gmac5 which is wired to the SoC's gmac1. This achieves 2 Gbps total bandwidth to the CPU using the second RGMII. With this, the interface name to access phy0 changes from wan to eth1. Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL --- arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/= dts/mt7623n-bananapi-bpi-r2.dts index dc9b4f99eb8b..64700253fd35 100644 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -182,6 +182,12 @@ fixed-link { }; }; =20 +&gmac1 { + status =3D "okay"; + phy-mode =3D "rgmii"; + phy-handle =3D <ðphy0>; +}; + ð { status =3D "okay"; =20 @@ -189,6 +195,10 @@ mdio-bus { #address-cells =3D <1>; #size-cells =3D <0>; =20 + ethphy0: ethernet-phy@0 { + reg =3D <0>; + }; + switch@1f { compatible =3D "mediatek,mt7530"; reg =3D <0x1f>; @@ -200,11 +210,6 @@ ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { - reg =3D <0>; - label =3D "wan"; - }; - port@1 { reg =3D <1>; label =3D "lan0"; --=20 2.37.2 From nobody Sat Sep 21 05:49:28 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C1D2C38142 for ; Wed, 1 Feb 2023 18:57:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232406AbjBAS5a (ORCPT ); Wed, 1 Feb 2023 13:57:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232363AbjBAS5P (ORCPT ); Wed, 1 Feb 2023 13:57:15 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B22880FB1; Wed, 1 Feb 2023 10:57:13 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id m2so53815173ejb.8; Wed, 01 Feb 2023 10:57:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wCfu6pa2GszeTfCc5RgYlhyJYQ9sWCYCud+ludrzzVc=; b=ZWH6Ar7ilBCAgENdaD2nDd5SFGMw9TpK1MYhGrmFx0FRswNziyBZezdAFW4G+XihTV DZTFZoQ6F6amvc+844+dV4hDBAQVK0rJpnLY6Zfd8w7t8Xpekbc4vRS5Cif/pnAOn12A 9VMA2AxbsvzsP70NjJv+QHn2ullhmx3dZpQOyClVYEC80pWyE7jJjrYRV72G7q337qZ7 hkqBviIq9wpmQfmH96wxi2bcAA0WU5gvEbosZ57vmUPm5pJN8/xOO67pb079zr2L3oHI TLBt1VCUNGGw/SzhWc3cVaj3c6dE8mKNRi6N9IliDhvbXzlYmAS5MT9iTDdNNaJYZhpQ vuvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wCfu6pa2GszeTfCc5RgYlhyJYQ9sWCYCud+ludrzzVc=; b=wOu7DcPORsgKEJjcxrjD4fC4e/d1j0GnzOkpvStU6f5H/Z55nhtjPfgcwrAZKgqFbf eYtyNGnY8jSC5ddEvBLsHsJllkIDPBNxW7EUmwXWZUml3ERRmyk8YQSRNQR9Lfh2ZXVJ 1GmzquwbcaeweLb8VWMXyjA75DMohYz2xTSPpMSaHjjJpBBVBEShf5Dtujsxy/k//HnO thhgu0t4QQQQFjiBtEMiCr9tnfKZhE71s1RhdjQ8KyU4eZeFcMSAFVKsOo4czfkE7i2i nQgf1G2BsVodP79VZ8gVER+V4kCl4nf+DFLsa9OBTWeql/Kkqt69xJVHiVkBLAy8/7ok VgSw== X-Gm-Message-State: AO0yUKVm6nb7lO0evsZoCVWvPWTW6THc1H0uXicwCqX5ovtZi7cc1aCj mJZbC1XHZmRhPwfCVum3RSg= X-Google-Smtp-Source: AK7set/SM3JG6I2M8EAecQOB0PUjU28U25qsAi1G9D05Ilp8bswF5flMqVIH6qRv0DQ3Sxo2vUYFlw== X-Received: by 2002:a17:907:2d28:b0:88d:f759:15ae with SMTP id gs40-20020a1709072d2800b0088df75915aemr4150126ejc.42.1675277831685; Wed, 01 Feb 2023 10:57:11 -0800 (PST) Received: from arinc9-PC.lan ([37.120.152.236]) by smtp.gmail.com with ESMTPSA id dy25-20020a05640231f900b0049e210884dasm10100883edb.15.2023.02.01.10.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 10:57:11 -0800 (PST) From: arinc9.unal@gmail.com X-Google-Original-From: arinc.unal@arinc9.com To: Rob Herring , Krzysztof Kozlowski , Matthias Brugger Cc: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Wunderlich , erkin.bozoglu@xeront.com, Sean Wang , DENG Qingfang Subject: [PATCH v2 5/5] arm: dts: mt7623: enable flow control on port@6 Date: Wed, 1 Feb 2023 21:56:56 +0300 Message-Id: <20230201185656.17164-6-arinc.unal@arinc9.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230201185656.17164-1-arinc.unal@arinc9.com> References: <20230201185656.17164-1-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ar=C4=B1n=C3=A7 =C3=9CNAL Flow control needs to be enabled on both sides to work. It is already enabled on gmac0, enable it on port@6 too. Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL --- arch/arm/boot/dts/mt7623a.dtsi | 1 + arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi index dd522e508eb3..2a50b5c0c933 100644 --- a/arch/arm/boot/dts/mt7623a.dtsi +++ b/arch/arm/boot/dts/mt7623a.dtsi @@ -88,6 +88,7 @@ port@6 { fixed-link { speed =3D <1000>; full-duplex; + pause; }; }; }; diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7= 623n-rfb-emmc.dts index 6b0c3d1006ab..34994f3f5a4b 100644 --- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts @@ -230,6 +230,7 @@ port@6 { fixed-link { speed =3D <1000>; full-duplex; + pause; }; }; }; --=20 2.37.2