From nobody Thu Dec 18 15:31:51 2025 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 56E7ACDB47E for ; Wed, 18 Oct 2023 09:03:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229587AbjJRJD6 (ORCPT ); Wed, 18 Oct 2023 05:03:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229619AbjJRJDz (ORCPT ); Wed, 18 Oct 2023 05:03:55 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AC05F7 for ; Wed, 18 Oct 2023 02:03:53 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-507c78d258fso826764e87.2 for ; Wed, 18 Oct 2023 02:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697619831; x=1698224631; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=2tyOup0+oFY1qNiEuX6Mw7ppmGYAINv0IB1dZ7z8mjE=; b=qJ1wYng2P/ZY4bg8Bl2Yx5rMa0McXZe1kIvz6BSt706kQFSt2ugMthu+brJHImmlnu S1RlFuULhpnTdGoMxZu9JYBvJitNRYG07BXnz5CSRhzRO7COYkkYp0dix/gIYNyNcC9i Ha9RX/7UDk1Uk2qbWr27Xw+gBacCefSQeddwEdJ8ztuf0MZV4BL6UEg133XmV73tc/sd zPF02RJEGNiEQYKzFPKDr7bZj0c10em8c8CidnG1VOUEzQr5iV+Evq8R+LT6i+UxMO4C 3UzvsbXYT7g7QeBhR+fnsQf0rRwiZlhdocmamphwDoGjZEtjwlpoTkaSuA+yOE+hnO8f PdNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697619831; x=1698224631; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2tyOup0+oFY1qNiEuX6Mw7ppmGYAINv0IB1dZ7z8mjE=; b=rEF5s4vC6tCEE2Atma1KnS+pZa6690TBoYPDBhlJX3WCBXCVJiVl0D2EVgyruZbhEl xXvpE7JBvm9c8Pk+JAWftYRQhuqXKel8YJYS3VOzn/iudIInKEcne4h9YUvM/ePi99yl gbhkjlb6iUzROCuELEqUW3QWOXmajkSSkjxJLf142MDVQhMda8hsIK1IokIVJD21jqza 6k4nl6fSW0Ndi8p/bofPg0ZlHxe9tJ17j0rCkZxtRQOGBRTiOsV/8TPNE32t3w9hasMf lspZtaHJnDO8gRL0O6+aYBlGAYTrCbMa/gMh1Y16JpEcGv+LQggjtLsw9RJ+S2qyxLWy d1Yg== X-Gm-Message-State: AOJu0YyOYubnJMGNL5HoBVNjaeEF1gc7HQss297gC4MFgxqc7OFF3LVM Z67Co6ocbF/zJCYX5n3Q7eI6Kg== X-Google-Smtp-Source: AGHT+IHMybJsDSExgJDVQSeN8JuA3T6ANKH6zJvy1EbxZZ9HCZV/eBXaUEtw9UO7m9Jtm4N4sfn9zQ== X-Received: by 2002:ac2:484c:0:b0:4ff:a8c6:d1aa with SMTP id 12-20020ac2484c000000b004ffa8c6d1aamr3328690lfy.48.1697619831405; Wed, 18 Oct 2023 02:03:51 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id w19-20020a05651234d300b005056fb1d6fbsm616595lfr.238.2023.10.18.02.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 02:03:50 -0700 (PDT) From: Linus Walleij Date: Wed, 18 Oct 2023 11:03:40 +0200 Subject: [PATCH net-next v4 1/7] dt-bindings: net: dsa: Require ports or ethernet-ports MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231018-marvell-88e6152-wan-led-v4-1-3ee0c67383be@linaro.org> References: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> In-Reply-To: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij , Rob Herring X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Bindings using dsa.yaml#/$defs/ethernet-ports specify that a DSA switch node need to have a ports or ethernet-ports subnode, and that is actually required, so add requirements using oneOf. Suggested-by: Rob Herring Signed-off-by: Linus Walleij --- Documentation/devicetree/bindings/net/dsa/dsa.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documenta= tion/devicetree/bindings/net/dsa/dsa.yaml index 6107189d276a..368169f7fd37 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml @@ -46,4 +46,10 @@ $defs: $ref: dsa-port.yaml# unevaluatedProperties: false =20 + oneOf: + - required: + - ports + - required: + - ethernet-ports + ... --=20 2.34.1 From nobody Thu Dec 18 15:31:51 2025 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 1175ACDB47E for ; Wed, 18 Oct 2023 09:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229703AbjJRJEG (ORCPT ); Wed, 18 Oct 2023 05:04:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbjJRJD4 (ORCPT ); Wed, 18 Oct 2023 05:03:56 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39D96102 for ; Wed, 18 Oct 2023 02:03:54 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-507bd19eac8so2462122e87.0 for ; Wed, 18 Oct 2023 02:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697619832; x=1698224632; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=as+rTKVDVhWn5AZLFNEUP/sdaVHFDVJzFvCNtllU+6g=; b=wZN+57Y/l6cO/1VvWU0LTUOGKLwHv/0ZbJY+qUkvSusHgHG30Ua3IGD/F1+6Kg+E2t 57XxMOEjk6fFN5+6vmmhFFDF3l5KwOajS7ThQdzkS9LWomV47vYszILxLdgBGH41KywX HRN9DRXCDTSMVwjM8ogWiMe76eIPWA5HaX7dXJL5UVkuMIar/ApyzXIvLoHNyQBKk+cF dZFdGOsRsG0RX/L9iyrhsdiBTH7e+45vsUiH2gMm9Xa2zCO1vU+ZXE9Ewt0vJONCcax2 MlG/k4PdVcEIFkLrUPyzWUg63aBQ1BWc1cmYPoMZaJBnKBZEya5ldw74ZQ79VkGuUsm9 FPCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697619832; x=1698224632; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=as+rTKVDVhWn5AZLFNEUP/sdaVHFDVJzFvCNtllU+6g=; b=qaWPMhrnOL9sH1f9u+kv86mBy26Q7MjTlldfm8yIxq5E7usmU0pBfKdJXcvDOupkL7 nWCFxBcwL/G80OKYdi1kxar8h48eG5xQ4ZC0jp0setKVn6ACF6cfmXxbPAM5tGWofnRh iEg5cRJa1JiV4ER2mMb+ugdU+xAjQ7NtGW1di7AP+6PdDjunqlM7ccqgD7JUSn6RVa6m IlfYbbXfcvGqpegLzkNR0v/GR4YpyQzDk1PAzSAg839OFSCA68EsyFAm+kTUMdv2kOwR 98Q9BZvkOkADx87IpsN3cpOfAyqspbPYUIcficK8vd4ncGNINvsZ4zQU0AP9kg8N6r52 BkhQ== X-Gm-Message-State: AOJu0YzVxfwnmshzvZrQyx6C9IcHRwHT9vKCO7/XuPhl+h+wyVXQePHj VFYWVzwBHr4EMwoALVHMkzMn5g== X-Google-Smtp-Source: AGHT+IFIaoucl+lkKRp5as13fMnNM40xIgQBWtdL1v4ouDauyAdgG8m9UtPuvcSRfjsxSL4BWjmD/A== X-Received: by 2002:a05:6512:3ca0:b0:500:b42f:1830 with SMTP id h32-20020a0565123ca000b00500b42f1830mr4173103lfv.63.1697619832414; Wed, 18 Oct 2023 02:03:52 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id w19-20020a05651234d300b005056fb1d6fbsm616595lfr.238.2023.10.18.02.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 02:03:52 -0700 (PDT) From: Linus Walleij Date: Wed, 18 Oct 2023 11:03:41 +0200 Subject: [PATCH net-next v4 2/7] dt-bindings: net: mvusb: Fix up DSA example MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231018-marvell-88e6152-wan-led-v4-2-3ee0c67383be@linaro.org> References: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> In-Reply-To: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When adding a proper schema for the Marvell mx88e6xxx switch, the scripts start complaining about this embedded example: dtschema/dtc warnings/errors: net/marvell,mvusb.example.dtb: switch@0: ports: '#address-cells' is a required property from schema $id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6xxx.= yaml# net/marvell,mvusb.example.dtb: switch@0: ports: '#size-cells' is a required property from schema $id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6xxx.= yaml# Fix this up by extending the example with those properties in the ports node. While we are at it, rename "ports" to "ethernet-ports" and rename "switch" to "ethernet-switch" as this is recommended practice. Signed-off-by: Linus Walleij Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean --- Documentation/devicetree/bindings/net/marvell,mvusb.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/marvell,mvusb.yaml b/Doc= umentation/devicetree/bindings/net/marvell,mvusb.yaml index 3a3325168048..ab838c1ffeed 100644 --- a/Documentation/devicetree/bindings/net/marvell,mvusb.yaml +++ b/Documentation/devicetree/bindings/net/marvell,mvusb.yaml @@ -50,11 +50,14 @@ examples: #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch@0 { + ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0x0>; =20 - ports { + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + /* Port definitions */ }; =20 --=20 2.34.1 From nobody Thu Dec 18 15:31:51 2025 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 BAFDDCDB47E for ; Wed, 18 Oct 2023 09:04:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229718AbjJRJEJ (ORCPT ); Wed, 18 Oct 2023 05:04:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229651AbjJRJD5 (ORCPT ); Wed, 18 Oct 2023 05:03:57 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33029F7 for ; Wed, 18 Oct 2023 02:03:55 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-507ac66a969so4098466e87.3 for ; Wed, 18 Oct 2023 02:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697619833; x=1698224633; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qiZZKepT0k2abK/K1zJsQbV5nd3Ms209X8e5jPF01b4=; b=wem3ODTcAUKUxQ1CPCYN+rCKG33ZrE6uR67qA1RDoAX53DJEEImYQmtO02XOeKWDuY peCvpshN4iadxgpIhOmuglDovygabfcB+Pz1ZPCUvf3HzBTJL5ImtCDB6Pz4DV9V6jPI yZWzxZJQ5HqJvMuHPKBw8HfOCmtzvXmQoLEq7nbPi6AU9VVE+OKn398hRmucvJnvrQZv ZY97Xd9Qj/q0Y6XX0QDbYjm5hv/mv8JxDwYKCA/yEFOn9QtfFSvpxBvl2ezNOMqlCoqF REDlIA1df8lg1HO+JIVjM4uvYnAjGtJFeCYn2IvBzhrxROnf35hn5+8vs8mgBuB3uysI heGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697619833; x=1698224633; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qiZZKepT0k2abK/K1zJsQbV5nd3Ms209X8e5jPF01b4=; b=BvZ1WOff2sCVZylhnptnrHiRKjBk/dkdmMVb0kXIjbYxa2qmkmzJiHg4xXbhuIaYka 4eAB96/ANYUs9k8iXq7Ef8NkeD552WjvwcsREcyYiZ266X/mw8r4LThBhVUlAA/E3z0K 6LAsnseoBgl1gFKdaR/6Y5nd2hEqWtfW9ilaaZD2r2fDrN72oCh7bSbHoqNB+gP509Z9 3DtDacHMZpz5d0PhlhV8NNXThw2bOb/VKMsP9toywHm+BiD6lXKREAfDGCSSyzHq4rer sZf6dvqSAEodnmMe9joa5C1a2hNgFt6/+pCh0EEoBb92J9P0LvrfLt4lI072Sx8Yh2+x 2LWQ== X-Gm-Message-State: AOJu0Yx8yavb1uwiUHheCQV5HFMIijTcP/JkwgHb9yWaCiYfZh3mXCvj 2HbQU6ckd8LvgCmKPSv/BMGHAQ== X-Google-Smtp-Source: AGHT+IFEm58O7jXHw5PZfYfibmbRgjIl6MChYWqx/YkQb9uhGQ7xj///ZhBu9KVcW8ODCZfkTN9ArA== X-Received: by 2002:ac2:528b:0:b0:507:a8ed:ee0b with SMTP id q11-20020ac2528b000000b00507a8edee0bmr3034715lfm.65.1697619833514; Wed, 18 Oct 2023 02:03:53 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id w19-20020a05651234d300b005056fb1d6fbsm616595lfr.238.2023.10.18.02.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 02:03:53 -0700 (PDT) From: Linus Walleij Date: Wed, 18 Oct 2023 11:03:42 +0200 Subject: [PATCH net-next v4 3/7] ARM: dts: marvell: Fix some common switch mistakes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231018-marvell-88e6152-wan-led-v4-3-3ee0c67383be@linaro.org> References: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> In-Reply-To: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix some errors in the Marvell MV88E6xxx switch descriptions: - The top node had no address size or cells. - switch0@0 is not OK, should be switch@0. - The ports node should have port@0 etc children, no plural "ports". This serves as an example of fixes needed for introducing a schema for the bindings, but the patch can simply be applied. Signed-off-by: Linus Walleij Reviewed-by: Andrew Lunn --- arch/arm/boot/dts/marvell/armada-370-rd.dts | 2 -- .../arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts | 2 -- arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts | 2 +- arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts | 2 +- arch/arm/boot/dts/marvell/armada-385-linksys.dtsi | 2 -- arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts | 16 +++++++-----= ---- arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 2 -- arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts | 2 -- 8 files changed, 9 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/marvell/armada-370-rd.dts b/arch/arm/boot/dt= s/marvell/armada-370-rd.dts index b459a670f615..e3a1834986ee 100644 --- a/arch/arm/boot/dts/marvell/armada-370-rd.dts +++ b/arch/arm/boot/dts/marvell/armada-370-rd.dts @@ -151,8 +151,6 @@ led@0 { =20 switch: switch@10 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <0x10>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts b/ar= ch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts index f4c4b213ef4e..d4fff4ea9f20 100644 --- a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts +++ b/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts @@ -79,14 +79,12 @@ &mdio { =20 switch@0 { compatible =3D "marvell,mv88e6190"; - #address-cells =3D <1>; #interrupt-cells =3D <2>; interrupt-controller; interrupt-parent =3D <&gpio1>; interrupts =3D <7 IRQ_TYPE_LEVEL_LOW>; pinctrl-0 =3D <&switch_interrupt_pins>; pinctrl-names =3D "default"; - #size-cells =3D <0>; reg =3D <0>; =20 mdio { diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts b/arc= h/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts index 1990f7d0cc79..1be0419f8f3e 100644 --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts @@ -7,7 +7,7 @@ / { }; =20 &mdio { - switch0: switch0@4 { + switch0: switch@4 { compatible =3D "marvell,mv88e6190"; reg =3D <4>; pinctrl-names =3D "default"; diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts b/arc= h/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts index b795ad573891..6ec536222bfb 100644 --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts @@ -11,7 +11,7 @@ &sfp0 { }; =20 &mdio { - switch0: switch0@4 { + switch0: switch@4 { compatible =3D "marvell,mv88e6085"; reg =3D <4>; pinctrl-names =3D "default"; diff --git a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi b/arch/arm/b= oot/dts/marvell/armada-385-linksys.dtsi index fc8216fd9f60..63a0bc9455ca 100644 --- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi @@ -160,8 +160,6 @@ &mdio { =20 switch@0 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <0>; =20 ports { diff --git a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts b/arch/a= rm/boot/dts/marvell/armada-385-turris-omnia.dts index 2d8d319bec83..8c69dbd6a2c7 100644 --- a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts @@ -439,8 +439,6 @@ switch@10 { pinctrl-names =3D "default"; pinctrl-0 =3D <&swint_pins>; compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; =20 dsa,member =3D <0 0>; reg =3D <0x10>; @@ -452,32 +450,32 @@ ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - ports@0 { + port@0 { reg =3D <0>; label =3D "lan0"; }; =20 - ports@1 { + port@1 { reg =3D <1>; label =3D "lan1"; }; =20 - ports@2 { + port@2 { reg =3D <2>; label =3D "lan2"; }; =20 - ports@3 { + port@3 { reg =3D <3>; label =3D "lan3"; }; =20 - ports@4 { + port@4 { reg =3D <4>; label =3D "lan4"; }; =20 - ports@5 { + port@5 { reg =3D <5>; ethernet =3D <ð1>; phy-mode =3D "rgmii-id"; @@ -488,7 +486,7 @@ fixed-link { }; }; =20 - ports@6 { + port@6 { reg =3D <6>; ethernet =3D <ð0>; phy-mode =3D "rgmii-id"; diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/b= oot/dts/marvell/armada-388-clearfog.dts index 32c569df142f..ab46903580aa 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts @@ -94,8 +94,6 @@ &mdio { =20 switch@4 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <4>; pinctrl-0 =3D <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>; pinctrl-names =3D "default"; diff --git a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts b/arch/a= rm/boot/dts/marvell/armada-xp-linksys-mamba.dts index 7a0614fd0c93..2a5518c73bff 100644 --- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts @@ -267,8 +267,6 @@ &mdio { =20 switch@0 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <0>; =20 ports { --=20 2.34.1 From nobody Thu Dec 18 15:31:51 2025 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 24CFFCDB47E for ; Wed, 18 Oct 2023 09:04:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbjJRJEO (ORCPT ); Wed, 18 Oct 2023 05:04:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbjJRJD6 (ORCPT ); Wed, 18 Oct 2023 05:03:58 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68434102 for ; Wed, 18 Oct 2023 02:03:56 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2c518a1d83fso56608551fa.3 for ; Wed, 18 Oct 2023 02:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697619834; x=1698224634; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=bRAJxOH+ejiFnd2dNnRhzRVyCxEiMIKKKk9Axu7hk70=; b=ay/sxMICHZihfmVZ9nWFO5QmkLfxLeIbV/qmKfLQcvCWkJAPDdasJZo116BMcs08VE AvnLAtEUHL9cD+Z47SO7zKrplcaxHzjwDRfGJrtknkycMxWfZJd3d5GaScyOzqqYl0Io jOsHP/xa4jUm88m54dSipNmE6/chVxg1SquloRUjPkq0vN/wNmcQx6bbJoXPLxrM4EdD +he5J+Cp5usAgS6gldSm4J4KCerdF8f59ks1sK7nPQ6sX4mbZZfkWaTo2LBxmnl7pFOJ ajI5ykAAvLNkLeUTCIvhCzlAOYkW2o/EdmoDHfcIV4jRTmjaIlXLJ5iRAyPtx51Ynr3u gcKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697619834; x=1698224634; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bRAJxOH+ejiFnd2dNnRhzRVyCxEiMIKKKk9Axu7hk70=; b=FYSaC+LkTdn2EqNxkoQZoV2SpBIaAz7621cFi74TB4OhiYps4vB0QVCRhDPahtLnO0 vqfxYHjmIYgCrf2My4dXRVSo3n9k80nrG8sDvYvN5wO0yhS0387VsyImvG1MQi1u9os2 WbUDBGWBLD+lGBIegn1NNwL8HPW2WSbB1Vuvs31AbAUIto3z7yA2RmeeZWp8EwJRTcz+ chf54w82D3OJz31vT33kOvSHIH9fhwNgOS+GhEeeq9NNfpqdWavhVC+h/0bDSRX97yjp EuY4TnnbPy8Nodhrtu/wnakL3CVmTZY9LeXWgOAAxCAra/HS38ZjTui027aMSuJNX5P8 TghQ== X-Gm-Message-State: AOJu0Yxv1Y15PwXBe2INnTWi2MYejqjbJkIh+0q1AMKaVEBeNnc8X2sB quypd3xhiXG4gxY4bU4vxQYCbA== X-Google-Smtp-Source: AGHT+IEnsAIXt0Xqe9XGCsNOxCQzk+oYEA4OgPE+PWij92hRZ5U87ZlXFtsmdvPJrN9YhKZbjylDUg== X-Received: by 2002:a05:6512:b9a:b0:507:9a49:3f23 with SMTP id b26-20020a0565120b9a00b005079a493f23mr4011044lfv.18.1697619834687; Wed, 18 Oct 2023 02:03:54 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id w19-20020a05651234d300b005056fb1d6fbsm616595lfr.238.2023.10.18.02.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 02:03:54 -0700 (PDT) From: Linus Walleij Date: Wed, 18 Oct 2023 11:03:43 +0200 Subject: [PATCH net-next v4 4/7] ARM: dts: nxp: Fix some common switch mistakes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231018-marvell-88e6152-wan-led-v4-4-3ee0c67383be@linaro.org> References: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> In-Reply-To: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix some errors in the Marvell MV88E6xxx switch descriptions: - switch0@0 is not OK, should be switch@0 Signed-off-by: Linus Walleij Reviewed-by: Andrew Lunn --- arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts | 2 +- arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts | 8 ++++---- arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts | 2 +- arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts | 4 ++-- arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts b/arch/arm/boot/dt= s/nxp/vf/vf610-zii-cfu1.dts index 1a19aec8957b..add47d8fb58a 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts @@ -162,7 +162,7 @@ mdio1: mdio { suppress-preamble; status =3D "okay"; =20 - switch0: switch0@0 { + switch0: switch@0 { compatible =3D "marvell,mv88e6085"; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_switch>; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts b/arch/arm/boo= t/dts/nxp/vf/vf610-zii-scu4-aib.dts index df1335492a19..50356bd87d04 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts @@ -47,7 +47,7 @@ mdio_mux_1: mdio@1 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0: switch0@0 { + switch0: switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0>; dsa,member =3D <0 0>; @@ -130,7 +130,7 @@ mdio_mux_2: mdio@2 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch1: switch1@0 { + switch1: switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0>; dsa,member =3D <0 1>; @@ -188,7 +188,7 @@ mdio_mux_4: mdio@4 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch2: switch2@0 { + switch2: switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0>; dsa,member =3D <0 2>; @@ -276,7 +276,7 @@ mdio_mux_8: mdio@8 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch3: switch3@0 { + switch3: switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0>; dsa,member =3D <0 3>; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts b/arch/arm/boot/dt= s/nxp/vf/vf610-zii-spb4.dts index 1461804ecaea..20e9e2dacbe6 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts @@ -123,7 +123,7 @@ mdio1: mdio { suppress-preamble; status =3D "okay"; =20 - switch0: switch0@0 { + switch0: switch@0 { compatible =3D "marvell,mv88e6190"; pinctrl-0 =3D <&pinctrl_gpio_switch0>; pinctrl-names =3D "default"; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts b/arch/arm/boo= t/dts/nxp/vf/vf610-zii-ssmb-dtu.dts index 463c2452b9b7..aa53a60518c3 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts @@ -112,7 +112,7 @@ mdio1: mdio { suppress-preamble; status =3D "okay"; =20 - switch0: switch0@0 { + switch0: switch@0 { compatible =3D "marvell,mv88e6190"; pinctrl-0 =3D <&pinctrl_gpio_switch0>; pinctrl-names =3D "default"; @@ -167,7 +167,7 @@ port@9 { }; }; =20 - mdio1 { + mdio-external { compatible =3D "marvell,mv88e6xxx-mdio-external"; #address-cells =3D <1>; #size-cells =3D <0>; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts b/arch/arm/bo= ot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts index f5ae0d5de315..0b7063b74130 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts @@ -137,7 +137,7 @@ mdio1: mdio { suppress-preamble; status =3D "okay"; =20 - switch0: switch0@0 { + switch0: switch@0 { compatible =3D "marvell,mv88e6190"; pinctrl-0 =3D <&pinctrl_gpio_switch0>; pinctrl-names =3D "default"; --=20 2.34.1 From nobody Thu Dec 18 15:31:51 2025 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 4CE84CDB47E for ; Wed, 18 Oct 2023 09:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229691AbjJRJER (ORCPT ); Wed, 18 Oct 2023 05:04:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229594AbjJRJD7 (ORCPT ); Wed, 18 Oct 2023 05:03:59 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BCBFEA for ; Wed, 18 Oct 2023 02:03:57 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-507a29c7eefso5361938e87.1 for ; Wed, 18 Oct 2023 02:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697619835; x=1698224635; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WaRGSJiSyL+S+illYvUU7qhAWqu/HnXRI140gzw51iM=; b=sztpmYNDpNXP6bpq1vUmvI5AW7edRhmdRnSDi2GE3LzwfVkJUf2EbLy4SILuiLb69D uzAQ09XEv211bCX2YlQyncDcoEjB36xIOfBy+1bSC3jPoPHh0GUni6HcAowNbOUZAfL0 vaX5UOPPCppDZC4r73U2IsNcAgYvXJ5d4KQ884oGXHucTptBvIro7sr/KaxXfjjLmrZz h8fuSgo1oN/xgzQBogko7kvCDSxXDG0+xmyjRPPqtecA+aPPmV/Fh3wbw56yue/9eI1V 3rLbR/yxmgk370OavxIHhh5Ku/GUCuYO+CNb8KzWdWdpWplH6Sibbki2ZZ+O2/2DYPcB iACA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697619835; x=1698224635; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WaRGSJiSyL+S+illYvUU7qhAWqu/HnXRI140gzw51iM=; b=OpkBIlwf49HqIjicn+0bPeUDUk06aaE0Vpy3tSvn0QTcloStUgHgXmnsSnmUXL+gvb RXmkFd9MI2rYxkxfij1m8sQJBJk9rencILE9devwrHSXfdjQe0lGoi5lgoQn2zbiEvH6 v0NgpmaD0HoxCARgvn3HX0eiTQvs+jGf3+epRDRHH0olMWeTfgkwsmlKTqiUdRKQMtys A5VXOjCjyaepcM4jWFniV4cWX3mM5w58jAMv/FCoPX3qb8LDc1syoegF07CvXGEvVSPi tUu31XUDMtXwNJDPHXKj3zJUcSHr9nDzmdtyeW36pSypGhi7tqGco47F6PzNnq0OMF/3 Jfjw== X-Gm-Message-State: AOJu0YwSGMattOHXaGLfannMmk5b4ew1j6ZZHtp8DZVITyOC817dByWA B0VKSIY47UIKEqTprovfeEZ0PzNDVBuMJ/g+lJY= X-Google-Smtp-Source: AGHT+IGUslfnvMPul2M2qD156+caCpfXigxQ6I2iIi+p6tHu0fMrYfIfRJtqp3ZFaxxwMQDqiloU+A== X-Received: by 2002:ac2:5976:0:b0:507:b19e:90cc with SMTP id h22-20020ac25976000000b00507b19e90ccmr3474964lfp.40.1697619835745; Wed, 18 Oct 2023 02:03:55 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id w19-20020a05651234d300b005056fb1d6fbsm616595lfr.238.2023.10.18.02.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 02:03:55 -0700 (PDT) From: Linus Walleij Date: Wed, 18 Oct 2023 11:03:44 +0200 Subject: [PATCH net-next v4 5/7] ARM64: dts: marvell: Fix some common switch mistakes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231018-marvell-88e6152-wan-led-v4-5-3ee0c67383be@linaro.org> References: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> In-Reply-To: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix some errors in the Marvell MV88E6xxx switch descriptions: - The top node had no address size or cells. - switch0@0 is not OK, should be switch@0. Signed-off-by: Linus Walleij Reviewed-by: Andrew Lunn --- arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 4 +--- arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts | 4 +--- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 12 ++++++----= -- arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts | 2 -- arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +- arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 4 +--- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arc= h/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi index 5fc613d24151..b526efeee293 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi @@ -145,10 +145,8 @@ &usb2 { }; =20 &mdio { - switch0: switch0@1 { + switch0: switch@1 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <1>; =20 dsa,member =3D <0 0>; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/arch/a= rm64/boot/dts/marvell/armada-3720-gl-mv1000.dts index b1b45b4fa9d4..5de4417f929c 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts @@ -152,10 +152,8 @@ &uart0 { }; =20 &mdio { - switch0: switch0@1 { + switch0: switch@1 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <1>; =20 dsa,member =3D <0 0>; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/= arm64/boot/dts/marvell/armada-3720-turris-mox.dts index 9eab2bb22134..c69cb4e191e5 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -305,7 +305,7 @@ phy1: ethernet-phy@1 { }; =20 /* switch nodes are enabled by U-Boot if modules are present */ - switch0@10 { + switch@10 { compatible =3D "marvell,mv88e6190"; reg =3D <0x10>; dsa,member =3D <0 0>; @@ -430,7 +430,7 @@ port-sfp@a { }; }; =20 - switch0@2 { + switch@2 { compatible =3D "marvell,mv88e6085"; reg =3D <0x2>; dsa,member =3D <0 0>; @@ -497,7 +497,7 @@ port@5 { }; }; =20 - switch1@11 { + switch@11 { compatible =3D "marvell,mv88e6190"; reg =3D <0x11>; dsa,member =3D <0 1>; @@ -622,7 +622,7 @@ port-sfp@a { }; }; =20 - switch1@2 { + switch@2 { compatible =3D "marvell,mv88e6085"; reg =3D <0x2>; dsa,member =3D <0 1>; @@ -689,7 +689,7 @@ port@5 { }; }; =20 - switch2@12 { + switch@12 { compatible =3D "marvell,mv88e6190"; reg =3D <0x12>; dsa,member =3D <0 2>; @@ -805,7 +805,7 @@ port-sfp@a { }; }; =20 - switch2@2 { + switch@2 { compatible =3D "marvell,mv88e6085"; reg =3D <0x2>; dsa,member =3D <0 2>; diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/ar= m64/boot/dts/marvell/armada-7040-mochabin.dts index 48202810bf78..3cc794fcf12e 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts @@ -303,8 +303,6 @@ eth2phy: ethernet-phy@1 { /* 88E6141 Topaz switch */ switch: switch@3 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <3>; =20 pinctrl-names =3D "default"; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/a= rch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts index 4125202028c8..7a25ea36b565 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts @@ -497,7 +497,7 @@ ge_phy: ethernet-phy@0 { reset-deassert-us =3D <10000>; }; =20 - switch0: switch0@4 { + switch0: switch@4 { compatible =3D "marvell,mv88e6085"; reg =3D <4>; pinctrl-names =3D "default"; diff --git a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi b/arch/arm64/boot/= dts/marvell/cn9130-crb.dtsi index 32cfb3e2efc3..110d4c9898bc 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi @@ -207,11 +207,9 @@ phy0: ethernet-phy@0 { reg =3D <0>; }; =20 - switch6: switch0@6 { + switch6: switch@6 { /* Actual device is MV88E6393X */ compatible =3D "marvell,mv88e6190"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <6>; interrupt-parent =3D <&cp0_gpio1>; interrupts =3D <28 IRQ_TYPE_LEVEL_LOW>; --=20 2.34.1 From nobody Thu Dec 18 15:31:51 2025 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 97287CDB47E for ; Wed, 18 Oct 2023 09:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229777AbjJRJEX (ORCPT ); Wed, 18 Oct 2023 05:04:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229532AbjJRJEB (ORCPT ); Wed, 18 Oct 2023 05:04:01 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F57A102 for ; Wed, 18 Oct 2023 02:03:58 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-507ad511315so4375964e87.0 for ; Wed, 18 Oct 2023 02:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697619837; x=1698224637; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uU0bVCtbrl/Usjgulu0RDpmL4SYTW9DzTRAodbd1EAQ=; b=daUyRfV5KXKV1ZfR1dkcCXm0GdFTvMjxLFsE5iIFswFpz2f13XL9t7UASwIPXw5xU6 kUwnCqrMvHHpIsSZNuqOFNnZD6BWj9i+sq4TtpmzexKAcjyqKqjwB2uNyGGf5Mg1kstU XjALXK0lb6YVcz48NdxaYKcOpaezXM2MRhwf5RU1PvFQGvq1aMz+jXSzpULJD0SvVvpt L+IBeuqPfbFusM2GtzKoGkT4hUbxlsAtiSpHbiXsO9MEfwZad7W11dR9XkIfi5xp4M8g MF3dJ6VVxNEf08r41FFEn7fPkKliA5IcnWvSrE3XOBD+FL5U5e20WL+89UozmK+lrYw+ 0EEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697619837; x=1698224637; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uU0bVCtbrl/Usjgulu0RDpmL4SYTW9DzTRAodbd1EAQ=; b=wDnmI1bT3z91FR2YgFGGcy/Ej+wq/0UC9bFeMccg26bqGLYUXlzpjlEw5nCAGlMZt+ NzxkDXntrXYuSFsEQy8yOkLtBDNW57G0o36XhPQblzpyyyoCbQpG6F6pGBb5U4aGE11U 7QAVcN1SiOr53u3s3rwWnwm+v3gd0rh0m/Ac+9cj7hty7vxwH9zegXHIOPAiJ8W0r4be GWzezb4jNvQhXIG5NOdhIePOYB0tUhGNFUjpVZDkmwNZqmcm5dFQBjtstRQwD29ukkmo qgPcURCC4YZXpirr/ui1bbnyqBJ9xpge/jWRq+5HEQCsB9Fs5fVdV6AjOHTu7xFJxch4 UBpQ== X-Gm-Message-State: AOJu0YxVq1qa0uhm1XUZA5Vv0GyXumdcnrfJfZ9bVTUDVDzdiR7Jh8NJ M4KuDwMWHEZYMW0pi12SaHFNhQ== X-Google-Smtp-Source: AGHT+IHjtGp1Wx0pTRMC5oIdJCo30HopLTb3rmMXoDNsBFVx5LE9dPzZT3jiLPs7cbEO8bSx3gsKlQ== X-Received: by 2002:a05:6512:52f:b0:502:adbc:9b74 with SMTP id o15-20020a056512052f00b00502adbc9b74mr3460520lfc.68.1697619836804; Wed, 18 Oct 2023 02:03:56 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id w19-20020a05651234d300b005056fb1d6fbsm616595lfr.238.2023.10.18.02.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 02:03:56 -0700 (PDT) From: Linus Walleij Date: Wed, 18 Oct 2023 11:03:45 +0200 Subject: [PATCH net-next v4 6/7] dt-bindings: marvell: Rewrite MV88E6xxx in schema MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231018-marvell-88e6152-wan-led-v4-6-3ee0c67383be@linaro.org> References: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> In-Reply-To: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an attempt to rewrite the Marvell MV88E6xxx switch bindings in YAML schema. The current text binding says: WARNING: This binding is currently unstable. Do not program it into a FLASH never to be changed again. Once this binding is stable, this warning will be removed. Well that never happened before we switched to YAML markup, we can't have it like this, what about fixing the mess? Signed-off-by: Linus Walleij Reviewed-by: Andrew Lunn --- .../bindings/net/dsa/marvell,mv88e6xxx.yaml | 225 +++++++++++++++++= ++++ .../devicetree/bindings/net/dsa/marvell.txt | 109 ---------- MAINTAINERS | 2 +- 3 files changed, 226 insertions(+), 110 deletions(-) diff --git a/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.ya= ml b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml new file mode 100644 index 000000000000..8013ac411b15 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml @@ -0,0 +1,225 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6xxx.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell MV88E6xxx DSA switch family + +maintainers: + - Andrew Lunn + +description: + The Marvell MV88E6xxx switch series has been produced and sold + by Marvell since at least 2010. The switch has a few compatibles which + just indicate the base address of the switch, then operating systems + can investigate switch ID registers to find out which actual version + of the switch it is dealing with. + +properties: + compatible: + enum: + - marvell,mv88e6085 + - marvell,mv88e6190 + - marvell,mv88e6250 + description: | + marvell,mv88e6085: This switch uses base address 0x10. + This switch and its siblings will be autodetected from + ID registers found in the switch, so only "marvell,mv88e6085" shou= ld be + specified. This includes the following list of MV88Exxxx switches: + 6085, 6095, 6097, 6123, 6131, 6141, 6161, 6165, 6171, 6172, 6175, = 6176, + 6185, 6240, 6320, 6321, 6341, 6350, 6351, 6352 + marvell,mv88e6190: This switch uses base address 0x00. + This switch and its siblings will be autodetected from + ID registers found in the switch, so only "marvell,mv88e6190" shou= ld be + specified. This includes the following list of MV88Exxxx switches: + 6190, 6190X, 6191, 6290, 6361, 6390, 6390X + marvell,mv88e6250: This switch uses base address 0x08 or 0x18. + This switch and its siblings will be autodetected from + ID registers found in the switch, so only "marvell,mv88e6250" shou= ld be + specified. This includes the following list of MV88Exxxx switches: + 6220, 6250 + + reg: + maxItems: 1 + + eeprom-length: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Set to the length of an EEPROM connected to the switch. M= ust be + set if the switch can not detect the presence and/or size of a conne= cted + EEPROM, otherwise optional. + + reset-gpios: + description: + GPIO to be used to reset the whole device + maxItems: 1 + + interrupts: + description: The switch provides an external interrupt line, but it is + not always used by target systems. + maxItems: 1 + + interrupt-controller: + description: The switch has an internal interrupt controller used by + the different sub-blocks. + + '#interrupt-cells': + description: The internal interrupt controller only supports triggering + on active high level interrupts so the second cell must alway be set= to + IRQ_TYPE_LEVEL_HIGH. + const: 2 + + mdio: + $ref: /schemas/net/mdio.yaml# + unevaluatedProperties: false + description: Marvell MV88E6xxx switches have an varying combination of + internal and external MDIO buses, in some cases a combined bus that + can be used both internally and externally. This node is for the + primary bus, used internally and sometimes also externally. + + mdio-external: + $ref: /schemas/net/mdio.yaml# + unevaluatedProperties: false + description: Marvell MV88E6xxx switches that have a separate external + MDIO bus use this port to access external components on the MDIO bus. + + properties: + compatible: + const: marvell,mv88e6xxx-mdio-external + + required: + - compatible + +$ref: dsa.yaml# + +allOf: + - $ref: dsa.yaml#/$defs/ethernet-ports + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + #include + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + switch0: ethernet-switch@0 { + compatible =3D "marvell,mv88e6085"; + reg =3D <0>; + reset-gpios =3D <&gpio5 1 GPIO_ACTIVE_LOW>; + interrupts-extended =3D <&gpio0 27 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + #interrupt-cells =3D <2>; + + 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@5 { + reg =3D <5>; + phy-mode =3D "sgmii"; + ethernet =3D <ð2>; + + fixed-link { + speed =3D <1000>; + full-duplex; + }; + }; + }; + + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + switch0phy0: ethernet-phy@0 { + reg =3D <0>; + interrupts-extended =3D <&switch0 0 IRQ_TYPE_LEVEL_HIG= H>; + }; + }; + }; + }; + + - | + #include + #include + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + switch1: ethernet-switch@0 { + compatible =3D "marvell,mv88e6190"; + reg =3D <0>; + reset-gpios =3D <&gpio5 1 GPIO_ACTIVE_LOW>; + interrupts-extended =3D <&gpio0 27 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + #interrupt-cells =3D <2>; + + 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"; + }; + }; + + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + switch1phy0: ethernet-phy@0 { + reg =3D <0>; + interrupts-extended =3D <&switch1 0 IRQ_TYPE_LEVEL_HIG= H>; + }; + }; + + mdio-external { + compatible =3D "marvell,mv88e6xxx-mdio-external"; + #address-cells =3D <1>; + #size-cells =3D <0>; + switch1phy9: ethernet-phy@9 { + reg =3D <9>; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt b/Docume= ntation/devicetree/bindings/net/dsa/marvell.txt deleted file mode 100644 index 6ec0c181b6db..000000000000 --- a/Documentation/devicetree/bindings/net/dsa/marvell.txt +++ /dev/null @@ -1,109 +0,0 @@ -Marvell DSA Switch Device Tree Bindings ---------------------------------------- - -WARNING: This binding is currently unstable. Do not program it into a -FLASH never to be changed again. Once this binding is stable, this -warning will be removed. - -If you need a stable binding, use the old dsa.txt binding. - -Marvell Switches are MDIO devices. The following properties should be -placed as a child node of an mdio device. - -The properties described here are those specific to Marvell devices. -Additional required and optional properties can be found in dsa.txt. - -The compatibility string is used only to find an identification register, -which is at a different MDIO base address in different switch families. -- "marvell,mv88e6085" : Switch has base address 0x10. Use with models: - 6085, 6095, 6097, 6123, 6131, 6141, 6161, 6165, - 6171, 6172, 6175, 6176, 6185, 6240, 6320, 6321, - 6341, 6350, 6351, 6352 -- "marvell,mv88e6190" : Switch has base address 0x00. Use with models: - 6190, 6190X, 6191, 6290, 6361, 6390, 6390X -- "marvell,mv88e6250" : Switch has base address 0x08 or 0x18. Use with mod= el: - 6220, 6250 - -Required properties: -- compatible : Should be one of "marvell,mv88e6085", - "marvell,mv88e6190" or "marvell,mv88e6250" as - indicated above -- reg : Address on the MII bus for the switch. - -Optional properties: - -- reset-gpios : Should be a gpio specifier for a reset line -- interrupts : Interrupt from the switch -- interrupt-controller : Indicates the switch is itself an interrupt - controller. This is used for the PHY interrupts. -#interrupt-cells =3D <2> : Controller uses two cells, number and flag -- eeprom-length : Set to the length of an EEPROM connected to the - switch. Must be set if the switch can not detect - the presence and/or size of a connected EEPROM, - otherwise optional. -- mdio : Container of PHY and devices on the switches MDIO - bus. -- mdio? : Container of PHYs and devices on the external MDIO - bus. The node must contains a compatible string of - "marvell,mv88e6xxx-mdio-external" - -Example: - - mdio { - #address-cells =3D <1>; - #size-cells =3D <0>; - interrupt-parent =3D <&gpio0>; - interrupts =3D <27 IRQ_TYPE_LEVEL_LOW>; - interrupt-controller; - #interrupt-cells =3D <2>; - - switch0: switch@0 { - compatible =3D "marvell,mv88e6085"; - reg =3D <0>; - reset-gpios =3D <&gpio5 1 GPIO_ACTIVE_LOW>; - - mdio { - #address-cells =3D <1>; - #size-cells =3D <0>; - switch1phy0: switch1phy0@0 { - reg =3D <0>; - interrupt-parent =3D <&switch0>; - interrupts =3D <0 IRQ_TYPE_LEVEL_HIGH>; - }; - }; - }; - }; - - mdio { - #address-cells =3D <1>; - #size-cells =3D <0>; - interrupt-parent =3D <&gpio0>; - interrupts =3D <27 IRQ_TYPE_LEVEL_LOW>; - interrupt-controller; - #interrupt-cells =3D <2>; - - switch0: switch@0 { - compatible =3D "marvell,mv88e6190"; - reg =3D <0>; - reset-gpios =3D <&gpio5 1 GPIO_ACTIVE_LOW>; - - mdio { - #address-cells =3D <1>; - #size-cells =3D <0>; - switch1phy0: switch1phy0@0 { - reg =3D <0>; - interrupt-parent =3D <&switch0>; - interrupts =3D <0 IRQ_TYPE_LEVEL_HIGH>; - }; - }; - - mdio1 { - compatible =3D "marvell,mv88e6xxx-mdio-external"; - #address-cells =3D <1>; - #size-cells =3D <0>; - switch1phy9: switch1phy0@9 { - reg =3D <9>; - }; - }; - }; - }; diff --git a/MAINTAINERS b/MAINTAINERS index 90f13281d297..1b4475254d27 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12625,7 +12625,7 @@ MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER M: Andrew Lunn L: netdev@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/net/dsa/marvell.txt +F: Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml F: Documentation/networking/devlink/mv88e6xxx.rst F: drivers/net/dsa/mv88e6xxx/ F: include/linux/dsa/mv88e6xxx.h --=20 2.34.1 From nobody Thu Dec 18 15:31:51 2025 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 45DBCCDB47E for ; Wed, 18 Oct 2023 09:04:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229802AbjJRJE1 (ORCPT ); Wed, 18 Oct 2023 05:04:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229635AbjJRJEB (ORCPT ); Wed, 18 Oct 2023 05:04:01 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A853F106 for ; Wed, 18 Oct 2023 02:03:59 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-507a62d4788so5804014e87.0 for ; Wed, 18 Oct 2023 02:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697619838; x=1698224638; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=KAoLwGOze8wrOhHWHJbCc0YbKSQgR6L56yNHOLOvQxY=; b=Hqx+8bz+mbRZpLdEyv8DsMIVX0ffYm4VBpOn1diY0DqeY39Nm4XWIiqUy5dlRFg7z9 BmhGUq57UNe8BlxFrYl2YmfAtYP8MJwfZ88CYO/tOqqGMZ0aLNGr83qWfsBquLTX/VQV kImUsuGLtbJPjp4PouvN2PpPEuv7NoYXb8Mnbc3NdLLNx+PkbHdmp7dApZVI3BdcbezK /arcicAxZeXiHKmrbAey1hXlZ5wjXE+V36FG/LCrsStnVy8d9jY1ZD274AdipgSLQ345 uYbzHNfGQvFbFvpOJ9lw+N+iwwMf0J2ZY2/a0ItaG6Wwab1yKGNs3sy3UGSTFFeAdqqU +ARQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697619838; x=1698224638; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KAoLwGOze8wrOhHWHJbCc0YbKSQgR6L56yNHOLOvQxY=; b=oD3SsZg5HiSs+jITQhFlThXYEvANJWnKsyd0cZFKgrBo0Yiivpl5lT4i7NLvRt/pj/ 5G6RyoCyZHbot1Hd27E61BbmjwsUNBowWTXKrwNGF4WdMaTWoDGyZ7FLfMgnugwmNfN7 3vDJLRW5E57Yt1IbeRjdnT9FSkMFfcZouX5tM3W5z+dg5FevL8/FKMFMX6y0M+z1nd92 ooCB8VRoQRk+5GqYqUnpzDq8v1jUcWcze3E+COO95U9jwFGkDT+eWCY0g9vdYE8HHZxB a/9+xUidn/dQCaPo2VfgNEO+ZZE2+K8l4EwdIR6R0xnGQ/j9/G6I1GUqU6EsbdscAtpk tP+w== X-Gm-Message-State: AOJu0YwdcpA9dkCzGLBJ8xHEV3vF+oy0NspLMOgsKURbHufjK7hNpliq LZR/jfRrFdFQo23fDtmpHM0o5w== X-Google-Smtp-Source: AGHT+IFywDCVE3gR9Ux7ZEHzkzY3P0TiOBmbo31y8MNAxSg0CIiSz1/kLuYvTQ7JGVxBY5mY6rQWoQ== X-Received: by 2002:a05:6512:304c:b0:507:8c55:39f9 with SMTP id b12-20020a056512304c00b005078c5539f9mr4283817lfb.49.1697619837993; Wed, 18 Oct 2023 02:03:57 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id w19-20020a05651234d300b005056fb1d6fbsm616595lfr.238.2023.10.18.02.03.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 02:03:57 -0700 (PDT) From: Linus Walleij Date: Wed, 18 Oct 2023 11:03:46 +0200 Subject: [PATCH net-next v4 7/7] dt-bindings: marvell: Add Marvell MV88E6060 DSA schema MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231018-marvell-88e6152-wan-led-v4-7-3ee0c67383be@linaro.org> References: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> In-Reply-To: <20231018-marvell-88e6152-wan-led-v4-0-3ee0c67383be@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Marvell MV88E6060 is one of the oldest DSA switches from Marvell, and it has DT bindings used in the wild. Let's define them properly. It is different enough from the rest of the MV88E6xxx switches that it deserves its own binding. Signed-off-by: Linus Walleij Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean --- .../bindings/net/dsa/marvell,mv88e6060.yaml | 90 ++++++++++++++++++= ++++ MAINTAINERS | 1 + 2 files changed, 91 insertions(+) diff --git a/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.ya= ml b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml new file mode 100644 index 000000000000..787f328551f6 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml @@ -0,0 +1,90 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6060.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell MV88E6060 DSA switch + +maintainers: + - Andrew Lunn + +description: + The Marvell MV88E6060 switch has been produced and sold by Marvell + since at least 2010. The switch has one pin ADDR4 that controls the + MDIO address of the switch to be 0x10 or 0x00, and on the MDIO bus + connected to the switch, the PHYs inside the switch appear as + independent devices on address 0x00-0x04 or 0x10-0x14, so in difference + from many other DSA switches this switch does not have an internal + MDIO bus for the PHY devices. + +properties: + compatible: + const: marvell,mv88e6060 + description: + The MV88E6060 is the oldest Marvell DSA switch product, and + as such a bit limited in features compared to later hardware. + + reg: + maxItems: 1 + + reset-gpios: + description: + GPIO to be used to reset the whole device + maxItems: 1 + +$ref: dsa.yaml# + +allOf: + - $ref: dsa.yaml#/$defs/ethernet-ports + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + #include + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ethernet-switch@16 { + compatible =3D "marvell,mv88e6060"; + reg =3D <16>; + + 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@5 { + reg =3D <5>; + phy-mode =3D "rev-mii"; + ethernet =3D <ðc>; + fixed-link { + speed =3D <100>; + full-duplex; + }; + }; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 1b4475254d27..4c933a2a56ad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12625,6 +12625,7 @@ MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER M: Andrew Lunn L: netdev@vger.kernel.org S: Maintained +F: Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml F: Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml F: Documentation/networking/devlink/mv88e6xxx.rst F: drivers/net/dsa/mv88e6xxx/ --=20 2.34.1