From patchwork Mon Nov 27 15:43:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13469864 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EC625C4167B for ; Mon, 27 Nov 2023 15:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=idLkulgyu+SyYbfm73RTOCnjwQtX14l+kD5FAXkNDFI=; b=SDovMpilkXcX65 kXwKo8HHreCFJfY6MAmnaEkHTXFxGm8MuUNRf2FKx3g2zRYZjDw+sjkQeQznM8c9jq948xhBN1d3o J0ft4OlxRrwu2jcnk32kwbS6BmgFFUX7Inlxv9DqvRAAusLDLML4Kc/YEcCGumE0nuhlwABIRBLk+ C5SmR9dwSdEF5dYCW88tn3qEM5VB3HqkV3Q7Gy+5OklIxHDArTn4jykId9ol3VmOmMGOVLowzeROx u44k2U5wwk13xxp572JDzfBMUpPAdyYwTejAZvXHQvrcjEGjucwIT0MTY3wn6a3XCDxrU0vRvRhoU EPyZsw/m7TyrUdg25H3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlW-002qrn-1X; Mon, 27 Nov 2023 15:43:18 +0000 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlT-002qr0-2H for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 15:43:16 +0000 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-507bd19eac8so5975649e87.0 for ; Mon, 27 Nov 2023 07:43:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701099794; x=1701704594; darn=lists.infradead.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=VuNdy95VNpWQjRKNnpzeQQ54Hlq4tpuG2i9HfgCgKck=; b=WeLtY0FJOKJUfpgR/ggG2slfnKL/PKIw31YkHnpxA27AzhSDBVagtW+RNlVUFYTI7J UFgE/jJKvHh9Df6GhJG8jt4nRBHGOE7eCek8ZqSToxW6XhlGAadvsmCTK4/tt05lBE+C LcvyVuni4lVg36ZIS2vkn6pT+gdRkfM8MBSB9G9jMoGJumVDO/f5m5iQQK0CEV9NBM9i EBYMMAkmpSgV9X7U75bSM7btRol7DWE+pfz13ODbyVjxIWfTlZ4Cq8qJLS3bfZFpWq/M 6xv6B8YI7aCEyAeDkx27Zo9YuZOQL703YlUqkKHZNbEzn41E8C+nzw0Inmb15PN21eKo 60RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701099794; x=1701704594; 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=VuNdy95VNpWQjRKNnpzeQQ54Hlq4tpuG2i9HfgCgKck=; b=KDu7cb7/HJUWl1PBKlnT/HG5dCmOJ22b4AJT6zicuzsODy9mhdxjgPJ+bOd314/fuP NMEL/1T0Wh/882v2C7qy3WKpYa1hm4JoTWGWozsn/qHUS/w+o7ISV3sZjRmcgp3hr+xL aWtw4vgOSyXwezAmy+/f2n+zfIXCPYUYkr7ndvlRy42atUvndZo9sEYfHAlgxHABUpZX tUbF8/h+FCuHwnPLauLjPtfevGJGNYWOzf20SbiKGIbTGZD2OuiNqoHC3il7hCV4AZjz igPUXPoWoiB024lNzSFFOxe93h74R9lBpKUKINnRWY5/8mmrHaQ3ZqGJk9/aw4IztkDy nx+A== X-Gm-Message-State: AOJu0Yz+P1iQn5iArDxrLAL2XoW98Nw3EVP2SNvXoD44PmRc0ANtBM8B b54QleJxdMpGOfK16ZMrWPmq5w== X-Google-Smtp-Source: AGHT+IGWjn7a7SaeCNhun0JE7z2oMYlgMR3QEHklOjINxZRkGcdglD8+plYLOYV/HHG6FnDABF2yng== X-Received: by 2002:ac2:4858:0:b0:50b:ac21:29fb with SMTP id 24-20020ac24858000000b0050bac2129fbmr3844407lfy.31.1701099793925; Mon, 27 Nov 2023 07:43:13 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id v28-20020ac2559c000000b0050ab86037d8sm1505049lfg.205.2023.11.27.07.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:43:13 -0800 (PST) From: Linus Walleij Date: Mon, 27 Nov 2023 16:43:04 +0100 Subject: [PATCH net-next v9 1/5] dt-bindings: net: dsa: Require ports or ethernet-ports MIME-Version: 1.0 Message-Id: <20231127-marvell-88e6152-wan-led-v9-1-272934e04681@linaro.org> References: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> In-Reply-To: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@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 , =?utf-8?q?Marek_Beh=C3=BAn?= 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 , Florian Fainelli , Krzysztof Kozlowski X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_074315_747855_CEA414DA X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Acked-by: Florian Fainelli Reviewed-by: Krzysztof Kozlowski 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/Documentation/devicetree/bindings/net/dsa/dsa.yaml index 6107189d276a..2abd036578d1 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 +oneOf: + - required: + - ports + - required: + - ethernet-ports + ... From patchwork Mon Nov 27 15:43:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13469866 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18467C07CB1 for ; Mon, 27 Nov 2023 15:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2HnFwnyHyltERAVnFYRakN0SOm7PJtpgmUPl8QP9c1Q=; b=MZLAJQW6dRnDwG Sijps8IIshfUdkmGa86N5UUZLVNMEdSLN8sNODZxY08FXTJRea/ZiFzGceWcgpYIjqqinlTraE00R 03bjO2UXxASr3xsr6JNXZCrXgOmaYvxTR8fRS/IiUteLeHz7CZaZG2s2t7CBqafwjKXG1FJMqJ4k7 8eZZZ9pI5YptavbEvJvgFmnK1V5/u5uOf6Ht3RmA+MQvbq+KHeNIjCMInd3b5SvBrQowsmI38PLlA pCiWwXfJFn2hnWmoG2v4sMITM9h1uRgeOll+0SBKIQLC873FJuu8yDOgISG0zTYTJRKRWGWDNg8Fa 2cKDXKs50IEkg8CU4C/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlf-002qvU-2l; Mon, 27 Nov 2023 15:43:27 +0000 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlY-002qr5-1L for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 15:43:21 +0000 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2c51682fddeso54321011fa.1 for ; Mon, 27 Nov 2023 07:43:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701099795; x=1701704595; darn=lists.infradead.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=h0VwY6TaHpxI3borUCq3aH1TpiyNiMcQ1rckV7olnsw=; b=scYkO+1bSaP+NPs2RBO4rn+MgXdi1bDLttP7VisjHYwXTnGJbM/m5H9Oc9Q263OAZJ 2LvGhgkMZBXV/eh1HrgJ/VvlJN4/yTzfsT4Eqm0epvKyxSv8SzvfNG8HWT/sGDkyj1y9 qr5MGqSoFsZ+zDgQrwgXiRljRecPt0v5rXpb8T+0zqL0iAXCRLU04jkkL9SjD9xA+3o4 GsH7D+/kRAlud/3mxNllwVoIqpNdIwiuPh3mB+uIPpYTCJbxnBwTFz3W/RhMVRowEQbA UQ3QEOR9XHn8Uw1ys99qPM4WN9eDT2PD1vmf21QFGnOhmmIELm6hZNRXL0aU12CuA/Y6 EyPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701099795; x=1701704595; 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=h0VwY6TaHpxI3borUCq3aH1TpiyNiMcQ1rckV7olnsw=; b=n2XvXssubI1gK5HcAcLY3oiLgCwgjEmealgdDH5JeABX4upMZUOsEeZU/ioKlH0OMw +1NTotPvfzVBs/S0ycZasW1WnQviT+AnD+ZRuSW1EKJbfAek50rmLYv79T+0i4hzUbIR qw1zlGw56HBUhrDRTSOMxLVjG2nnuABGS/PYE1SOb+Ig6dJtXPdqBoD+p+0TN5fShrTM C34wctABqDeCybqD4YJtr/0DAyBTmjvxnlsFQ1J4kmIQmfHxbuXOlVwB/ndfMgRGs8mm i+gk6xfn4qoi5fzdgvwcK0Rrd+kDKYl+WKn05K99LoMNqyjz2yeHHTW0Q2EFlOc4dzwn zpRA== X-Gm-Message-State: AOJu0Ywo7qVItiPzTm8yDsy2bIhmjNVrLoH+oVyV5fmIrYhrUti1rhY5 gyYMy7jVKYMKZ/dB29mCU3hTUg== X-Google-Smtp-Source: AGHT+IGJIh0iNCqcRaBEhXI0IvYR0jy6MsPgVEUCTzSshOjc0I/4XTIINDQMn8M1qJldBnQ1LgxgaQ== X-Received: by 2002:a05:6512:3e1c:b0:50a:7868:d3c3 with SMTP id i28-20020a0565123e1c00b0050a7868d3c3mr3315354lfv.16.1701099795086; Mon, 27 Nov 2023 07:43:15 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id v28-20020ac2559c000000b0050ab86037d8sm1505049lfg.205.2023.11.27.07.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:43:14 -0800 (PST) From: Linus Walleij Date: Mon, 27 Nov 2023 16:43:05 +0100 Subject: [PATCH net-next v9 2/5] dt-bindings: net: mvusb: Fix up DSA example MIME-Version: 1.0 Message-Id: <20231127-marvell-88e6152-wan-led-v9-2-272934e04681@linaro.org> References: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> In-Reply-To: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@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 , =?utf-8?q?Marek_Beh=C3=BAn?= Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij , Vladimir Oltean , Rob Herring , Florian Fainelli X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_074320_457323_8E94D24C X-CRM114-Status: GOOD ( 13.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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. Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean Reviewed-by: Rob Herring Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij --- 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/Documentation/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 = <1>; #size-cells = <0>; - switch@0 { + ethernet-switch@0 { compatible = "marvell,mv88e6190"; reg = <0x0>; - ports { + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + /* Port definitions */ }; From patchwork Mon Nov 27 15:43:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13469868 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E3BBDC4167B for ; Mon, 27 Nov 2023 15:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4FmwCYaSqh7HH51QzXkw8Hx6KKhtvnEMjkjrhI7nB0w=; b=mWdNvQH7B5RCKX wofAtiHzXForlJuoeIXE+Ype/Zbm/J1/SsW+ZfT6SyInJ3ow4Rys20fnC+kcIbVDuT9uGgaItpXcX gDPawHMTrt2+ucjyld7lkVipGVntSnup+nZDmEBKF1i4SyuAicmyeuJngltA4hnx8VUfbuNMRyCfs f8SBGRux9Ik/cdtdeObLs9hxhak5PW0fNdk0sTIzV6rE+6CnM09/aHWq5/3Co61PWjAQ7pKn9WuuS pjwQ+iqzM5mzepLriRi62qI/+f9eX0ep8NdPgmKtkz6yjS73mVl63vwjDHybkvuwUnE2Glp/tOSnf grZTix0hWJn2fFERk+xA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7dle-002quN-1J; Mon, 27 Nov 2023 15:43:26 +0000 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlV-002qrN-2Z for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 15:43:19 +0000 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-507a98517f3so5930045e87.0 for ; Mon, 27 Nov 2023 07:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701099796; x=1701704596; darn=lists.infradead.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=laAP022lsP8tLUMRJS12kz9BQh0UCp0+Op3begljKsQ=; b=COJj1/3SLwcJICUsh3TUd6K000ct0LEYejIOlM7dQTKCM3d6ekYpbQuJI/JBaIjjm5 h17EKjNwbdrMMBbHMwGgDlEf0TZ9IbG5aWOJh4KU4DgGM8MvJgOUHhEmL6xBZ1ea+xHo 42QLHqkOGjBMRxkmGYt4O12kJfrK43FwTusmPYd95ZhPFohv+yimppSd/T+GJ3DG6o/6 JC+BNVL3fA9YOiGHcMpV+h3EBywMipXPmN1h5jUGk7hyRpLGfh+hecgqbAAcgYE141VC c3s0YRnABPyN7P1rUg86LXyeSGQjpIhulGd8Bf0BeZaAf3w+5/3Ver5X26yr+s6DvA/k uMMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701099796; x=1701704596; 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=laAP022lsP8tLUMRJS12kz9BQh0UCp0+Op3begljKsQ=; b=LEUIfLG5/DYVhQY8LiPnoT1IpXGl0RWG5jAzsDQ6KtbzIRxWbp8jV9OsdnvJyY4Kz9 V77707acmnwtenpSDrQVJUU6hP8C68+10nowtqUCU0Py9f5pz7jGvEmXuaYCYCT/9Sta wuTh3QGeLwgQI4FA3cDp4vf2mFgoUBsl8l7bTdNegX+ncUCikmHgcIv2NNn8VGGxhxRB T51ua/AAGjCMZLTpvnXM/iDsj6pwjeBRd10nUrFCIepX+7Fl/iTrpm/iZhlRPJ3iYjsl QIekanaAIFDxh0nkNc4GMRxppVFNoY7bl/ZeDFPjwaQyKxFBsRk3r7pDmWCAFQ5DEddu NDGA== X-Gm-Message-State: AOJu0Yy8D9dcmWTvQDaZFMvWXsTmmQVcz++Zkz8nRQcx5UI4JBIIAQ10 JJUEzzACz23JAVDF+hBvicDjpw== X-Google-Smtp-Source: AGHT+IHYAPIK0kVbirWgTmBfDmamzEa/j5LAyTqDffhpjRhVqj7bTRWcf8vS5bUNEMjEXsL5Dt4YYQ== X-Received: by 2002:a05:6512:3a82:b0:509:489f:d84e with SMTP id q2-20020a0565123a8200b00509489fd84emr11144123lfu.37.1701099796186; Mon, 27 Nov 2023 07:43:16 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id v28-20020ac2559c000000b0050ab86037d8sm1505049lfg.205.2023.11.27.07.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:43:15 -0800 (PST) From: Linus Walleij Date: Mon, 27 Nov 2023 16:43:06 +0100 Subject: [PATCH net-next v9 3/5] dt-bindings: net: ethernet-switch: Accept special variants MIME-Version: 1.0 Message-Id: <20231127-marvell-88e6152-wan-led-v9-3-272934e04681@linaro.org> References: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> In-Reply-To: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@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 , =?utf-8?q?Marek_Beh=C3=BAn?= 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.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_074317_832363_5C6D1767 X-CRM114-Status: GOOD ( 12.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Accept special node naming variants for Marvell switches with special node names as ABI. This is maybe not the prettiest but it avoids special-casing the Marvell MV88E6xxx bindings by copying a lot of generic binding code down into that one binding just to special-case these unfixable nodes. Reviewed-by: Rob Herring Reviewed-by: Andrew Lunn Signed-off-by: Linus Walleij Reviewed-by: Vladimir Oltean --- .../devicetree/bindings/net/ethernet-switch.yaml | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml index 72ac67ca3415..b3b7e1a1b127 100644 --- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml @@ -20,9 +20,26 @@ description: select: false -properties: - $nodename: - pattern: "^(ethernet-)?switch(@.*)?$" +allOf: + # This condition is here to satisfy the case where certain device + # nodes have to preserve non-standard names because of + # backward-compatibility with boot loaders inspecting certain + # node names. + - if: + properties: + compatible: + contains: + enum: + - marvell,turris-mox-mv88e6085 + - marvell,turris-mox-mv88e6190 + then: + properties: + $nodename: + pattern: "switch[0-3]@[0-3]+$" + else: + properties: + $nodename: + pattern: "^(ethernet-)?switch(@.*)?$" patternProperties: "^(ethernet-)?ports$": From patchwork Mon Nov 27 15:43:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13469865 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 225ADC4167B for ; Mon, 27 Nov 2023 15:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pnsX8BCt5QK7UCS1usDLdf8k2izKMRNNZSZC5DjGCZc=; b=Wc9vcSoSyq8+UO uDTEz/IC3RR0j3ELenEpEokShqmHLMTAO3AN1rrYqo1iUUBc7QtR0ewmWdmAkxoX+WqeXkvJdyHMF 0n+ymeG5QTpevz4BkbioEgwPa6R0dwYXk9Mq1CoJky3G/Ay1Z4aovfRISIHWz2Y6l5ETyufNSN67J OHAzAL6xlNSzFNxKEcKrDd4FCgkDBr6yPptsCXAeVKQehCTwIx3Fa7mrq0cA+0eVv2xwr7an0Kmgu ozmxOdYpHSRImQsu9BPJpkIet9ipsYfjmMN1jvIPO2w8L5MyTU1DQ7mAvrqswocpyBnImBfATNSA6 FHsWqWZ0ygyGk4Ds6tAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlg-002qw2-1s; Mon, 27 Nov 2023 15:43:28 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlY-002qrm-2W for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 15:43:23 +0000 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-507be298d2aso5945868e87.1 for ; Mon, 27 Nov 2023 07:43:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701099797; x=1701704597; darn=lists.infradead.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=m/idCSw0YFbr584vElDbCGOScN78DJBnJRMgnvMWqeY=; b=DZYYAo0rS4Y1NgDmLtexF6Kv0Oc/6rT2t6O+7SfPvugZs65kap6I77m0nv6Mzz6HMX +TIM7FSWEyCfqS6PUW3GAvkmaWeFYWRUFaJmDa/9yj2pmHP3ioYYBP4N5aJfvleyUSVF Xd/KALJfTgX86PpYHTmYpCt5hUS2SaiFgsiavyAtzis5KcEXJ38U+dH52t1Ogod/VwXF KcoYP7yHH8CPifxYfzzgChZ+Avr6vD/uIiKNS9TNv/7TmA7+7Sf/r6/KXOlzsIcCBM9y FOGvh3XHw3izqwQ+XxZXsA0EJyLu70VDwCNjDM5QD6EuPFKEnLNUDnA1eHv+D9YIOD0Y a+lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701099797; x=1701704597; 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=m/idCSw0YFbr584vElDbCGOScN78DJBnJRMgnvMWqeY=; b=EDVasGam6S3WVID3JlTCeKnGamSCKbxjiScwalhZPjvMHcPtKxR9/ixVjl1XTO9LPk dv7sK63GzGQRqeHbYp1CTMYGwNRyLaUJr99JgjR5+sOG3eLe3L+W9Gg1pcpy+TgNj5nq GUq66aZTm2TVfBB8fTSx4zF/EjsREP9GEhiWH73x2H7NoUIa4b9rdUZUIolXG0aBXao+ tqMYD2qb9yar3f9CYZjQtqTU28Ne3WZxxk9J+EftBjAVap+vA27ZPRpdeYi1FcUFZuD3 QmIrudv2B/yH4uE4ehEVhPYcNi8sE/lGfNtsimYuRE4FAy0jt1pJxwgEvM+KRwgnOSOJ YriQ== X-Gm-Message-State: AOJu0YwvWyF3rDck8zwrvcj3ulArur7Z7mtBNIntRY7TX1Pp8aDO7FYs U6CMCOWk1TsbuoHqZGpPA8pA7w== X-Google-Smtp-Source: AGHT+IF9SR3d8feNfMmkbKFzUXYnnZX2nZlGbcfcMDm95/WX/5aM+03Hy54maBLFUWnqG6Ok/1H9Bg== X-Received: by 2002:a19:710f:0:b0:505:6c99:bd7c with SMTP id m15-20020a19710f000000b005056c99bd7cmr6795143lfc.57.1701099797333; Mon, 27 Nov 2023 07:43:17 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id v28-20020ac2559c000000b0050ab86037d8sm1505049lfg.205.2023.11.27.07.43.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:43:16 -0800 (PST) From: Linus Walleij Date: Mon, 27 Nov 2023 16:43:07 +0100 Subject: [PATCH net-next v9 4/5] dt-bindings: marvell: Rewrite MV88E6xxx in schema MIME-Version: 1.0 Message-Id: <20231127-marvell-88e6152-wan-led-v9-4-272934e04681@linaro.org> References: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> In-Reply-To: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@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 , =?utf-8?q?Marek_Beh=C3=BAn?= 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 , Florian Fainelli X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_074320_889660_BE31F027 X-CRM114-Status: GOOD ( 23.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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? Reviewed-by: Andrew Lunn Reviewed-by: Rob Herring Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij Reviewed-by: Vladimir Oltean --- .../bindings/net/dsa/marvell,mv88e6xxx.yaml | 337 +++++++++++++++++++++ .../devicetree/bindings/net/dsa/marvell.txt | 109 ------- MAINTAINERS | 2 +- 3 files changed, 338 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..19f15bdd1c97 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml @@ -0,0 +1,337 @@ +# 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 2008. 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 + - items: + - const: marvell,turris-mox-mv88e6085 + - const: marvell,mv88e6085 + - items: + - const: marvell,turris-mox-mv88e6190 + - const: marvell,mv88e6190 + + 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 + +allOf: + - $ref: dsa.yaml#/$defs/ethernet-ports + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-switch@0 { + compatible = "marvell,mv88e6085"; + reg = <0>; + reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + sw_phy0: ethernet-phy@0 { + reg = <0x0>; + }; + + sw_phy1: ethernet-phy@1 { + reg = <0x1>; + }; + + sw_phy2: ethernet-phy@2 { + reg = <0x2>; + }; + + sw_phy3: ethernet-phy@3 { + reg = <0x3>; + }; + }; + + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-port@0 { + reg = <0>; + label = "lan4"; + phy-handle = <&sw_phy0>; + phy-mode = "internal"; + }; + + ethernet-port@1 { + reg = <1>; + label = "lan3"; + phy-handle = <&sw_phy1>; + phy-mode = "internal"; + }; + + ethernet-port@2 { + reg = <2>; + label = "lan2"; + phy-handle = <&sw_phy2>; + phy-mode = "internal"; + }; + + ethernet-port@3 { + reg = <3>; + label = "lan1"; + phy-handle = <&sw_phy3>; + phy-mode = "internal"; + }; + + ethernet-port@5 { + reg = <5>; + ethernet = <&fec>; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + }; + }; + - | + #include + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-switch@0 { + compatible = "marvell,mv88e6190"; + #interrupt-cells = <2>; + interrupt-controller; + interrupt-parent = <&gpio1>; + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + pinctrl-0 = <&switch_interrupt_pins>; + pinctrl-names = "default"; + reg = <0>; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + switch0phy1: ethernet-phy@1 { + reg = <0x1>; + }; + + switch0phy2: ethernet-phy@2 { + reg = <0x2>; + }; + + switch0phy3: ethernet-phy@3 { + reg = <0x3>; + }; + + switch0phy4: ethernet-phy@4 { + reg = <0x4>; + }; + + switch0phy5: ethernet-phy@5 { + reg = <0x5>; + }; + + switch0phy6: ethernet-phy@6 { + reg = <0x6>; + }; + + switch0phy7: ethernet-phy@7 { + reg = <0x7>; + }; + + switch0phy8: ethernet-phy@8 { + reg = <0x8>; + }; + }; + + mdio-external { + compatible = "marvell,mv88e6xxx-mdio-external"; + #address-cells = <1>; + #size-cells = <0>; + + phy1: ethernet-phy@b { + reg = <0xb>; + compatible = "ethernet-phy-ieee802.3-c45"; + }; + + phy2: ethernet-phy@c { + reg = <0xc>; + compatible = "ethernet-phy-ieee802.3-c45"; + }; + }; + + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-port@0 { + ethernet = <ð0>; + phy-mode = "rgmii"; + reg = <0>; + + fixed-link { + full-duplex; + pause; + speed = <1000>; + }; + }; + + ethernet-port@1 { + label = "lan1"; + phy-handle = <&switch0phy1>; + reg = <1>; + }; + + ethernet-port@2 { + label = "lan2"; + phy-handle = <&switch0phy2>; + reg = <2>; + }; + + ethernet-port@3 { + label = "lan3"; + phy-handle = <&switch0phy3>; + reg = <3>; + }; + + ethernet-port@4 { + label = "lan4"; + phy-handle = <&switch0phy4>; + reg = <4>; + }; + + ethernet-port@5 { + label = "lan5"; + phy-handle = <&switch0phy5>; + reg = <5>; + }; + + ethernet-port@6 { + label = "lan6"; + phy-handle = <&switch0phy6>; + reg = <6>; + }; + + ethernet-port@7 { + label = "lan7"; + phy-handle = <&switch0phy7>; + reg = <7>; + }; + + ethernet-port@8 { + label = "lan8"; + phy-handle = <&switch0phy8>; + reg = <8>; + }; + + ethernet-port@9 { + /* 88X3310P external phy */ + label = "lan9"; + phy-handle = <&phy1>; + phy-mode = "xaui"; + reg = <9>; + }; + + ethernet-port@a { + /* 88X3310P external phy */ + label = "lan10"; + phy-handle = <&phy2>; + phy-mode = "xaui"; + reg = <0xa>; + }; + }; + }; + }; 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 97f51d5ec1cf..73e00086b130 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12786,7 +12786,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 Nov 27 15:43:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13469869 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18F31C46CA0 for ; Mon, 27 Nov 2023 15:44:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=T1mAGxOhymI/GeRYlOfl9feZ5dS5MrI+7oNrcQk6Rt4=; b=yNVUNRSoqrszT+ +r51VheSanO3p8YKEQ6zX5PkMp8AKldOl67mv41mpX7TI/PtEdlLqHj4CTrD5QHNBszU0ylkB7MU3 ZcAqb0lzfhoNogsbZkeFCWEAUPADKQxxM68+XWNyjbkH7JAK9+8PXqMsfNmWc6EHnutgJfNz5uZjH gFjPBO/KqCJmuGQlNxGp+EB8IQ9OfNX5bQw7u8RwNPww9fNVFwVIfBgAb8v7e33y/BnI8SpHC9v8/ 9naTnLE6OEhRvUr3WI1ba4qCtpwiQJv8GOAMk/HuEa6o17yD5KioGAzik54m948G7qWeYQJCBZKpL /cBeTanTu8DxZtRUDWhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlh-002qwk-0x; Mon, 27 Nov 2023 15:43:29 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7dlZ-002qsL-2V for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 15:43:23 +0000 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-50baa3e5c00so2793405e87.1 for ; Mon, 27 Nov 2023 07:43:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701099799; x=1701704599; darn=lists.infradead.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=3aP8K9Goq0Ajdk3ruXbrYq/NC+8PUborhUnZaj6PIZ0=; b=AOcu0UXhmNOepdwxg/Rp9t/yebVa62JVSfVwpLUC/LHqN1qPGl6RWlCsxH9FW4DmmP wDR5BsjG48zwwQ1iBSx8vy4Qm8y1bNfOxcaEA0Q9iypxRwi7wwwjD5BIsfOvVqO9m2CZ cmMAO/l05cm8IOIikKQV29giM+KCOGmiOHayefqybHDVWiGB3sEpvUsSLtISNzXFQ04K T+GXKRnI8CCNUOffMr4R67/20iha7Y1ju0G+7hDdaPYsFT+CBibvub8bidCwkjaiels1 rF9BFW0JVOtDkpp9V4I66O6Ue0QIdMOVzwI+64r97gbH8j71axVGccvQN9ex8wYJ/9b3 Owvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701099799; x=1701704599; 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=3aP8K9Goq0Ajdk3ruXbrYq/NC+8PUborhUnZaj6PIZ0=; b=EeHsrhxNUlV9ZRS+A44Y7pge1Ld30EaxmUCR6aEWbWmEeYH1GkhlC41x8lD6exDUln qIXuYmtl9TLYB0lBtrCSDBiF56kqdvacyYsq2tQNxPSWd7aAE0cZh66F2TWCErNlKMAZ iSd0q3s1MkcGbMgE768TeKzCMo330ZG4zWIqO0hNsuNA+RTdYEVMbb+EvJyq/FMcWCPp OX0hUZEgMP7d40PGPz3AEZ/5RNSAD1kdN8+ZEJVWgJI5DDysmOrg/MllsThucTqtqdIt nDjNzvVWFyRgmFSDD0zynDf3ftImdlzKgO7bHg5ZqhK1bueydGF9Cqo3l407AfyJeCsN BewQ== X-Gm-Message-State: AOJu0Yxop7hD8p3YVaGcO1ZalNrRXdo+niA6xRxOMEEV0uEZXcdjRC5Y aKTRvcWmbnYJ+lCJU5kFccsd0Q== X-Google-Smtp-Source: AGHT+IEl2h/fOsgwU09exGBpssRKZnlkjGR2zVc5gS4VsLGIP5yLiJ2denrQ+5UDOLs7S1XfAarBhA== X-Received: by 2002:a05:6512:1105:b0:50b:a69d:b8bb with SMTP id l5-20020a056512110500b0050ba69db8bbmr6124861lfg.49.1701099798589; Mon, 27 Nov 2023 07:43:18 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id v28-20020ac2559c000000b0050ab86037d8sm1505049lfg.205.2023.11.27.07.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:43:18 -0800 (PST) From: Linus Walleij Date: Mon, 27 Nov 2023 16:43:08 +0100 Subject: [PATCH net-next v9 5/5] dt-bindings: marvell: Add Marvell MV88E6060 DSA schema MIME-Version: 1.0 Message-Id: <20231127-marvell-88e6152-wan-led-v9-5-272934e04681@linaro.org> References: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> In-Reply-To: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@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 , =?utf-8?q?Marek_Beh=C3=BAn?= Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij , Vladimir Oltean , Rob Herring , Florian Fainelli X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_074321_820248_B243B6F5 X-CRM114-Status: GOOD ( 19.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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. Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean Reviewed-by: Rob Herring Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij --- .../bindings/net/dsa/marvell,mv88e6060.yaml | 88 ++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 89 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..4f1adf00431a --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml @@ -0,0 +1,88 @@ +# 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 2008. 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 + +allOf: + - $ref: dsa.yaml#/$defs/ethernet-ports + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + #include + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-switch@16 { + compatible = "marvell,mv88e6060"; + reg = <16>; + + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-port@0 { + reg = <0>; + label = "lan1"; + }; + ethernet-port@1 { + reg = <1>; + label = "lan2"; + }; + ethernet-port@2 { + reg = <2>; + label = "lan3"; + }; + ethernet-port@3 { + reg = <3>; + label = "lan4"; + }; + ethernet-port@5 { + reg = <5>; + phy-mode = "rev-mii"; + ethernet = <ðc>; + fixed-link { + speed = <100>; + full-duplex; + }; + }; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 73e00086b130..3e1700d56736 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12786,6 +12786,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/