From nobody Sat Sep 21 18:03:15 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 37D14C32774 for ; Thu, 25 Aug 2022 08:24:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238939AbiHYIYu (ORCPT ); Thu, 25 Aug 2022 04:24:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239817AbiHYIYX (ORCPT ); Thu, 25 Aug 2022 04:24:23 -0400 Received: from sender4-op-o14.zoho.com (sender4-op-o14.zoho.com [136.143.188.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03B9FA59B3; Thu, 25 Aug 2022 01:24:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661415820; cv=none; d=zohomail.com; s=zohoarc; b=Mb/fkCxenUAqdFk+tmcu52nRqx3BIfj9SR/US9kyR2wMlHRiZNFODEGzUT52O8qRU9Zt79xl9HjYeQAV0bm1M+E+UaPD6G5qmL+CWU5IMUFBkXpao1kh+KGZdWvbpAYX1867FLBqvvVGLkKozNX4LSW+rlK3fpnEXr76DGWgMFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661415820; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=NDsnxls+oOuuu0L1onGF6H3pSNX7sZLktEqGSNXnztI=; b=l5EQGz4hynONuk1XgnpnElLH06Yd4+1aZ2aU64Q/t1RnpcybO3mprSJY0wRXed+OjX4IKf+us+9PWPJkdKDhDlPa4p+vhHeYMREStWrrh0dwdFdxK5Aug5lVg7G8dJoPgJ0GPPjbYoVGmMRa+hm9A05+vt97pk3pG2Btxohg3L8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=arinc9.com; spf=pass smtp.mailfrom=arinc.unal@arinc9.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1661415820; s=zmail; d=arinc9.com; i=arinc.unal@arinc9.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Reply-To; bh=NDsnxls+oOuuu0L1onGF6H3pSNX7sZLktEqGSNXnztI=; b=grzOVlq88Am3+tSnOQ+7KmqdzqjYcymWLb8SywM7qnAz2fBhByGGGb+uRMOGPhMv J48ZstOxpCklmMGvZmqjcyngeMHibLN/hYvFb0gRma9aKLPkMsPT4dCOUeFfv+2pjNv VHgM30Joc2uhPZ8SOtxMeqaMKdNuyVPzq2PqCB88= Received: from arinc9-PC.lan (37.120.152.236 [37.120.152.236]) by mx.zohomail.com with SMTPS id 166141581766988.72998549995748; Thu, 25 Aug 2022 01:23:37 -0700 (PDT) From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Matthias Brugger , Sean Wang , Landen Chao , DENG Qingfang , Frank Wunderlich , Luiz Angelo Daros de Luca , Sander Vanheule , Daniel Golle , erkin.bozoglu@xeront.com, Sergio Paracuellos Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= , Krzysztof Kozlowski Subject: [PATCH v6 4/6] dt-bindings: net: dsa: mediatek,mt7530: update examples Date: Thu, 25 Aug 2022 11:22:59 +0300 Message-Id: <20220825082301.409450-5-arinc.unal@arinc9.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220825082301.409450-1-arinc.unal@arinc9.com> References: <20220825082301.409450-1-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update the examples on the binding. - Add examples which include a wide variation of configurations. - Make example comments YAML comment instead of DT binding comment. - Add interrupt controller to the examples. Include header file for interrupt. - Change reset line for MT7621 examples. - Pretty formatting for the examples. - Change switch reg to 0. - Change port labels to fit the example, change port 4 label to wan. Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL Reviewed-by: Krzysztof Kozlowski --- .../bindings/net/dsa/mediatek,mt7530.yaml | 402 +++++++++++++++--- 1 file changed, 347 insertions(+), 55 deletions(-) diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml= b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml index 16ddda314b5c..e81b3dce874b 100644 --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml @@ -208,42 +208,111 @@ allOf: unevaluatedProperties: false =20 examples: + # Example 1: Standalone MT7530 - | #include + mdio { #address-cells =3D <1>; #size-cells =3D <0>; + switch@0 { compatible =3D "mediatek,mt7530"; reg =3D <0>; =20 + reset-gpios =3D <&pio 33 0>; + core-supply =3D <&mt6323_vpa_reg>; io-supply =3D <&mt6323_vemc3v3_reg>; - reset-gpios =3D <&pio 33 GPIO_ACTIVE_HIGH>; =20 ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; + port@0 { reg =3D <0>; - label =3D "lan0"; + label =3D "lan1"; }; =20 port@1 { reg =3D <1>; - label =3D "lan1"; + label =3D "lan2"; }; =20 port@2 { reg =3D <2>; - label =3D "lan2"; + label =3D "lan3"; }; =20 port@3 { reg =3D <3>; + label =3D "lan4"; + }; + + port@4 { + reg =3D <4>; + label =3D "wan"; + }; + + port@6 { + reg =3D <6>; + label =3D "cpu"; + ethernet =3D <&gmac0>; + phy-mode =3D "rgmii"; + + fixed-link { + speed =3D <1000>; + full-duplex; + pause; + }; + }; + }; + }; + }; + + # Example 2: MT7530 in MT7623AI SoC + - | + #include + + mdio { + #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>; + + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + label =3D "lan1"; + }; + + port@1 { + reg =3D <1>; + label =3D "lan2"; + }; + + port@2 { + reg =3D <2>; label =3D "lan3"; }; =20 + port@3 { + reg =3D <3>; + label =3D "lan4"; + }; + port@4 { reg =3D <4>; label =3D "wan"; @@ -254,85 +323,219 @@ examples: label =3D "cpu"; ethernet =3D <&gmac0>; phy-mode =3D "trgmii"; + fixed-link { speed =3D <1000>; full-duplex; + pause; }; }; }; }; }; =20 + # Example 3: Standalone MT7531 - | - //Example 2: MT7621: Port 4 is WAN port: 2nd GMAC -> Port 5 -> PHY por= t 4. + #include + #include =20 - ethernet { + mdio { #address-cells =3D <1>; #size-cells =3D <0>; - gmac0: mac@0 { - compatible =3D "mediatek,eth-mac"; + + switch@0 { + compatible =3D "mediatek,mt7531"; reg =3D <0>; - phy-mode =3D "rgmii"; =20 - fixed-link { - speed =3D <1000>; - full-duplex; - pause; + reset-gpios =3D <&pio 54 0>; + + interrupt-controller; + #interrupt-cells =3D <1>; + interrupt-parent =3D <&pio>; + interrupts =3D <53 IRQ_TYPE_LEVEL_HIGH>; + + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + label =3D "lan1"; + }; + + port@1 { + reg =3D <1>; + label =3D "lan2"; + }; + + port@2 { + reg =3D <2>; + label =3D "lan3"; + }; + + port@3 { + reg =3D <3>; + label =3D "lan4"; + }; + + port@4 { + reg =3D <4>; + label =3D "wan"; + }; + + port@6 { + reg =3D <6>; + label =3D "cpu"; + ethernet =3D <&gmac0>; + phy-mode =3D "2500base-x"; + + fixed-link { + speed =3D <2500>; + full-duplex; + pause; + }; + }; }; }; + }; + + # Example 4: MT7530 in MT7621AT, MT7621DAT and MT7621ST SoCs + - | + #include + #include =20 - gmac1: mac@1 { + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + switch@0 { + compatible =3D "mediatek,mt7621"; + reg =3D <0>; + + mediatek,mcm; + resets =3D <&sysc MT7621_RST_MCM>; + reset-names =3D "mcm"; + + interrupt-controller; + #interrupt-cells =3D <1>; + interrupt-parent =3D <&gic>; + interrupts =3D ; + + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + label =3D "lan1"; + }; + + port@1 { + reg =3D <1>; + label =3D "lan2"; + }; + + port@2 { + reg =3D <2>; + label =3D "lan3"; + }; + + port@3 { + reg =3D <3>; + label =3D "lan4"; + }; + + 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; + pause; + }; + }; + }; + }; + }; + + # Example 5: MT7621: mux MT7530's phy4 to SoC's gmac1 + - | + #include + #include + + ethernet { + #address-cells =3D <1>; + #size-cells =3D <0>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&rgmii2_pins>; + + mac@1 { compatible =3D "mediatek,eth-mac"; reg =3D <1>; - phy-mode =3D "rgmii-txid"; - phy-handle =3D <&phy4>; + + phy-mode =3D "rgmii"; + phy-handle =3D <&example5_ethphy4>; }; =20 - mdio: mdio-bus { + mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - /* Internal phy */ - phy4: ethernet-phy@4 { + /* MT7530's phy4 */ + example5_ethphy4: ethernet-phy@4 { reg =3D <4>; }; =20 - mt7530: switch@1f { + switch@0 { compatible =3D "mediatek,mt7621"; - reg =3D <0x1f>; - mediatek,mcm; + reg =3D <0>; =20 - resets =3D <&rstctrl 2>; + mediatek,mcm; + resets =3D <&sysc MT7621_RST_MCM>; reset-names =3D "mcm"; =20 + interrupt-controller; + #interrupt-cells =3D <1>; + interrupt-parent =3D <&gic>; + interrupts =3D ; + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 port@0 { reg =3D <0>; - label =3D "lan0"; + label =3D "lan1"; }; =20 port@1 { reg =3D <1>; - label =3D "lan1"; + label =3D "lan2"; }; =20 port@2 { reg =3D <2>; - label =3D "lan2"; + label =3D "lan3"; }; =20 port@3 { reg =3D <3>; - label =3D "lan3"; + label =3D "lan4"; }; =20 - /* Commented out. Port 4 is handled by 2nd GMAC. + /* Commented out, phy4 is muxed to gmac1. port@4 { reg =3D <4>; - label =3D "lan4"; + label =3D "wan"; }; */ =20 @@ -340,7 +543,7 @@ examples: reg =3D <6>; label =3D "cpu"; ethernet =3D <&gmac0>; - phy-mode =3D "rgmii"; + phy-mode =3D "trgmii"; =20 fixed-link { speed =3D <1000>; @@ -353,82 +556,171 @@ examples: }; }; =20 + # Example 6: MT7621: mux external phy to SoC's gmac1 - | - //Example 3: MT7621: Port 5 is connected to external PHY: Port 5 -> ex= ternal PHY. + #include + #include =20 ethernet { #address-cells =3D <1>; #size-cells =3D <0>; - gmac_0: mac@0 { + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&rgmii2_pins>; + + mac@1 { compatible =3D "mediatek,eth-mac"; - reg =3D <0>; + reg =3D <1>; + phy-mode =3D "rgmii"; + phy-handle =3D <&example6_ethphy7>; + }; + + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + /* External PHY */ + example6_ethphy7: ethernet-phy@7 { + reg =3D <7>; + phy-mode =3D "rgmii"; + }; + + switch@0 { + compatible =3D "mediatek,mt7621"; + reg =3D <0>; + + mediatek,mcm; + resets =3D <&sysc MT7621_RST_MCM>; + reset-names =3D "mcm"; + + interrupt-controller; + #interrupt-cells =3D <1>; + interrupt-parent =3D <&gic>; + interrupts =3D ; + + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + label =3D "lan1"; + }; + + port@1 { + reg =3D <1>; + label =3D "lan2"; + }; + + port@2 { + reg =3D <2>; + label =3D "lan3"; + }; + + port@3 { + reg =3D <3>; + label =3D "lan4"; + }; + + port@4 { + reg =3D <4>; + label =3D "wan"; + }; =20 - fixed-link { - speed =3D <1000>; - full-duplex; - pause; + port@6 { + reg =3D <6>; + label =3D "cpu"; + ethernet =3D <&gmac0>; + phy-mode =3D "trgmii"; + + fixed-link { + speed =3D <1000>; + full-duplex; + pause; + }; + }; + }; }; }; + }; =20 - mdio0: mdio-bus { + # Example 7: MT7621: mux external phy to MT7530's port 5 + - | + #include + #include + + ethernet { + #address-cells =3D <1>; + #size-cells =3D <0>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&rgmii2_pins>; + + mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - /* External phy */ - ephy5: ethernet-phy@7 { + /* External PHY */ + example7_ethphy7: ethernet-phy@7 { reg =3D <7>; + phy-mode =3D "rgmii"; }; =20 - switch@1f { + switch@0 { compatible =3D "mediatek,mt7621"; - reg =3D <0x1f>; - mediatek,mcm; + reg =3D <0>; =20 - resets =3D <&rstctrl 2>; + mediatek,mcm; + resets =3D <&sysc MT7621_RST_MCM>; reset-names =3D "mcm"; =20 + interrupt-controller; + #interrupt-cells =3D <1>; + interrupt-parent =3D <&gic>; + interrupts =3D ; + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 port@0 { reg =3D <0>; - label =3D "lan0"; + label =3D "lan1"; }; =20 port@1 { reg =3D <1>; - label =3D "lan1"; + label =3D "lan2"; }; =20 port@2 { reg =3D <2>; - label =3D "lan2"; + label =3D "lan3"; }; =20 port@3 { reg =3D <3>; - label =3D "lan3"; + label =3D "lan4"; }; =20 port@4 { reg =3D <4>; - label =3D "lan4"; + label =3D "wan"; }; =20 port@5 { reg =3D <5>; - label =3D "lan5"; - phy-mode =3D "rgmii"; - phy-handle =3D <&ephy5>; + label =3D "extphy"; + phy-mode =3D "rgmii-txid"; + phy-handle =3D <&example7_ethphy7>; }; =20 - cpu_port0: port@6 { + port@6 { reg =3D <6>; label =3D "cpu"; - ethernet =3D <&gmac_0>; - phy-mode =3D "rgmii"; + ethernet =3D <&gmac0>; + phy-mode =3D "trgmii"; =20 fixed-link { speed =3D <1000>; --=20 2.34.1