From patchwork Mon Oct 16 09:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 153272 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3332006vqb; Mon, 16 Oct 2023 02:13:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAKOEfqPMQmi6C/OtI0OF2ijRLyU0BSMnp2IfvAd53luyD2pod4mXSkzFH2hf9BtwK/wwz X-Received: by 2002:a17:90b:3b41:b0:27d:2762:2728 with SMTP id ot1-20020a17090b3b4100b0027d27622728mr10114395pjb.0.1697447598312; Mon, 16 Oct 2023 02:13:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697447598; cv=none; d=google.com; s=arc-20160816; b=sAnPFLzSBpfFep4SHXt/EoeDd8dQpdc1hxi+KB6EGx9CUMgmFfjudCW7BzV1xVccy9 OiEt+UwjjQeEjZAu/wYN5LvwZ1xvK78/aFEC3Nsj55Ca74b9Ww6/2Je6BUN2Zq0oRbPV vwkAVeJF9hNPnQ4l6FFjn+mf8K09VBPg2Kc/L1gzDSfNcDGsPOO9oKJsimEb0PPRmcSk DMD4mJ9/1+67PvrMuVzfLlU98Cl70p9i56JhDHEEV3tKu5Q0yVpzau+kB5kyg4E/iyCC P+CZEWU0ec9zXyv38oWSopn1zTevS+/m04NquYmDatoDnaIhnCHGsAGSwwu+NriufZeF qnjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=csVtIQiJ9rcTmlc5xFEcy0AWIMG7+y05IyEKJ7NN1pU=; fh=4OsP5L1B9pUAL+M4LarVIcTAoEa8QdmflUFnWk97NDA=; b=Au6RFy8ghDHpyaCq9vB/IfX/tRjirr/aKJNzy42G0SEtpIRbTWF0ix4cIpUVbNnC4y t73rjtmDnfZzdZs9nEM7Uq39ohxcGUK9Oy9cRogjhxiG5ZLRbAzfECqNdMqCNoWULnD3 W8QiQK7/yKR+iPPsKDYVJ1uoBNbZ4CZO5JVJThuoF8/mhIV9Xx0gxjQzogy8V4ZkOMV0 JE5jadMatqGyzgFAyX2QZXQworBLKQl2Ba5sfvmXiPGMw+18T0wD5TSoy17xA3wOeoUW i7i/anvkMUjXosXGQTZVjL70TV1nmyFYLgAmb8NE5S8cB2w9jFDA1LigS96FpCYeCsLT Qn8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="f5fl/9Fk"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id mi8-20020a17090b4b4800b0027cde7f5860si6114684pjb.30.2023.10.16.02.13.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:13:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="f5fl/9Fk"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2A7CC8040EF4; Mon, 16 Oct 2023 02:13:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232593AbjJPJND (ORCPT + 18 others); Mon, 16 Oct 2023 05:13:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232447AbjJPJNB (ORCPT ); Mon, 16 Oct 2023 05:13:01 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CEFFE6 for ; Mon, 16 Oct 2023 02:12:58 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-5041bb9ce51so5059428e87.1 for ; Mon, 16 Oct 2023 02:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697447576; x=1698052376; 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=csVtIQiJ9rcTmlc5xFEcy0AWIMG7+y05IyEKJ7NN1pU=; b=f5fl/9Fk4aXIHCrEqnKOWWSgXAUu/gbgVDklFKbFqvt0mhSHLX5u1ngmq3kb2R9yfQ VgB+ml9TPHXqF1aqHq6+XXPsPk990hxJpUMD6i+OnMPP40ZTV7l4Vxtmud3Tw+uQT8A3 PQvhOQ0qPHmQb4/94rH9EbligYwROVlaQ7v23sQzNrFZbNvKjO2Zz3r29baU/DTXLwZO q2UBUhD+lg9po717JojkH6gptYDSd9647e0GOucUWbW1rc20IM9yQqSBppGRAJF4gy/K BvNOoS3fC+NiwKiIPX4nlBPgAPmWhDo0u3cCjPwQLQjDQtL6JfAEgj/FrD9Wd5slMzNb 3d/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697447576; x=1698052376; 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=csVtIQiJ9rcTmlc5xFEcy0AWIMG7+y05IyEKJ7NN1pU=; b=VOnnojQUE2+aTpLsRXE7OmK/eEvspGhcUG1+VvLAQdrMc0zpSjDCj27GObMwzEL27k z0vSUT4AmKYaR1HAAWmUBAfoppk8Kxxco4vvEJDENIxLp2eQp9+lnYqoK9s7r3ChJdO0 WBgjCcvy1pZxqqe808rt6+mS/tDf940GKDK3V/iolnk0rGt+qP1LlbFq8e6X1jUBQhS5 0200eaGdjFHihLJrlzlNQsJZlfu9GwQS6Hlo0XFZGtswXfyFPGPL2W5SRv03XTgXESjB MsrX/A+4rGD5d9DimVgBqoAxJnmEsCjxNC+B166kEDxENEVn5bWZYiIf4FeMMpPk/AJ6 0NwQ== X-Gm-Message-State: AOJu0YwPNdY6Xl3TjqcSemqfgilK32u6FYa682eWhxm1CFFRVy5F/HKu eAZgzgNcGz/qZsbOkclPC1n2Xl8ibUxuaC1zaxY= X-Received: by 2002:ac2:5f47:0:b0:507:9f51:acee with SMTP id 7-20020ac25f47000000b005079f51aceemr5111729lfz.22.1697447576507; Mon, 16 Oct 2023 02:12:56 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id br34-20020a056512402200b005068e7a2e7dsm4160986lfb.77.2023.10.16.02.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:12:56 -0700 (PDT) From: Linus Walleij Date: Mon, 16 Oct 2023 11:12:54 +0200 Subject: [PATCH net-next v3 1/6] dt-bindings: marvell: Rewrite MV88E6xxx in schema MIME-Version: 1.0 Message-Id: <20231016-marvell-88e6152-wan-led-v3-1-38cd449dfb15@linaro.org> References: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@linaro.org> In-Reply-To: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 02:13:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779902813029040699 X-GMAIL-MSGID: 1779902813029040699 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 --- .../bindings/net/dsa/marvell,mv88e6xxx.yaml | 243 +++++++++++++++++++++ .../devicetree/bindings/net/dsa/marvell.txt | 109 --------- MAINTAINERS | 2 +- 3 files changed, 244 insertions(+), 110 deletions(-) diff --git a/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml new file mode 100644 index 000000000000..954db04147f8 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml @@ -0,0 +1,243 @@ +# 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: + oneOf: + - 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" should 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" should 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" should 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. Must be + set if the switch can not detect the presence and/or size of a connected + 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# + +patternProperties: + "^(ethernet-)?ports$": + type: object + patternProperties: + "^(ethernet-)?port@[0-9]+$": + type: object + description: Ethernet switch ports + + $ref: dsa-port.yaml# + + unevaluatedProperties: false + +oneOf: + - required: + - ports + - required: + - ethernet-ports + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + #include + mdio { + #address-cells = <1>; + #size-cells = <0>; + + switch0: switch@0 { + compatible = "marvell,mv88e6085"; + reg = <0>; + reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; + interrupt-parent = <&gpio0>; + interrupts = <27 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + #interrupt-cells = <2>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan1"; + }; + port@1 { + reg = <1>; + label = "lan2"; + }; + port@2 { + reg = <2>; + label = "lan3"; + }; + port@3 { + reg = <3>; + label = "lan4"; + }; + port@4 { + reg = <4>; + label = "wan"; + }; + + port@5 { + reg = <5>; + phy-mode = "sgmii"; + ethernet = <ð2>; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + switch0phy0: switch0phy@0 { + reg = <0>; + interrupt-parent = <&switch0>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; + }; + }; + }; + }; + + - | + #include + #include + mdio { + #address-cells = <1>; + #size-cells = <0>; + + switch1: switch@0 { + compatible = "marvell,mv88e6190"; + reg = <0>; + reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; + interrupt-parent = <&gpio0>; + interrupts = <27 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + #interrupt-cells = <2>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan1"; + }; + port@1 { + reg = <1>; + label = "lan2"; + }; + port@2 { + reg = <2>; + label = "lan3"; + }; + port@3 { + reg = <3>; + label = "lan4"; + }; + }; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + switch1phy0: switch1phy@0 { + reg = <0>; + interrupt-parent = <&switch1>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; + }; + }; + + mdio-external { + compatible = "marvell,mv88e6xxx-mdio-external"; + #address-cells = <1>; + #size-cells = <0>; + switch1phy9: switch1phy@9 { + reg = <9>; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt b/Documentation/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 model: - 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 = <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 = <1>; - #size-cells = <0>; - interrupt-parent = <&gpio0>; - interrupts = <27 IRQ_TYPE_LEVEL_LOW>; - interrupt-controller; - #interrupt-cells = <2>; - - switch0: switch@0 { - compatible = "marvell,mv88e6085"; - reg = <0>; - reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - switch1phy0: switch1phy0@0 { - reg = <0>; - interrupt-parent = <&switch0>; - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; - }; - }; - }; - }; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - interrupt-parent = <&gpio0>; - interrupts = <27 IRQ_TYPE_LEVEL_LOW>; - interrupt-controller; - #interrupt-cells = <2>; - - switch0: switch@0 { - compatible = "marvell,mv88e6190"; - reg = <0>; - reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - switch1phy0: switch1phy0@0 { - reg = <0>; - interrupt-parent = <&switch0>; - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; - }; - }; - - mdio1 { - compatible = "marvell,mv88e6xxx-mdio-external"; - #address-cells = <1>; - #size-cells = <0>; - switch1phy9: switch1phy0@9 { - reg = <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 From patchwork Mon Oct 16 09:12:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 153276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3332245vqb; Mon, 16 Oct 2023 02:13:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHAxu8ihB5uBK501sOXDQjJkBt0IymoUnP8a+KqicCCyfQW9q10IMrCYP32optTiMtvxT5q X-Received: by 2002:a05:6871:8a18:b0:1e9:bb3a:9a32 with SMTP id tl24-20020a0568718a1800b001e9bb3a9a32mr10012645oab.0.1697447638002; Mon, 16 Oct 2023 02:13:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697447637; cv=none; d=google.com; s=arc-20160816; b=GwlDyt+UyNqY0iICaGDp3IXtjVAWorW2WsUuV6xvSV9ltpDPZuurIjrYB4zu9T4Wa1 w86Z0Xamx5H1T5uWdnfoZcefrvTkqnLbxIWXFUaQ3ZNLcxXw4cVwDec89VdI7ROTVZad f966wLyxyKMDfnysrXZQdJAmWrlrgTVMitJ2vXbnLUQ5six0yBVpLc4y7sSUe2RnH86h VUI+u0DBluXPpyV3Q2WeHtL6nXc4y1aD9k5uiNwpJDomLPvdgJ8IvgnIs/rNhE1QTOXQ /ta1uPa65lCAmiG8y2F938JZeBtA40jUMm57jg3rju2iOwzL/OF0IehADK9uZfYGlLFF 1uuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=foLlklZzbf/rl97C1z+LoU2FISNG4qswwP4hiHZTUHc=; fh=4OsP5L1B9pUAL+M4LarVIcTAoEa8QdmflUFnWk97NDA=; b=zKpSe8iSqpO3AIMWnb6nU3P2BJObW3nUPw/Ucp+znowkkM5lXSI25NQcmDPS3USrWA mU76XQO3WN9a1jsoqJoKxZNMfDNN7aTf5gikeTdI99Je7K/GG9VvGI5nD4rz6hXY7rne 0laPO/7QCX4oV457BtEf5TXqircXBLu55ACSFv3DU9s9tPVDvwjBUam1EQnsWmoTrOLX SHjpnm8kCr98uyMfnaQxoSWvz9qHTMbednCKBsXh3ZIThs7TgZP3WGk9vcUvhsPu9zh/ wefTfovGq75z5V562+aO++juEF74zMDy8wiuwuifcPjoFvlEObcTybm1vGoC9/I/OOl3 wVew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=glCx+sFS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id m10-20020a634c4a000000b0055c7eb53d7fsi10003541pgl.584.2023.10.16.02.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:13:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=glCx+sFS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 9372C8066C42; Mon, 16 Oct 2023 02:13:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232661AbjJPJNJ (ORCPT + 18 others); Mon, 16 Oct 2023 05:13:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232508AbjJPJNC (ORCPT ); Mon, 16 Oct 2023 05:13:02 -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 3CC33EA for ; Mon, 16 Oct 2023 02:12:59 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-5046bf37ec1so5139371e87.1 for ; Mon, 16 Oct 2023 02:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697447577; x=1698052377; 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=foLlklZzbf/rl97C1z+LoU2FISNG4qswwP4hiHZTUHc=; b=glCx+sFS7PVZ6BNeOuCkfrFMdt5RVOVRnTP8XwIKpskDEV+J5GjXzS3+CtlgaJTnht +S9qwLqceyo7/293Z+UEkUcd21Ttrx+HhAmhg3chf8x/PRwyerkylldmUH0SaUr7CbBM bzeI9A1kuv911ZO4b1P4mL7UqTkFkNaJGo5mOGsj89qSgDy5h+Dml+EdxJTIkDbBNiw9 ObwsxJxGtIFI9aywY5Zmdr4hiFDluY76P0eOnjy07RJLqmXgaEF9bKnjvwP6J8ZI62z2 +N4bfsKqEXlRa760Og0Ei42y06zUzxbaL7jlqL3wtomi0AhK4cpUGvgJZMo/yrb/dW5n 9oZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697447577; x=1698052377; 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=foLlklZzbf/rl97C1z+LoU2FISNG4qswwP4hiHZTUHc=; b=l8fONlUDquEEnDEOHPXNrf0ZwgGJbwmElB4aRbb9F2odYqM3ppJyvX2bZOZNtFce9e ug5dlYPbGJ9i5ZOolhgG/bDO7zoU341Evy51sKsauHNsxdJCUJwfrTOGCtDMwPF+/LTs QEnggb9jjzYIoHg3SF10YkA4MOPCKZWjXBlwBhoIeP++LNhjL344K4oph1i83/NEfF1A NgtGbmJgtNx60X0MN//Xl2pscPqaljJZdraej1GF50DMBXyY544QNbycID/sME5iwp1A OTDdWyqx4+nzn/olcXzLYBTdl2ZIlWmAtgrdnW0CMcFRkzq3O6yZI+oUI7rrwAHF9H4D Dt9g== X-Gm-Message-State: AOJu0Ywy+lfJzvBfAXJOf6bjsQy8c5dQ87iWuZVzixrN2j2ORNeTgfg5 MiQfO67bS5fn8taVNbUfDrI65A== X-Received: by 2002:a05:6512:324e:b0:503:7c0:ae96 with SMTP id c14-20020a056512324e00b0050307c0ae96mr26361366lfr.20.1697447577585; Mon, 16 Oct 2023 02:12:57 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id br34-20020a056512402200b005068e7a2e7dsm4160986lfb.77.2023.10.16.02.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:12:57 -0700 (PDT) From: Linus Walleij Date: Mon, 16 Oct 2023 11:12:55 +0200 Subject: [PATCH net-next v3 2/6] dt-bindings: marvell: Add Marvell MV88E6060 DSA schema MIME-Version: 1.0 Message-Id: <20231016-marvell-88e6152-wan-led-v3-2-38cd449dfb15@linaro.org> References: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@linaro.org> In-Reply-To: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 16 Oct 2023 02:13:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779902854005284638 X-GMAIL-MSGID: 1779902854005284638 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 --- .../bindings/net/dsa/marvell,mv88e6060.yaml | 105 +++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 106 insertions(+) diff --git a/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml new file mode 100644 index 000000000000..01db7df1bab6 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml @@ -0,0 +1,105 @@ +# 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 PHY:s 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# + +patternProperties: + "^(ethernet-)?ports$": + type: object + patternProperties: + "^(ethernet-)?port@[0-9]+$": + type: object + description: Ethernet switch ports + + $ref: dsa-port.yaml# + + unevaluatedProperties: false + +oneOf: + - required: + - ports + - required: + - ethernet-ports + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + #include + mdio { + #address-cells = <1>; + #size-cells = <0>; + + switch@16 { + compatible = "marvell,mv88e6060"; + reg = <16>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan1"; + }; + port@1 { + reg = <1>; + label = "lan2"; + }; + port@2 { + reg = <2>; + label = "lan3"; + }; + port@3 { + reg = <3>; + label = "lan4"; + }; + port@5 { + reg = <5>; + phy-mode = "rev-mii"; + ethernet = <ðc>; + fixed-link { + speed = <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/ From patchwork Mon Oct 16 09:12:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 153273 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3332044vqb; Mon, 16 Oct 2023 02:13:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8+Rj+gtwpDcaiG9r8E/J9aZfF8ypM59A1Bo4+DnrQnHmm74js8tqjw7FXmJT1h1tiq1RG X-Received: by 2002:a17:90b:4b04:b0:27d:1593:2b08 with SMTP id lx4-20020a17090b4b0400b0027d15932b08mr13006707pjb.0.1697447605990; Mon, 16 Oct 2023 02:13:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697447605; cv=none; d=google.com; s=arc-20160816; b=pzrdWclFuH5aWFV+pzrL0wFcXl0H3TEt/ngh+iTD1zSu7A0R6Kon9UB9vzqR3Dm+aS 9GBTv6/AUs+2InHwp6k3cFCeHUdh9j9iArD+wO09gFTgZyTloVxcDFbUz5aTKYRu9W40 jXAVFB4ziE+HfYpGYlvSy6AiVLcxiOZgHWZLC2UmNRlKs+woA2TNYAzwB5bYkdAMlSkk um6FgbhUmK28III9/VBNBN4YDhHIH9eDvynPYpVjhcDmvia6/fVi5H+NcOrSzVwDg0Ay ex9TpHzzb1znLiFUlXJmTN28PCCJzfcViDkOBkfkRZxYCRlpXyHIiURnLhlIasVa3rMw +Gpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=XQgNJEaB9CDsyBYuoK51xMQLKTuugJ9THzHXrzK30U8=; fh=4OsP5L1B9pUAL+M4LarVIcTAoEa8QdmflUFnWk97NDA=; b=Aq3MlEwfJVusH9kqURUWK/aTiCGIIpPUaiTJn1/Axxqhz+di6pWahNDrnw6Xo1YHOl uZO6BfZ2bj47CAnNG1pvmfMBOxDuei+YZDxxhEmfBwbuh6BWulJhVZZbnNaeLuT8z/1K z92v15uu9YDP8bpl4aPeTrHcGffo+WDco8IabbatMHO7YvYuZpa0QsuC5MWL7iTyFKQ+ 06QvpuYr5eogFl7Sn95j8s1Ny04Rm3uWQBVK1ZQ6VrdH1yeRyV88Kxdjb1mLm7dJwZdx lSWAS0Hx/TwYaUZPvGQTFQ5dpPxXYTtR+zXHsGpXw088uxCBuJSAVnbwe1dD0jVB/SsP 8vww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nQb0QjKa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ob2-20020a17090b390200b0027d22503b9esi6198931pjb.84.2023.10.16.02.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:13:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nQb0QjKa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id BEFCF8040E88; Mon, 16 Oct 2023 02:13:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233149AbjJPJNO (ORCPT + 18 others); Mon, 16 Oct 2023 05:13:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232401AbjJPJNC (ORCPT ); Mon, 16 Oct 2023 05:13:02 -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 42E62EE for ; Mon, 16 Oct 2023 02:13:00 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-507a55302e0so1778347e87.0 for ; Mon, 16 Oct 2023 02:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697447578; x=1698052378; 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=XQgNJEaB9CDsyBYuoK51xMQLKTuugJ9THzHXrzK30U8=; b=nQb0QjKaJfnIvo4xGbOlb7nrByQ5Rzxb52OhRQingH6C7lOLJ6+YiClX5pi4SVfrf0 CJB1vn/eD5cNAbQwpqc4vGlwM5DDzPrKJmhHpAK6QZP7Sazrwt12ZCyWTiSU2vSTyuOW M91/zICsKRcowA/fbLtD2jurEDb2iCjHktQV0OXBullY5DvOtK/2Af1PFnzJUnXHtbsn xzWmbzgFD4qkTLZ41IJGdW80y2AJV43bKvAi8IVR2891r0CPF3OFHeK6aXQZGyQK8vhD 7BB+bd/jX9UnVZXBNlr136ByUytUMfoXCXGrPEhgDc/JEJ+9RpXBZhOjX+FIzKracN6n DGrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697447578; x=1698052378; 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=XQgNJEaB9CDsyBYuoK51xMQLKTuugJ9THzHXrzK30U8=; b=heazk2s7yaeKFZ1MZG9Y7g0xrgt+NaIiZeeiehCcV2zzGHbKYxnkV1AEM7bCvVD2R7 WgDqskIAU8tQ8A550wW3f8GDfshnsvXpb3S3cE/1gx75j2vmj+tXk9a78Eh/1JYyWZjH 4wV8jP3svi93KSEH9oB4zCuJArxT2/mm2gEcCEw7hNiHkW701iJUc/u0MO7rBG62otjc 8bApGdG0Xe34dcn7a6fUzQ1C7Sg182ZpyhYF0wcFrTgPgykJHBbakf7RNb7wSRKIWS1S 7rCx51VcxuazSYXLgmAb0ATGncTjsWVNYdqkO2BWH9QNo0deGgk9l0OQZ0xSvz2VuZVQ oRnA== X-Gm-Message-State: AOJu0Yz0XO+lkWTw35SbQDPHxCKFAT6l7Qa8E0EjIXJIRCKektXg2urL aBroO8qhWRz+fYnSnVYOjWo+kA== X-Received: by 2002:a05:6512:39d1:b0:500:ac71:8464 with SMTP id k17-20020a05651239d100b00500ac718464mr33408434lfu.66.1697447578588; Mon, 16 Oct 2023 02:12:58 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id br34-20020a056512402200b005068e7a2e7dsm4160986lfb.77.2023.10.16.02.12.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:12:58 -0700 (PDT) From: Linus Walleij Date: Mon, 16 Oct 2023 11:12:56 +0200 Subject: [PATCH net-next v3 3/6] dt-bindings: net: mvusb: Fix up DSA example MIME-Version: 1.0 Message-Id: <20231016-marvell-88e6152-wan-led-v3-3-38cd449dfb15@linaro.org> References: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@linaro.org> In-Reply-To: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 02:13:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779902821072778005 X-GMAIL-MSGID: 1779902821072778005 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. Signed-off-by: Linus Walleij --- Documentation/devicetree/bindings/net/marvell,mvusb.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/net/marvell,mvusb.yaml b/Documentation/devicetree/bindings/net/marvell,mvusb.yaml index 3a3325168048..ee677cf7df4e 100644 --- a/Documentation/devicetree/bindings/net/marvell,mvusb.yaml +++ b/Documentation/devicetree/bindings/net/marvell,mvusb.yaml @@ -56,6 +56,12 @@ examples: ports { /* Port definitions */ + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + }; }; mdio { From patchwork Mon Oct 16 09:12:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 153274 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3332115vqb; Mon, 16 Oct 2023 02:13:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxucCzZflKktNfJ9kkf63jeo2G12hLtLOtTh8bor5L1EU6ngTx8clEufI9acP2AfgppLJf X-Received: by 2002:a05:6a00:4ac1:b0:6b9:7d5c:bb58 with SMTP id ds1-20020a056a004ac100b006b97d5cbb58mr6216107pfb.0.1697447615664; Mon, 16 Oct 2023 02:13:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697447615; cv=none; d=google.com; s=arc-20160816; b=IQzuz9UBz1dPAsAh2lXDYC9NYO4p0X88zt7MyIJP4e5npWzcETRF+PkYvEsH9Rk40U qOxKGiElojbNGFW5phjiBLx7eDxkIZ1F+JdXYjtLQnWlozwhP67JOCB4npCLmkT7ORAM dXjiabsmT0YY1Tlzn/EiM2LqMEr8BRYlgTjWPmATJayHY71l/ymt09KgddOXpcDPBn7U 8LcIepLlJ+p9TJA2alPMkeFe2JJEFXEOafS0IjE/scB7CyKeBI7Zcp9VdBCDMlMJtfsV IQ8rLYdsTgfqMvfRaee1EucKf2UrKD0rKTXKmK2YhPgdUvybNMIBK481BQHNLqqC2n2v Xtpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=XhgTFSg7xZQFKqQUdPj7mdXINHwkkUMiMJQ/LwbGzwg=; fh=4OsP5L1B9pUAL+M4LarVIcTAoEa8QdmflUFnWk97NDA=; b=z+ErLWCOCwKQmHLOuonpFyG8h4HpR8dt79+0O8nN6ZvZRwax07KhpdeDvlBgzrpafy x67ezW6qSwFC4MmbDhiFwcX2BFcTauUADJIhcLsYd5DukOjeqEBqbqpLPfukY4Ol5JF3 ptG/H3VPIMt1kySPecb25o1lGJcAbza8+4mZcVR65fXLS49rZ09pwlfF4JNKlsKHECOU XPDLonXJgS5Zctrqk0hHpB5HrTpCFBBkQzkkghnnZQ/QmFFzb8CyaAn/5K5rmBgp696R T4cHbViA74Sb6U1ZYSTmAApHAnLMcOeeMPDIztKjWvM5pNIxUc4ijzSmrXnFNNeA1+XI mLrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hV1+j3oW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id h22-20020a056a00231600b006be1d2ee8f2si1977672pfh.122.2023.10.16.02.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:13:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hV1+j3oW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id D8126802C021; Mon, 16 Oct 2023 02:13:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232907AbjJPJNU (ORCPT + 18 others); Mon, 16 Oct 2023 05:13:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232550AbjJPJND (ORCPT ); Mon, 16 Oct 2023 05:13:03 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B34F95 for ; Mon, 16 Oct 2023 02:13:01 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-50308217223so4920977e87.3 for ; Mon, 16 Oct 2023 02:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697447579; x=1698052379; 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=XhgTFSg7xZQFKqQUdPj7mdXINHwkkUMiMJQ/LwbGzwg=; b=hV1+j3oWkJdZ47Ch0mlBiSELXadHIAWPM9iTzg05wH/Lw0noqw2OwkR6zKitV7/yXU rk8X5uHrJYgv7HCqZ4zGvgtPiX6+TNCmzxcvy8yzMp22hxNrkrquIdVZqXELoZXUlIJV G4V7phcoOE1Ek9ejF+nCGBvpXYJ4FhVAK3d/2KNw6THBUSk0jGbf0lD5OdEdHuSPIfM3 S/8ZytuKKUInv2AB2wbVbOGpUyC1wrlyTIu8SCdTskJFmf84/gAD4FBi3+xWwQPr2EMq n5xQ8DYoGYoxdKZDMLeYMeQyzLJC50jDzMHIZ7uEi9EoCaH8u/0Uf1BDmtyXRqbROdk6 gEtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697447579; x=1698052379; 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=XhgTFSg7xZQFKqQUdPj7mdXINHwkkUMiMJQ/LwbGzwg=; b=iWfLXjfQ63/JUxnZPmyGLQj2zOm5X2JiNfpUopOf7tvcxL/x3OPwHYu9t6jxNYv046 wBAskRZM/+z7QGEWSCq4gArhuNGGTADdFDegqYgKHkjnfCgEp5yQl1XufY6sF22hBgFK VFxtSn1RMnZyalY23v1CrHokebSWtWQTuIs3IseOpah7HIxnS8PnqqmSP/UqoaC866jc BVTJ7k8AaMA7Xz9R/akZs0W2+jBTyAUSBtxQr0P042wJVfUm/UWOxJF/ThqKvbGzQKD7 qFa7hxT9EQKAy/xNhmwn+fGdpqm/xtq4U7EyaMy0r8ssBPLWR6QoBkUAzJ9FcJz5OyFH qkPg== X-Gm-Message-State: AOJu0YxDukvU13W690c7ZDOfZ5Vr20MOy6wnoIbcTj5aBxpaV2+o272a biEhp21pEHC4pd7bD8Fipa3bXw== X-Received: by 2002:ac2:5623:0:b0:507:a624:3f36 with SMTP id b3-20020ac25623000000b00507a6243f36mr3355753lff.11.1697447579524; Mon, 16 Oct 2023 02:12:59 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id br34-20020a056512402200b005068e7a2e7dsm4160986lfb.77.2023.10.16.02.12.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:12:59 -0700 (PDT) From: Linus Walleij Date: Mon, 16 Oct 2023 11:12:57 +0200 Subject: [PATCH net-next v3 4/6] ARM: dts: marvell: Fix some common switch mistakes MIME-Version: 1.0 Message-Id: <20231016-marvell-88e6152-wan-led-v3-4-38cd449dfb15@linaro.org> References: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@linaro.org> In-Reply-To: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 16 Oct 2023 02:13:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779902831254319076 X-GMAIL-MSGID: 1779902831254319076 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. - port@a is not normal port naming, use decimal port@10. - 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 --- arch/arm/boot/dts/marvell/armada-370-rd.dts | 2 -- .../arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts | 6 ++---- 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, 11 insertions(+), 23 deletions(-) diff --git a/arch/arm/boot/dts/marvell/armada-370-rd.dts b/arch/arm/boot/dts/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 { switch: switch@10 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <0x10>; interrupt-controller; #interrupt-cells = <2>; diff --git a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts b/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts index f4c4b213ef4e..cf37f53ec070 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 { switch@0 { compatible = "marvell,mv88e6190"; - #address-cells = <1>; #interrupt-cells = <2>; interrupt-controller; interrupt-parent = <&gpio1>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>; pinctrl-0 = <&switch_interrupt_pins>; pinctrl-names = "default"; - #size-cells = <0>; reg = <0>; mdio { @@ -214,12 +212,12 @@ port@9 { reg = <9>; }; - port@a { + port@10 { /* 88X3310P external phy */ label = "lan10"; phy-handle = <&phy2>; phy-mode = "xaui"; - reg = <0xa>; + reg = <10>; }; }; }; diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts b/arch/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 @@ / { }; &mdio { - switch0: switch0@4 { + switch0: switch@4 { compatible = "marvell,mv88e6190"; reg = <4>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts b/arch/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 { }; &mdio { - switch0: switch0@4 { + switch0: switch@4 { compatible = "marvell,mv88e6085"; reg = <4>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi b/arch/arm/boot/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 { switch@0 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <0>; ports { diff --git a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts b/arch/arm/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 = "default"; pinctrl-0 = <&swint_pins>; compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; dsa,member = <0 0>; reg = <0x10>; @@ -452,32 +450,32 @@ ports { #address-cells = <1>; #size-cells = <0>; - ports@0 { + port@0 { reg = <0>; label = "lan0"; }; - ports@1 { + port@1 { reg = <1>; label = "lan1"; }; - ports@2 { + port@2 { reg = <2>; label = "lan2"; }; - ports@3 { + port@3 { reg = <3>; label = "lan3"; }; - ports@4 { + port@4 { reg = <4>; label = "lan4"; }; - ports@5 { + port@5 { reg = <5>; ethernet = <ð1>; phy-mode = "rgmii-id"; @@ -488,7 +486,7 @@ fixed-link { }; }; - ports@6 { + port@6 { reg = <6>; ethernet = <ð0>; phy-mode = "rgmii-id"; diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/boot/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 { switch@4 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <4>; pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts b/arch/arm/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 { switch@0 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <0>; ports { From patchwork Mon Oct 16 09:12:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 153275 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3332151vqb; Mon, 16 Oct 2023 02:13:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEiohHBfcw9SpeAuQx/OwpIHC+tf1viykn6WWs3D4inSUk8zH+McnEc5WU3AwToWxAogYua X-Received: by 2002:a17:902:f686:b0:1c7:5581:f9c with SMTP id l6-20020a170902f68600b001c755810f9cmr37030453plg.0.1697447621891; Mon, 16 Oct 2023 02:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697447621; cv=none; d=google.com; s=arc-20160816; b=ciuzplJ0U2nS3i9rjhAbnN8i1ehgm8WN2hm5uN0XI5c80skoh0l3qyFrOU0BopV0Cx iMc7pRMHrWXSKKaAakVG+yqhoz94Me0RgnsR7KZE5FwXewHA171FjdhWur2cRJv1v1P2 Hdl850in+pgjijrizFqehRPS7gUPZCruClqQ4Qpeo/YVtAMfjA8rgwYjsqpBYjdhy+qg Z8X0a02f08rKAcLnCGXSk3YwvpW8QgLKC/UtMdC2UOXllqQyVTjw45U666f0Pdh0KI++ DbJjEFSmCh81p0AtTwXCvNj8Q2QM0QtxfoJ4pnUMY6jC9xnawiJQDlBH8vDWXoPnAWA4 S9Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=bRAJxOH+ejiFnd2dNnRhzRVyCxEiMIKKKk9Axu7hk70=; fh=4OsP5L1B9pUAL+M4LarVIcTAoEa8QdmflUFnWk97NDA=; b=QXyESPej1NQ0l8HXrdmr/yj7XM2M9211PNMtc4L97WxLSEcMTgVuYHWIPaj7kYH4oI PJQPv8LnMrP9Ifcat7rSxUuARwB+U0cBANLRvwLYcX2VIDcVjPsojOUMVj65dfYqK59P bMXIWVmsoKJPtvXWB9h6Ijip8n32kzZNPnApAdu/lMfPcjTxXEt0gLiqYIkDzHOm5E4A VxbqHF1n37/Dte3JJDUre6Hp56UPPwQ8vV2fNpJbIZchuZJIcN2uw1Nt5/nfCfy4UWWf Y5HBscyn6Z/iOGS7Ab9VvEBN7jZcCaGhQeQpmBL0vzPqr7+iEmjWyW4sGF0vDxdrcMoY 3MMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gD117U+9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id y23-20020a17090264d700b001c72c893ac9si9922898pli.104.2023.10.16.02.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:13:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gD117U+9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 9CBA480ACC59; Mon, 16 Oct 2023 02:13:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232963AbjJPJNY (ORCPT + 18 others); Mon, 16 Oct 2023 05:13:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232648AbjJPJNE (ORCPT ); Mon, 16 Oct 2023 05:13:04 -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 36E0DED for ; Mon, 16 Oct 2023 02:13:02 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-50308217223so4921000e87.3 for ; Mon, 16 Oct 2023 02:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697447580; x=1698052380; 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=gD117U+9Y4IcvmAhkic2zi/lEUGk6s1hogaUAZq2oprwEMC8bDMF+kPHAhWeuL19Gb QvwNKubIcMIda0fRh9WPC48uIWuKADK0ZY8w96K8n+5Gm4c3jlU8H7Aw5oIFXfQUTNmd ksutv8VwqAgk01/xX7e9RuNcHwYV2lEQLf9ucPtO3IB0H0SGvQWt2nmxgaxsXyFo4nRS o/jBsIHDs0H/5TetjHqgaOzKpvrw3zy+kmCQzchAzTS9sg4z5x/k+Y9QggDLNajZu7k+ swHxRcxBRxmryd683a73LIN3gCN/4LHrF+ykd50nQl4S8mf1+ZZxb/GzQeBGya9k3VaE 3UVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697447580; x=1698052380; 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=LmKaET9SlX76YSEamM2vJR4OvuKVXWXY6WowNYKQr4pUcMpDneXc0X+GuuElXlgnrL UmxMjyzO+lTEx8ssj1Qa5PPx2rxN5Pvw2Iq0L1+AadmXpKx8Kuuz8ZAcGedmZXH1I1R8 ZD9CNgDf0+PyaxOsUydFPh0bv0SxYMTKejfBuu4jxZQYXOq0wvpTrDdB988eJuCUOzz5 niEjI6RYkgBv4w/HrJUIxQquWPhjLHQZoDv9Vg5p0M7xy3rn+f86F7wkH0MgwaaEtjER 9AFGNNXslfDlFpSF3qdAlMNlenb7YhNQB1qppdk6VQAA2vhFLsZ+WNqpSUTefKZ9BH8P BcOQ== X-Gm-Message-State: AOJu0YyQP53C2CxFFdUYNboRpqmO6sIzFTcDpHMomGkInbvY0tnsBOGJ v5Gsjlt2W7SO4uVKhF3p8jskjw== X-Received: by 2002:ac2:44cb:0:b0:4fe:279b:8a02 with SMTP id d11-20020ac244cb000000b004fe279b8a02mr26090531lfm.67.1697447580506; Mon, 16 Oct 2023 02:13:00 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id br34-20020a056512402200b005068e7a2e7dsm4160986lfb.77.2023.10.16.02.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:13:00 -0700 (PDT) From: Linus Walleij Date: Mon, 16 Oct 2023 11:12:58 +0200 Subject: [PATCH net-next v3 5/6] ARM: dts: nxp: Fix some common switch mistakes MIME-Version: 1.0 Message-Id: <20231016-marvell-88e6152-wan-led-v3-5-38cd449dfb15@linaro.org> References: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@linaro.org> In-Reply-To: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 16 Oct 2023 02:13:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779902837763384719 X-GMAIL-MSGID: 1779902837763384719 Fix some errors in the Marvell MV88E6xxx switch descriptions: - switch0@0 is not OK, should be switch@0 Signed-off-by: Linus Walleij --- 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/dts/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 = "okay"; - switch0: switch0@0 { + switch0: switch@0 { compatible = "marvell,mv88e6085"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_switch>; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts b/arch/arm/boot/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 = <1>; #size-cells = <0>; - switch0: switch0@0 { + switch0: switch@0 { compatible = "marvell,mv88e6190"; reg = <0>; dsa,member = <0 0>; @@ -130,7 +130,7 @@ mdio_mux_2: mdio@2 { #address-cells = <1>; #size-cells = <0>; - switch1: switch1@0 { + switch1: switch@0 { compatible = "marvell,mv88e6190"; reg = <0>; dsa,member = <0 1>; @@ -188,7 +188,7 @@ mdio_mux_4: mdio@4 { #address-cells = <1>; #size-cells = <0>; - switch2: switch2@0 { + switch2: switch@0 { compatible = "marvell,mv88e6190"; reg = <0>; dsa,member = <0 2>; @@ -276,7 +276,7 @@ mdio_mux_8: mdio@8 { #address-cells = <1>; #size-cells = <0>; - switch3: switch3@0 { + switch3: switch@0 { compatible = "marvell,mv88e6190"; reg = <0>; dsa,member = <0 3>; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts b/arch/arm/boot/dts/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 = "okay"; - switch0: switch0@0 { + switch0: switch@0 { compatible = "marvell,mv88e6190"; pinctrl-0 = <&pinctrl_gpio_switch0>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/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 = "okay"; - switch0: switch0@0 { + switch0: switch@0 { compatible = "marvell,mv88e6190"; pinctrl-0 = <&pinctrl_gpio_switch0>; pinctrl-names = "default"; @@ -167,7 +167,7 @@ port@9 { }; }; - mdio1 { + mdio-external { compatible = "marvell,mv88e6xxx-mdio-external"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/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 = "okay"; - switch0: switch0@0 { + switch0: switch@0 { compatible = "marvell,mv88e6190"; pinctrl-0 = <&pinctrl_gpio_switch0>; pinctrl-names = "default"; From patchwork Mon Oct 16 09:12:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 153277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3332284vqb; Mon, 16 Oct 2023 02:14:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEEgCGlKtMwm6mX6PcfAlwgtCQkSsTnK3ecs2scrEuKJx1TuDQd2dh00iXGWsXszMW3UM5r X-Received: by 2002:a05:6a21:197:b0:14e:2c56:7b02 with SMTP id le23-20020a056a21019700b0014e2c567b02mr41956276pzb.0.1697447642251; Mon, 16 Oct 2023 02:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697447642; cv=none; d=google.com; s=arc-20160816; b=kn6mlG+U8M9xY2Fa1iLQs8uK2Jr8+Q552EoQp8z6x9HZY7RIbYtmxOIDrSyOvY7/i3 S0ox2535eeTGJub5nS7JsQkbR7U6L4KG/32LcHxA7Qi3q+K5cuSMnxWdfdkzvg4UT+xm qWqF4i5JsPQ4sCC9Y7S6v52ZuLyAjqLwV/4JTV4HkmcoCQhjd9cLaAdnUQDsH/XTzRqS OGXl50lnXt2bxe9T3RMxzRUa1Bdwh/CVcA4DSIPK33GRzJQGsbPYC8Wxj06ZBQhTOzKj 9b7AetN2OZ2FhuW3vfThG5QemHy+KRnkXVQl8OVKRMAvBQA7/13P2O515htAyvQWq5lZ lSuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=e1L3K+Ebs1IkB2w2DJrMtsRdnXrx4C52cUF/HzYsLH8=; fh=4OsP5L1B9pUAL+M4LarVIcTAoEa8QdmflUFnWk97NDA=; b=u6k6pO4dlWkEVEX8c8VDRuViHc0uUXIN5r+wi5smi74MUEvCAeZRkfHCN7pi17f3sO 0H5kk2ej9Ji3To02g4T61HRxWz4IjRJmNHDhOCeprIyYf+l7QcSjPuZaQHfujjICIo83 SgllAeQAzBt8gJrWBQU3wpLPBZlDdJlaaFl+MFB8bLTwRWVlXPHdwQMTW6zbM50lA4fy OdISv4M2zP1wrHZFHRv+T91pO2w7jZ/sAgORnK8CdWmUPrGQKmLsP4KOr+OmKVScg7Fp SLNv2DkA6p+LnPTgaBQQ/T0tEOvOJ/aIkYkUqidUWbgdQcrNuxBVynoInogwR/KehuXr MmIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hhj2zEX0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id jn20-20020a170903051400b001bf0b29d935si9870111plb.34.2023.10.16.02.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:14:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hhj2zEX0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 6E62980ACC50; Mon, 16 Oct 2023 02:13:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232468AbjJPJNc (ORCPT + 18 others); Mon, 16 Oct 2023 05:13:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232725AbjJPJNG (ORCPT ); Mon, 16 Oct 2023 05:13:06 -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 5817FEB for ; Mon, 16 Oct 2023 02:13:03 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-507a772ed97so1790139e87.3 for ; Mon, 16 Oct 2023 02:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697447581; x=1698052381; 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=e1L3K+Ebs1IkB2w2DJrMtsRdnXrx4C52cUF/HzYsLH8=; b=hhj2zEX02wOMHppCejkRKiGl0rKxAnn5nTqpCnjFcLYddfqc/VTVsukvQXtkEPd9F/ 9mZhCGjzID/SA0dxkdRbCBB1aDLD3/QBXhv83LE2yp0UbICTDH0M1LVNZBoC/UowMs9Y 1d1aX57i0349x1YOufs78PPirM9Mzo7DwXTAfz4WNGtMIbiGd9mcsDSzsMlAfe5IApuS BWF2765H36/4xuOdVMkMQWVtCAPJJAQVoqiYvAz4gMUs/5JdF8+ZBQd+E0LGHAJ8PAEW IgIAI8O5dIIrZv2OouQkqMMz5P1Kb1w7RfMvvuljDDMFN3BXtZj4k5+eKvXROk6TMLj8 Nc7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697447581; x=1698052381; 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=e1L3K+Ebs1IkB2w2DJrMtsRdnXrx4C52cUF/HzYsLH8=; b=m+EVB1Rouvar1wqu57HaqmUnWYsDOBt9ArW4xt7HzC7TGi89ITLShPZJO/SAnP1pf6 TCxI/HA2RCEOo8wgY68afBqRcRq3vlfUxsCKyFoI7VRu6x47wvYx/dckawfoqyQczHKM Iw7UQ8uy5F7/DaNccIuxA4RwQrdW5ZAtpIoUwkH/WgGlHEYH6LlwFqesFPzaX8UvDKVZ 1ACKMHfUDP+wECDcwJG/nSG7aUTB3Y6keGtOXqt2IPuowM6A+lMMTQxHPB8t/Twxmmiz 7SzWkrnMO9dvQrMVD1qRCzQXaeb/IYB+fi1Q7lG6GirhbZ8Fc7OIcviN4cJEDjkcstgJ LQag== X-Gm-Message-State: AOJu0YxV+MwBdY0WGZRTffWQ1iG4FJse5BfvzuvXCezWF7msK0l12SP4 rAVTcnurw41m0VizMRXaSZZn9A== X-Received: by 2002:ac2:54ad:0:b0:507:adc9:a739 with SMTP id w13-20020ac254ad000000b00507adc9a739mr2409707lfk.37.1697447581524; Mon, 16 Oct 2023 02:13:01 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id br34-20020a056512402200b005068e7a2e7dsm4160986lfb.77.2023.10.16.02.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:13:01 -0700 (PDT) From: Linus Walleij Date: Mon, 16 Oct 2023 11:12:59 +0200 Subject: [PATCH net-next v3 6/6] ARM64: dts: marvell: Fix some common switch mistakes MIME-Version: 1.0 Message-Id: <20231016-marvell-88e6152-wan-led-v3-6-38cd449dfb15@linaro.org> References: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@linaro.org> In-Reply-To: <20231016-marvell-88e6152-wan-led-v3-0-38cd449dfb15@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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 16 Oct 2023 02:13:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779902858789821211 X-GMAIL-MSGID: 1779902858789821211 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. - port@a is not normal port naming, use decimal port@10. Signed-off-by: Linus Walleij --- .../boot/dts/marvell/armada-3720-espressobin.dtsi | 4 +-- .../boot/dts/marvell/armada-3720-gl-mv1000.dts | 4 +-- .../boot/dts/marvell/armada-3720-turris-mox.dts | 32 +++++++++++----------- .../boot/dts/marvell/armada-7040-mochabin.dts | 2 -- .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +- arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 6 ++-- 6 files changed, 21 insertions(+), 29 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/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 { }; &mdio { - switch0: switch0@1 { + switch0: switch@1 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <1>; dsa,member = <0 0>; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/arch/arm64/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 { }; &mdio { - switch0: switch0@1 { + switch0: switch@1 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <1>; dsa,member = <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..ea66ba5a9762 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 { }; /* switch nodes are enabled by U-Boot if modules are present */ - switch0@10 { + switch@10 { compatible = "marvell,mv88e6190"; reg = <0x10>; dsa,member = <0 0>; @@ -410,8 +410,8 @@ port@9 { managed = "in-band-status"; }; - switch0port10: port@a { - reg = <0xa>; + switch0port10: port@10 { + reg = <10>; label = "dsa"; phy-mode = "2500base-x"; managed = "in-band-status"; @@ -419,8 +419,8 @@ switch0port10: port@a { status = "disabled"; }; - port-sfp@a { - reg = <0xa>; + port-sfp@10 { + reg = <10>; label = "sfp"; sfp = <&sfp>; phy-mode = "sgmii"; @@ -430,7 +430,7 @@ port-sfp@a { }; }; - switch0@2 { + switch@2 { compatible = "marvell,mv88e6085"; reg = <0x2>; dsa,member = <0 0>; @@ -497,7 +497,7 @@ port@5 { }; }; - switch1@11 { + switch@11 { compatible = "marvell,mv88e6190"; reg = <0x11>; dsa,member = <0 1>; @@ -602,8 +602,8 @@ switch1port9: port@9 { link = <&switch0port10>; }; - switch1port10: port@a { - reg = <0xa>; + switch1port10: port@10 { + reg = <10>; label = "dsa"; phy-mode = "2500base-x"; managed = "in-band-status"; @@ -611,8 +611,8 @@ switch1port10: port@a { status = "disabled"; }; - port-sfp@a { - reg = <0xa>; + port-sfp@10 { + reg = <10>; label = "sfp"; sfp = <&sfp>; phy-mode = "sgmii"; @@ -622,7 +622,7 @@ port-sfp@a { }; }; - switch1@2 { + switch@2 { compatible = "marvell,mv88e6085"; reg = <0x2>; dsa,member = <0 1>; @@ -689,7 +689,7 @@ port@5 { }; }; - switch2@12 { + switch@12 { compatible = "marvell,mv88e6190"; reg = <0x12>; dsa,member = <0 2>; @@ -794,8 +794,8 @@ switch2port9: port@9 { link = <&switch1port10 &switch0port10>; }; - port-sfp@a { - reg = <0xa>; + port-sfp@10 { + reg = <10>; label = "sfp"; sfp = <&sfp>; phy-mode = "sgmii"; @@ -805,7 +805,7 @@ port-sfp@a { }; }; - switch2@2 { + switch@2 { compatible = "marvell,mv88e6085"; reg = <0x2>; dsa,member = <0 2>; diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/arm64/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 = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <3>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/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 = <10000>; }; - switch0: switch0@4 { + switch0: switch@4 { compatible = "marvell,mv88e6085"; reg = <4>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi index 32cfb3e2efc3..2f6281b66467 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 = <0>; }; - switch6: switch0@6 { + switch6: switch@6 { /* Actual device is MV88E6393X */ compatible = "marvell,mv88e6190"; - #address-cells = <1>; - #size-cells = <0>; reg = <6>; interrupt-parent = <&cp0_gpio1>; interrupts = <28 IRQ_TYPE_LEVEL_LOW>; @@ -280,7 +278,7 @@ port@9 { managed = "in-band-status"; }; - port@a { + port@10 { reg = <10>; ethernet = <&cp0_eth0>; phy-mode = "10gbase-r";