From patchwork Thu Nov 12 04:50:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11899073 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E196EC388F7 for ; Thu, 12 Nov 2020 05:43:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D64820825 for ; Thu, 12 Nov 2020 05:43:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IgdDDDJV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728359AbgKLFdb (ORCPT ); Thu, 12 Nov 2020 00:33:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729063AbgKLEuo (ORCPT ); Wed, 11 Nov 2020 23:50:44 -0500 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A1C8C0613D6; Wed, 11 Nov 2020 20:50:44 -0800 (PST) Received: by mail-pg1-x52a.google.com with SMTP id m13so3128930pgl.7; Wed, 11 Nov 2020 20:50:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eniRCWFhhLp57ABY9LHMR46rczpjtwBpvSFDDM4wFn0=; b=IgdDDDJVhoRoJjFFEGIF6DsHTQwBauMNrGWLRFOcZCBwvljI0wvyXYHrLQjVNhGLQb KzpC2NJaRxaOU2ioSrr0/+SKR2Fbxhgw9O9V/eKs/b/9PQSwo7OpSOmFV4TA3GPeZerd v05v930axbU5H0fTNjpxSWcHrK1pLQWQoU/YiYDI6hXddzrdNpe3dqFH2wScfeRcZi4y WP83Ma+uBnu2mVRO4phyRWyayWxQbAyn/Notm8Ap32tVEzzNrK8avA8QhqIHO6Z/YzAi ByTju4/uWC1YmHKondib2Nf9n33UQKCwb4fMkw5OBmtACrjceC5B0B8CqECgom2/dYBW ZXLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eniRCWFhhLp57ABY9LHMR46rczpjtwBpvSFDDM4wFn0=; b=AAaikJE9HMTajHO3kwSEw/3P8tFkgbqgyVb4SRLPawGG4J9JwGo4RoN60UtypI4d/4 Iu9AbLmGhU+XDjh3aooLefhNNA9ExiLZ/XwJVB37wMQuU73oPaD7PxNa/7ncWREworvS Q1ahQH4Lsr86ykwGgdUhDFSs3viBHOuPMY+4ftKIjSZmysTIFbCxhKwaSxkHj+BJNgIe jI4vUmaJqsO/7cs2HAE3PDenY/A916LL3KxRKY+E5KJSVwLCFnFhhwRPO3bF0HP6Iyk2 eXTJE5x+UlKzuX/UOZXVs5ygjhi3SaNQNmAUVEwmgVd20UPNM6sJVhAF0SyTep4tMopo 80aA== X-Gm-Message-State: AOAM532L8yzlazcUJ79uXSSxOo96K0WFGOEx26M+hS2fHMgTahWaAOWS snYbi3oDgoONhRmw7WLHsSA= X-Google-Smtp-Source: ABdhPJxsNaBbu2AlFZIuHfyC7Do5e9y/cuET8ZnsYSW6IKwcTnFY1OiG1lETKwfx9OPb6G8iYBo7OA== X-Received: by 2002:a17:90a:9916:: with SMTP id b22mr7157951pjp.59.1605156644216; Wed, 11 Nov 2020 20:50:44 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:50:43 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Vladimir Oltean , Rob Herring , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 01/10] dt-bindings: net: dsa: Extend switch nodes pattern Date: Wed, 11 Nov 2020 20:50:11 -0800 Message-Id: <20201112045020.9766-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Upon discussion with Kurt, Rob and Vladimir it appears that we should be allowing ethernet-switch as a node name, update dsa.yaml accordingly. Reviewed-by: Vladimir Oltean Acked-by: Rob Herring Signed-off-by: Florian Fainelli --- Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documentation/devicetree/bindings/net/dsa/dsa.yaml index a765ceba28c6..5f8f5177938a 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml @@ -20,7 +20,7 @@ select: false properties: $nodename: - pattern: "^switch(@.*)?$" + pattern: "^(ethernet-)?switch(@.*)?$" dsa,member: minItems: 2 From patchwork Thu Nov 12 04:50:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11899063 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29ACCC2D0A3 for ; Thu, 12 Nov 2020 05:43:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D50C92076E for ; Thu, 12 Nov 2020 05:43:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g6wbI6f1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728382AbgKLFde (ORCPT ); Thu, 12 Nov 2020 00:33:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729066AbgKLEux (ORCPT ); Wed, 11 Nov 2020 23:50:53 -0500 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 665AAC0617A6; Wed, 11 Nov 2020 20:50:51 -0800 (PST) Received: by mail-pl1-x644.google.com with SMTP id w11so2150876pll.8; Wed, 11 Nov 2020 20:50:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uqi5SmFeacH0e1NTAAchTyTLbhiC4KKjnBGY2RO3cPg=; b=g6wbI6f1iAZoNRVs3X9fFCbppPuY9jroWGJMB+KAix8kmBvWj2+swEm9ZDOoxlxBMR 862uB3jqVVnBG5nlX9MsdpxGmkAUvKVG9GjPAm3Klc4tMc9wRilLP5bGR1K7/GSJIg23 zfNiqjMM4+kYnNmvg61snpQbqfNIe52rT+qVDTJXN1+mZWlsIIyqt8MhJw1RCShZFce7 aTkP1yiOlbFvzN9lvoK2uavdh9otEGu2XFk3L4oa12ZPXkuEhAdmVXQOoaK49LsPXARA a6RFEpp11c1XgMIS8Uh/DyScWSyn3waHuT7m6HGSmaZ99YlsA7aFCeBD9QmnRdRpxYWR VoGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uqi5SmFeacH0e1NTAAchTyTLbhiC4KKjnBGY2RO3cPg=; b=p78X63XFLikHdMPRe1tiL0f6L5MN++sW6AbGC8YuMm75fzfAXZj5xiy//Fe7C1TDv/ x4C2rC8TbOF7IT3TkMeokUyFw+CMVsbLbhsXHb+psJfm4B2lodgsP8vqf8NPaoDP3em5 qN2QNr4fWSDLlmL7f95Kk54tEU7DZsL6ExZpo7lmSChwFPBTrtTvhdyC3sCq0h4FJuCF IQtVZQR6sS5vor1aAg49T+iBxRuDKjTT5YDvZbTbfoZ4PisNU96e/AL4Nlt1XJ3WnpiM WwCUB0oFr9OMaUuUUhYdWzxgWeKj9wbtTcuhphkhpaBlB0wPdPWdFfKaZ77BIGedmnT2 wLMg== X-Gm-Message-State: AOAM532vCEAbOov+oOJ6HFXgjDlvDNEgVXOh/6C8gc1Bd4MvvyYbeiON JzWX51Tf5KEX0xBZIiuq5YM= X-Google-Smtp-Source: ABdhPJzX3Wk+CjiK3j44F23MWb2WHdQhpOnkm7zo6QbcQP65qEl3hYVXNO+jKiwHZ18O+M4aD5En4A== X-Received: by 2002:a17:902:b192:b029:d7:ca4a:4ec1 with SMTP id s18-20020a170902b192b02900d7ca4a4ec1mr22426101plr.76.1605156650963; Wed, 11 Nov 2020 20:50:50 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.50.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:50:50 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Rob Herring , Andrew Lunn , Vivien Didelot , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 02/10] dt-bindings: net: dsa: Document sfp and managed properties Date: Wed, 11 Nov 2020 20:50:12 -0800 Message-Id: <20201112045020.9766-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The 'sfp' and 'managed' properties are commonly used to describe Ethernet switch ports connecting to SFP/SFF cages, describe these two properties as valid that we inherit from ethernet-controller.yaml. Acked-by: Rob Herring Signed-off-by: Florian Fainelli --- Documentation/devicetree/bindings/net/dsa/dsa.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documentation/devicetree/bindings/net/dsa/dsa.yaml index 5f8f5177938a..8e044631bcf7 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml @@ -78,6 +78,10 @@ patternProperties: mac-address: true + sfp: true + + managed: true + required: - reg From patchwork Thu Nov 12 04:50:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11899061 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8679BC2D0A3 for ; Thu, 12 Nov 2020 05:43:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FB8121534 for ; Thu, 12 Nov 2020 05:43:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LBwbDZF/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728399AbgKLFdf (ORCPT ); Thu, 12 Nov 2020 00:33:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729073AbgKLEu6 (ORCPT ); Wed, 11 Nov 2020 23:50:58 -0500 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D88C3C0613D1; Wed, 11 Nov 2020 20:50:57 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id a18so3376800pfl.3; Wed, 11 Nov 2020 20:50:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lNe2OsEAdcO54CudgPlRLNwKxuVOX4BLgvqgD3FGrlw=; b=LBwbDZF/j88lLsPr+bH6Hk3PG7vPOwPy89UCbh+pPjAtZrd8COpf/GvKdX106kWV67 mSXxnegT6oJzGVXoYIsU77b0YlkRZHADJgTPGE1o5PjepZ5Jo7oMR6zl4vrr9qczNZkv xjpZnhp862vx3gWgbbL2jGdmDtFl0spAYj7OS4CLltph8gR+4Do4dGFNsqm6oeywKQ9C nrA9LaYs4HdvnFwQYtnLa4gHH5s+x/42M8Z1ahAj1ozeAy9dW/u9j1lbkrpDIxQdHYjr 9gn2OImGn5vItpXJOVLz1zuTjrAvckbGsHy2Ffu9JGh3Y+uCaVZ42jOrFU8wRc+PuYvb uTPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lNe2OsEAdcO54CudgPlRLNwKxuVOX4BLgvqgD3FGrlw=; b=ozL07EzxEoQL3f6xJAS16OvnJNUsuNrrOWq3vMEBnX2LRyUCAkN9ouUzjozBWI9x+x 0plcG5IFu+y7WuhYmpIkCUrIliye2UWM84FxVoVdm6H8r1Mu8k5S7Km6i26UdOn13uIL Thcyqmtl6libk9B3yaShEceS9LL/S1qs7ke0rp5MDMGtjcAeVaNTEXwllkf3Iorj+4xJ urcByMB6+nl1UDLhUAnlvDVz9uYgDmuNB4fjArh25xkf5uo4ykXwKDBQlVVKlOR6s58x 0FMWGsrrsURAGjexm79OYwlirjfKslrUA15jdJRgW7PmXR9Cu47XZAmPixBOdixzke0O 998A== X-Gm-Message-State: AOAM5321+GGZO0xIpAH8HDzlRDdHvKrqAXvoyzM6OZkRFiex3fIvkFp6 UiRD7GZ/xhYl1nhmGcDZ5m2Yy1rA+9Y= X-Google-Smtp-Source: ABdhPJzRDF53Kv3RDnzhuyq0gQ6T408KCLdt542T7X1UjDo9vGKaPYds3Ls1LskXgcG7Q5D5M2Xxqw== X-Received: by 2002:a17:90a:ae17:: with SMTP id t23mr7630529pjq.51.1605156657441; Wed, 11 Nov 2020 20:50:57 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:50:56 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 03/10] ARM: dts: BCM5301X: Update Ethernet switch node name Date: Wed, 11 Nov 2020 20:50:13 -0800 Message-Id: <20201112045020.9766-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update the switch unit name from srab to ethernet-switch, allowing us to fix warnings such as: CHECK arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml: srab@18007000: $nodename:0: 'srab@18007000' does not match '^(ethernet-)?switch(@.*)?$' From schema: Documentation/devicetree/bindings/net/dsa/b53.yaml Reviewed-by: Vladimir Oltean Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 90c09c48721b..b8d2e8d28482 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -483,7 +483,7 @@ thermal: thermal@2c0 { }; }; - srab: srab@18007000 { + srab: ethernet-switch@18007000 { compatible = "brcm,bcm5301x-srab"; reg = <0x18007000 0x1000>; From patchwork Thu Nov 12 04:50:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11899059 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD33CC2D0A3 for ; Thu, 12 Nov 2020 05:43:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61F0221534 for ; Thu, 12 Nov 2020 05:43:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="co43/I9V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728426AbgKLFdi (ORCPT ); Thu, 12 Nov 2020 00:33:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729084AbgKLEvE (ORCPT ); Wed, 11 Nov 2020 23:51:04 -0500 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BFACC0617A7; Wed, 11 Nov 2020 20:51:04 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id g11so2138800pll.13; Wed, 11 Nov 2020 20:51:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MJoLvL0oyUiQIAUCCDvNyyDYOZQYfjsgzkgozFWjSes=; b=co43/I9VL9yg3lRwIiTMr8pkQJRzo3Ss2y/N5+jnMvmiANdX8IHCrA8bHbwPPErsFA VKSA3wF7G1ftMFKa9UqjP0y2Sau/LPl6YXU5P6iYPccDvLd4iaZjBo8PxQ1CPBKltQUt yIdc7A9NLQkji4rYIvKEo0eU3fXZF/jPkwwQrp0s+aOlSmhuLbhnrqpFyjcP4yLxUf+Y r8O+Q5bxPr3sGZCj7vVKqZS9IAlO5zxqqfW3aS2cS4JPc8BLN27vwY7XFOzYF591vJ/a fJNY7L/LuhFyYrMvsXm1Q+PdRbaaXm+/xcjTiNkLcErcGyHZIyNYSccGyedWbuQ9P7kJ kIqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MJoLvL0oyUiQIAUCCDvNyyDYOZQYfjsgzkgozFWjSes=; b=N1UfVGbjkeeKEsiMrvolXcsQzJ+Wbxt1yJzLpZsialFfo4YHnmxiACpymXRdoLtIh4 DO4CpK5I+U+iOBFLgIbnZqg1olZ0eGP8s9HmP3QtThcx6/nTQTa4NpXYG2avctLN98nt gEBxNqfLF0YD73QQZKuQMnSWXrB58cMPBf3FQ/mCRCXT3GZJg7LTWTxZtgvbzYDZS7b6 q50OeeD+Pmc1tkxWlJgszZtEQQTFk7GdH9Ai9OikmA+Q0yFK9w90KJhnqFDRvOch8y3L BcBowG3v+sOYTZtQbshXZZa425qJ8Rk31u5oppr7bwWFJqNj70E60DEvYoWOpOq8AmwS EtVA== X-Gm-Message-State: AOAM531Hh4nl4y3wTu6Yqp/c26khv6Ypc4G8Mpf35CIg4Z6pvHjPbcDw iwf+3k/WrwiWx/B71mc/k80= X-Google-Smtp-Source: ABdhPJygGSrsc5FnPE2fT5HJ97LmdPF7oFdAeAOB/QoKRF146pDy1FeAm5Szqw7GrsfWD6aSCmq+Dw== X-Received: by 2002:a17:902:c10c:b029:d8:c028:5ceb with SMTP id 12-20020a170902c10cb02900d8c0285cebmr4416600pli.36.1605156664068; Wed, 11 Nov 2020 20:51:04 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:51:03 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 04/10] ARM: dts: BCM5301X: Add a default compatible for switch node Date: Wed, 11 Nov 2020 20:50:14 -0800 Message-Id: <20201112045020.9766-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Provide a default compatible string which is based on the 53011 SRAB compatible by default. The 4709 and 47094 default to the 53012 SRAB compatible. This allows us to have sane defaults and silences the following warnings: arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dt.yaml: ethernet-switch@18007000: compatible: 'oneOf' conditional failed, one must be fixed: ['brcm,bcm5301x-srab'] is too short 'brcm,bcm5325' was expected 'brcm,bcm53115' was expected 'brcm,bcm53125' was expected 'brcm,bcm53128' was expected 'brcm,bcm5365' was expected 'brcm,bcm5395' was expected 'brcm,bcm5389' was expected 'brcm,bcm5397' was expected 'brcm,bcm5398' was expected 'brcm,bcm11360-srab' was expected 'brcm,bcm5301x-srab' is not one of ['brcm,bcm53010-srab', 'brcm,bcm53011-srab', 'brcm,bcm53012-srab', 'brcm,bcm53018-srab', 'brcm,bcm53019-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm11404-srab', 'brcm,bcm11407-srab', 'brcm,bcm11409-srab', 'brcm,bcm58310-srab', 'brcm,bcm58311-srab', 'brcm,bcm58313-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm58522-srab', 'brcm,bcm58523-srab', 'brcm,bcm58525-srab', 'brcm,bcm58622-srab', 'brcm,bcm58623-srab', 'brcm,bcm58625-srab', 'brcm,bcm88312-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm3384-switch', 'brcm,bcm6328-switch', 'brcm,bcm6368-switch'] From schema: Documentation/devicetree/bindings/net/dsa/b53.yaml Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm4709.dtsi | 4 ++++ arch/arm/boot/dts/bcm47094.dtsi | 4 ++++ arch/arm/boot/dts/bcm5301x.dtsi | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm4709.dtsi b/arch/arm/boot/dts/bcm4709.dtsi index e1bb8661955f..cba3d910bed8 100644 --- a/arch/arm/boot/dts/bcm4709.dtsi +++ b/arch/arm/boot/dts/bcm4709.dtsi @@ -9,3 +9,7 @@ &uart0 { clock-frequency = <125000000>; status = "okay"; }; + +&srab { + compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab"; +}; diff --git a/arch/arm/boot/dts/bcm47094.dtsi b/arch/arm/boot/dts/bcm47094.dtsi index 747ca030435f..2a8f7312d1be 100644 --- a/arch/arm/boot/dts/bcm47094.dtsi +++ b/arch/arm/boot/dts/bcm47094.dtsi @@ -25,3 +25,7 @@ &uart0 { clock-frequency = <125000000>; status = "okay"; }; + +&srab { + compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab"; +}; diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index b8d2e8d28482..a4ab3aabf8b0 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -484,7 +484,7 @@ thermal: thermal@2c0 { }; srab: ethernet-switch@18007000 { - compatible = "brcm,bcm5301x-srab"; + compatible = "brcm,bcm53011-srab", "brcm,bcm5301x-srab"; reg = <0x18007000 0x1000>; status = "disabled"; From patchwork Thu Nov 12 04:50:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11898965 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A497C56201 for ; Thu, 12 Nov 2020 05:33:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 296DB20825 for ; Thu, 12 Nov 2020 05:33:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QJlDqZ4o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728446AbgKLFdl (ORCPT ); Thu, 12 Nov 2020 00:33:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729070AbgKLEvM (ORCPT ); Wed, 11 Nov 2020 23:51:12 -0500 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0507CC061A04; Wed, 11 Nov 2020 20:51:12 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id b3so2135473pls.11; Wed, 11 Nov 2020 20:51:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eymV9DPXl6rW5fvsGqm9k7n71o4eeWLnLxjPc7ap6qE=; b=QJlDqZ4oGECEsJ50gzCe0WfmK3QsVgy4ErEl2hg3gpfqmLNzkTE4vzcGzI9/UAGi7k vFdhZgrTSzmMvrltyNiGmmLLxcmp0l0hUn2b0k2dEV7LZeYzrKF3TZ/8xf9fG3p/wWDG L9Kyd3uBOgiDVLPLRJHUKrbtyDe11sBgjhHdKiCPl9VQvOm2GYprvb8T7z3H4Xu7RTfY uPQ91ARoFJ/Xdfs/FFOo4qk6ea0viwDNjjbebyd1BjfiiZQD1MQbfEhsGOnnJ9FZIG76 +HdKicS5qaniJKFxnbEPkcBvRCQfcTZKkXI+uv/pevRHGdEUgtlxkk302qGN1+Ruq2NM mXGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eymV9DPXl6rW5fvsGqm9k7n71o4eeWLnLxjPc7ap6qE=; b=lMsJGfUB0szCAoyP4sKJC3b11DJ91sUqP8emFNbtLAL45BiIn6z6wD6Fc4dUgXpFGF +3O3FSuHMBNcRsoRpwxlUxr0NCW7mhKIBQ9UJ0cVskrhV3J+Zf+Jadzi3RsvCVr02ppg NOiQJGWN0T5GU2PtrUJYytyEy1LvnHuKtVkPjzVnhfEWgob8nEaa63mCgsYMAGQ0W7EL E883GfJgKvSZP95UX4Tii3OL4i8FwMtEoVu6tdyhfczz7rDx4x2kl0IcMERm8o0j4e2q DRt5GI8QuQgOjEhbp810tqJ6JCoyQClzrW9ftZzvlMdJTyQ7gNYl7Ds7ANcZqX0Y5fjh t1iw== X-Gm-Message-State: AOAM533gyawe2VKn9fMQHQ/Cu5+/Dm67alcnhMvxxkmteVqOrTGH6zyq C7xhmo0uGSS2U4eC3y93KBOHwO6xatw= X-Google-Smtp-Source: ABdhPJxjCPbtoWPkZh5ct2SpWZgvbWBAMIA7bfNL9NoB0ZRrPjeT4pIHmHOO3HYLCKDxjI5QgxXRfA== X-Received: by 2002:a17:902:c254:b029:d6:ac10:6d50 with SMTP id 20-20020a170902c254b02900d6ac106d50mr25648302plg.48.1605156671550; Wed, 11 Nov 2020 20:51:11 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:51:10 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 05/10] ARM: dts: BCM5301X: Provide defaults ports container node Date: Wed, 11 Nov 2020 20:50:15 -0800 Message-Id: <20201112045020.9766-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Provide an empty 'ports' container node with the correct #address-cells and #size-cells properties. This silences the following warning: arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dt.yaml: ethernet-switch@18007000: 'oneOf' conditional failed, one must be fixed: 'ports' is a required property 'ethernet-ports' is a required property From schema: Documentation/devicetree/bindings/net/dsa/b53.yaml Signed-off-by: Florian Fainelli Acked-by: Rafał Miłecki --- arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 --- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 --- arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 --- arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 --- arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 --- arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 --- arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 3 --- arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 3 --- arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 --- arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 3 --- arch/arm/boot/dts/bcm5301x.dtsi | 4 ++++ arch/arm/boot/dts/bcm953012er.dts | 3 --- 12 files changed, 4 insertions(+), 33 deletions(-) diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts index 810fc32f1895..766107a28d4d 100644 --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts @@ -65,9 +65,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "poe"; diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts index 7604b4480bb1..530380272a93 100644 --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts @@ -72,9 +72,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@4 { reg = <4>; label = "lan"; diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts index abd35a518046..51c64f0b2560 100644 --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts @@ -122,9 +122,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan4"; diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts index 1ec655809e57..afc98234170f 100644 --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts @@ -65,9 +65,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@4 { reg = <4>; label = "poe"; diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts index 04bfd58127fc..811bc371562e 100644 --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts @@ -113,9 +113,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan4"; diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts index 3bb3fe5bfbf8..3725f2b0d60b 100644 --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts @@ -201,9 +201,6 @@ &srab { dsa,member = <0 0>; ports { - #address-cells = <1>; - #size-cells = <0>; - port@1 { reg = <1>; label = "lan7"; diff --git a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts index 068e384b8ab7..6fa101f0a90d 100644 --- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts +++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts @@ -59,9 +59,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "poe"; diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts index 9ae815ddbb4b..4f8d777ae18d 100644 --- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts @@ -57,9 +57,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan"; diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts index a21b2d185596..e17e9a17fb00 100644 --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts @@ -108,9 +108,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan4"; diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts index 4d5c5aa7dc42..a270d6798363 100644 --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts @@ -79,9 +79,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan4"; diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index a4ab3aabf8b0..7db72a2f1020 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -490,6 +490,10 @@ srab: ethernet-switch@18007000 { status = "disabled"; /* ports are defined in board DTS */ + ports { + #address-cells = <1>; + #size-cells = <0>; + }; }; rng: rng@18004000 { diff --git a/arch/arm/boot/dts/bcm953012er.dts b/arch/arm/boot/dts/bcm953012er.dts index 957468224622..52feca0fb906 100644 --- a/arch/arm/boot/dts/bcm953012er.dts +++ b/arch/arm/boot/dts/bcm953012er.dts @@ -69,9 +69,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "port0"; From patchwork Thu Nov 12 04:50:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11899055 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0587C388F7 for ; Thu, 12 Nov 2020 05:43:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4400A21534 for ; Thu, 12 Nov 2020 05:43:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nXGX6aZ2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728463AbgKLFdn (ORCPT ); Thu, 12 Nov 2020 00:33:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729093AbgKLEwj (ORCPT ); Wed, 11 Nov 2020 23:52:39 -0500 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55CA3C061A47; Wed, 11 Nov 2020 20:51:20 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id e7so3339207pfn.12; Wed, 11 Nov 2020 20:51:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T3/kL7oMKroeT3AsOag4R3GIK68Z5RZDB54MdR/Hx5o=; b=nXGX6aZ2H3A0vkY/4MCaAYxJHLcYWxKipSSe0wwk/f3p6w7zUkqtHEdCwyUwds7DxA Bg4b+pT1ERwjRxxdBWs+x+94k7oYGpBVgVNpd3HG9Ynp2uCzxPZeMBKzu3ymnVYBwGB2 y+jPHH6P3ctazgeVb34vp8uSg8VgX4sxWb9TmtSDfPybFekp8yRRT2ggCAhwBb7d1wIv JoipcRWdNVADFFrs5YnY6GZDjRQd7o/xP5/Gprd4kzlgK9BlLuWwuybHRZmPaA0gslih VpLgij0FzPyNcxwPwemS4eHg+ucE//Tpag4vR0qITQ+sB1j8EjmnD6AGTMGEEqnwC3K3 YFnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T3/kL7oMKroeT3AsOag4R3GIK68Z5RZDB54MdR/Hx5o=; b=ozUq5pBXDX/eHy9fT1DyYyEEKlmr2YYY/xMWvNaYCWfDjSS76I+7X4g5wb78rpYu8a P800j+4U/NQLV7BdhY6ydfs2nGIq5KU9Rs7gaLku9A4euOGo2u5eJbAoTXrAlVe99+NB 09QbSNsZyN0eS63iQw1KbPYE1XOvbUrBiWY6IVyLUvaEcBSPKCsWYtRcOLj+TNAQKAkn xufV9PccFvr4QQeE7ToRkBg5x9+pw/qLcxpIRJQehi2cVgWsbbid7QVwvelsxhXpzTIO cISRrtixm2RalHJ12uWHNd5kgoGMpugjhpHFFHV4f1sH3DRn7epwHjyX6Ca6P0DkNNUj NyBQ== X-Gm-Message-State: AOAM530RLLZhQWZdrm2YS2IoBIc9cJoPjTuBKizk811/BvwCs0YEYQAf jo5bTUTKYSIMUyy3EFTUAbA= X-Google-Smtp-Source: ABdhPJyNlYOln9ETXIA+oKkkJBpwQufACH4dk+Beb6xKVcvdhZzm+D4a5JCoysea2oDhZrnwarJNWw== X-Received: by 2002:a17:90a:4d47:: with SMTP id l7mr7443073pjh.121.1605156679886; Wed, 11 Nov 2020 20:51:19 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:51:19 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 06/10] ARM: dts: NSP: Update ethernet switch node name Date: Wed, 11 Nov 2020 20:50:16 -0800 Message-Id: <20201112045020.9766-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update the switch unit name from srab to ethernet-switch, allowing us to fix warnings such as: CHECK arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml: srab@18007000: $nodename:0: 'srab@18007000' does not match '^(ethernet-)?switch(@.*)?$' From schema: Documentation/devicetree/bindings/net/dsa/b53.yaml Reviewed-by: Vladimir Oltean Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index e895f7cb8c9f..e7d08959d5fe 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -385,7 +385,7 @@ ccbtimer1: timer@35000 { clock-names = "apb_pclk"; }; - srab: srab@36000 { + srab: ethernet-switch@36000 { compatible = "brcm,nsp-srab"; reg = <0x36000 0x1000>, <0x3f308 0x8>, From patchwork Thu Nov 12 04:50:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11898969 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E8AAC2D0A3 for ; Thu, 12 Nov 2020 05:33:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F75420825 for ; Thu, 12 Nov 2020 05:33:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B2XMsIL3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728491AbgKLFdr (ORCPT ); Thu, 12 Nov 2020 00:33:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729096AbgKLEwj (ORCPT ); Wed, 11 Nov 2020 23:52:39 -0500 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5821C061A48; Wed, 11 Nov 2020 20:51:28 -0800 (PST) Received: by mail-pg1-x542.google.com with SMTP id z24so3150749pgk.3; Wed, 11 Nov 2020 20:51:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zuL+aKkvTXRvVyAjB9d0Gmyxs4zs/ysdm48P1lvShlU=; b=B2XMsIL3ic2jUbsf2bHrS4jw96MgEclQ0RI/sr9gjoWPIXEjTVtDfr+JK5NELVzBRP gFBnp0aSVHxhdeMYGYJg2iHHt7bu50KRe+CG/T3zEgj75YeD2KlsNyek2oo2Ufy4wArS ARBk/gVu2d4eI4agezSPs2HhSsa4WpcmZTo5lorOtzZAjPRHwLZLWTMQ9pL+TjiO7zW/ 5hfJ3bdF0RYVetkkw5PCtO6a13LoVl2HJFq4jL2mi466+OJgCmfF/cHetmYCPrwjHjl/ B4Rs3oZ/zxEfWMdYf2Km3m250spwNJp85OTWNa1UBMtngsAGro4hAOe/RKcxuX+WO/sB dXHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zuL+aKkvTXRvVyAjB9d0Gmyxs4zs/ysdm48P1lvShlU=; b=fzDh9rMKDsobu1gtFnpJe1a3AUFaEvglRx2UaN6fZOnfjgMbZyzxq+IbUa9N8pOZ3k Ej0HJKY37yg3ubpXYpmdcGy2sQ3BfWAOwLB9b2RGDv9SsbCx5WYHnnPLUhsZadhAbve0 vjR6wobqgOCemWSyA2FOjIVYBl+IqHHSK+Zt4HuntYFPEJliD65Wfz3Gq/E0YMNQW+LK 65r5VbzDvRe/1qFw2OGUAERDYeI8traOnoB643GEWJbAxpxpMHIU9XT5a9/Y1wcV6M9K VUG+shCAEVpiyzjKA+j6hsY0nUH11IFx6zFIqK9lnujrRMr0dbNOuAFUh1XPdD9oQL/K tiqQ== X-Gm-Message-State: AOAM532+STa/QqKyXEeqZOxH+hpNRUXVwFh+QA0OwBG/oheLcO/fsDdT lckiGitjO+//Pl9d5tS9A8QyOO4MGR0= X-Google-Smtp-Source: ABdhPJyp7uiq1u9B2wvQJxWWeSOHJNPuLAde6qeLyZA3hLn3GfMybSCe9MzW2FciAUHF2xoKpWL0+A== X-Received: by 2002:a63:7a51:: with SMTP id j17mr24150116pgn.186.1605156688262; Wed, 11 Nov 2020 20:51:28 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:51:27 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Vladimir Oltean , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 07/10] ARM: dts: NSP: Fix Ethernet switch SGMII register name Date: Wed, 11 Nov 2020 20:50:17 -0800 Message-Id: <20201112045020.9766-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The register name should be "sgmii_config", not "sgmii", this is not a functional change since no code is currently looking for that register by name (or at all). Reviewed-by: Vladimir Oltean Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index e7d08959d5fe..09fd7e55c069 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -390,7 +390,7 @@ srab: ethernet-switch@36000 { reg = <0x36000 0x1000>, <0x3f308 0x8>, <0x3f410 0xc>; - reg-names = "srab", "mux_config", "sgmii"; + reg-names = "srab", "mux_config", "sgmii_config"; interrupts = , , , From patchwork Thu Nov 12 04:50:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11898967 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC512C2D0A3 for ; Thu, 12 Nov 2020 05:33:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5664220825 for ; Thu, 12 Nov 2020 05:33:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ghLn6DvH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728099AbgKLFdt (ORCPT ); Thu, 12 Nov 2020 00:33:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729102AbgKLEwo (ORCPT ); Wed, 11 Nov 2020 23:52:44 -0500 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C9BDC061A49; Wed, 11 Nov 2020 20:51:37 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id b3so2135905pls.11; Wed, 11 Nov 2020 20:51:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HFo4rwKDO3HHhcsoL7vPox9y0FiOilLBsHbbX62U+iA=; b=ghLn6DvHvUoGN739B8VaOdHo9vtWLVqAFODa8gKY8XfQ+6hzxtVUfL5EjyNn3hKGRq qUydFbX1M4tjQoZfddZkHwSEYofTiH1jeHLrqZjIyhIXC5BnLIT9FuRr17RmZyu2eS/y 5y5hrtWckq86E63Ess24ouVDTTAiTXWfIy/ErEkT/MPmN9QMBXYH3k+Sspyb4OlcZaMl tPbSlq5/t0NAqSAJTDOAWGMZdBV27wLmcHc0XJTVQqrXynBqxaJxo1KtTBTmVb6SfwK2 eXRZDriDwXbnoJF0Eupun0fq9k6tL14oFWks6EbbGLwSBTd5fauE1xb8cU//F3HisbD2 aJJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HFo4rwKDO3HHhcsoL7vPox9y0FiOilLBsHbbX62U+iA=; b=ScmD4kbE94yGweBu4bC/JZu51X3QdX94lDwKmmmgDsnorMndNiJPfYGYTcj9tFysix 5z3hrmQl7yLjd+5nQHwY0GfwxB4UkX/GiVn9mUC807bsi/NOMLHgBaST8wAsBabPJBTF WustkdGpdc4HbWyKktod3+nwsyu6RsBlE/akh/xvsTtVi1wxEh/aelwaDLP3lRJ4NCT4 UHVOTgYFmvuHuQg+lBhQLuF3l0q8NJIximV9bjf+Ucx69DeBKTnwQwGwLaOLkrFXi8jN LQ52zby7Ueym4evEjjnrud6xJeCp8jLMWiI0zsihrZhQydDzy4qRZXsIJ6fziobJwGSw 9RJQ== X-Gm-Message-State: AOAM5329mDHkhYBiREh9E5y3cH477z2YOp37JAYoZs8oyvKLJ/czEUOP mdxlYQsEmAkP14QmEndviyw= X-Google-Smtp-Source: ABdhPJxp69cnois8Pe7fKuLL7klRxDUDb9MIrjd2IiSdiuTi6qDPXWqKfuJudrzfAAlCxuIhVtzs1A== X-Received: by 2002:a17:902:d3ca:b029:d7:e0f9:b9c with SMTP id w10-20020a170902d3cab02900d7e0f90b9cmr15556764plb.2.1605156696480; Wed, 11 Nov 2020 20:51:36 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:51:35 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 08/10] ARM: dts: NSP: Add a SRAB compatible string for each board Date: Wed, 11 Nov 2020 20:50:18 -0800 Message-Id: <20201112045020.9766-9-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Provide a valid compatible string for the Ethernet switch node based on the board including the switch. This allows us to have sane defaults and silences the following warnings: arch/arm/boot/dts/bcm958522er.dt.yaml: ethernet-switch@36000: compatible: 'oneOf' conditional failed, one must be fixed: ['brcm,bcm5301x-srab'] is too short 'brcm,bcm5325' was expected 'brcm,bcm53115' was expected 'brcm,bcm53125' was expected 'brcm,bcm53128' was expected 'brcm,bcm5365' was expected 'brcm,bcm5395' was expected 'brcm,bcm5389' was expected 'brcm,bcm5397' was expected 'brcm,bcm5398' was expected 'brcm,bcm11360-srab' was expected 'brcm,bcm5301x-srab' is not one of ['brcm,bcm53010-srab', 'brcm,bcm53011-srab', 'brcm,bcm53012-srab', 'brcm,bcm53018-srab', 'brcm,bcm53019-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm11404-srab', 'brcm,bcm11407-srab', 'brcm,bcm11409-srab', 'brcm,bcm58310-srab', 'brcm,bcm58311-srab', 'brcm,bcm58313-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm58522-srab', 'brcm,bcm58523-srab', 'brcm,bcm58525-srab', 'brcm,bcm58622-srab', 'brcm,bcm58623-srab', 'brcm,bcm58625-srab', 'brcm,bcm88312-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm3384-switch', 'brcm,bcm6328-switch', 'brcm,bcm6368-switch'] From schema: Documentation/devicetree/bindings/net/dsa/b53.yaml Signed-off-by: Florian Fainelli Reviewed-by: Vladimir Oltean --- arch/arm/boot/dts/bcm958522er.dts | 4 ++++ arch/arm/boot/dts/bcm958525er.dts | 4 ++++ arch/arm/boot/dts/bcm958525xmc.dts | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts index 7be4c4e628e0..5443fc079e6e 100644 --- a/arch/arm/boot/dts/bcm958522er.dts +++ b/arch/arm/boot/dts/bcm958522er.dts @@ -178,3 +178,7 @@ &usb3_phy { &xhci { status = "okay"; }; + +&srab { + compatible = "brcm,bcm58522-srab", "brcm,nsp-srab"; +}; diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts index e58ed7e95346..e1e3c26cef19 100644 --- a/arch/arm/boot/dts/bcm958525er.dts +++ b/arch/arm/boot/dts/bcm958525er.dts @@ -190,3 +190,7 @@ &usb3_phy { &xhci { status = "okay"; }; + +&srab { + compatible = "brcm,bcm58525-srab", "brcm,nsp-srab"; +}; diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts index 21f922dc6019..f161ba2e7e5e 100644 --- a/arch/arm/boot/dts/bcm958525xmc.dts +++ b/arch/arm/boot/dts/bcm958525xmc.dts @@ -210,3 +210,7 @@ &usb3_phy { &xhci { status = "okay"; }; + +&srab { + compatible = "brcm,bcm58525-srab", "brcm,nsp-srab"; +}; From patchwork Thu Nov 12 04:50:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11898971 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05A2AC2D0A3 for ; Thu, 12 Nov 2020 05:33:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F21C20825 for ; Thu, 12 Nov 2020 05:33:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EIvMMINE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728527AbgKLFdv (ORCPT ); Thu, 12 Nov 2020 00:33:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729109AbgKLEwp (ORCPT ); Wed, 11 Nov 2020 23:52:45 -0500 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 571E6C061A4A; Wed, 11 Nov 2020 20:51:45 -0800 (PST) Received: by mail-pg1-x541.google.com with SMTP id i7so3142484pgh.6; Wed, 11 Nov 2020 20:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LCPFIFvf2WyLPPp3RLSwFmZavkgjy6AwPxXPI8M3yQg=; b=EIvMMINEh+BEFxDbe0YH49gcyumemLXXGE7XBBiovA639AMxFdhr0gbHb7sG1kaPkp YkHIaOQ4b8LDjaaQ8FPQ9xfKW3+Tmg7rnJM9wtPatGkyowG0nzBVHsvcpoddUD3etlyG V8Uge+VGGOH2uVglz6C5xLiIoFsJcv84IXAwLWvSvtz4C9gTTcHTEsFVl6smS8vtMOMR j2mBB9PSgtvWSf4UeFBkWAFtbJe+2qGW2AdGBP9cyz9vJwn5aYP470pVQkpirrUzBrmk bPl1SezMrWMWgPgYlFqSJYiEQ4ZuhSjfnwiEDhM0mTXMwqAu/3H/9f2oD5PB5yoHfUol p7XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LCPFIFvf2WyLPPp3RLSwFmZavkgjy6AwPxXPI8M3yQg=; b=bKcvMp824RaqG+PfgcIEI1mniI2Nd3KykLBdqkBUrhnMJ7aUyBpahKPW6wHpivlqNp A5dxo4k+zC4QgdoyBgTLe4F7639is9Ks6bask6SVZ7a5/vsnbSVdTTY1+kMYADNQpLSd 5OVALHuwCa9eGqkwhht5qLuiZkoY3nvqaO9qiKOdvQaR+Kw85e84q7cqiUn6OHCaspof B0N4j/8eFH4pNGAYFvh2t/ShCSbIw3w4QbK6jJ2SHlCNl98fjcCeZynsfISf5XLXt3at 6kBJvwarCMfiZE/2iHTn/JUpi/UZJeFGf23jQy2cLtmXMWPcFJcb+yKZNMZFlQoquJ51 Si6g== X-Gm-Message-State: AOAM533HwhdhwAUJU6DuuZKJxnK2wZmTJjRcH/8KgvYnI1NqpMxcb6nL +yn/urmf6hZYCHK/xUWilCI= X-Google-Smtp-Source: ABdhPJzDvj1WVdiMKyE+tCy2yMoaEtI8ylDICmFzKQPyL77UqUkWq6lj8v3v4d3slylN83oJfROQmw== X-Received: by 2002:a62:32c5:0:b029:158:7361:58d3 with SMTP id y188-20020a6232c50000b0290158736158d3mr26455822pfy.75.1605156704897; Wed, 11 Nov 2020 20:51:44 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:51:44 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), Kurt Kanzenbach Subject: [PATCH v2 09/10] ARM: dts: NSP: Provide defaults ports container node Date: Wed, 11 Nov 2020 20:50:19 -0800 Message-Id: <20201112045020.9766-10-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Provide an empty 'ports' container node with the correct #address-cells and #size-cells properties. This silences the following warning: arch/arm/boot/dts/bcm958522er.dt.yaml: ethernet-switch@36000: 'oneOf' conditional failed, one must be fixed: 'ports' is a required property 'ethernet-ports' is a required property From schema: Documentation/devicetree/bindings/net/dsa/b53.yaml Signed-off-by: Florian Fainelli Reviewed-by: Vladimir Oltean --- arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++++ arch/arm/boot/dts/bcm958622hr.dts | 3 --- arch/arm/boot/dts/bcm958623hr.dts | 3 --- arch/arm/boot/dts/bcm958625hr.dts | 3 --- arch/arm/boot/dts/bcm958625k.dts | 3 --- arch/arm/boot/dts/bcm988312hr.dts | 3 --- 6 files changed, 4 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 09fd7e55c069..b4d2cc70afb1 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -420,6 +420,10 @@ srab: ethernet-switch@36000 { status = "disabled"; /* ports are defined in board DTS */ + ports { + #address-cells = <1>; + #size-cells = <0>; + }; }; i2c0: i2c@38000 { diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts index a49c2fd21f4a..83cb877d63db 100644 --- a/arch/arm/boot/dts/bcm958622hr.dts +++ b/arch/arm/boot/dts/bcm958622hr.dts @@ -176,9 +176,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>; diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index dd6dff6452b8..4e106ce1384a 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -180,9 +180,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>; diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts index a71371b4065e..cda6cc281e18 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts @@ -195,9 +195,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>; diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts index 7782b61c51a1..ffbff0014c65 100644 --- a/arch/arm/boot/dts/bcm958625k.dts +++ b/arch/arm/boot/dts/bcm958625k.dts @@ -216,9 +216,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>; diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts index edd0f630e025..3fd39c479a3c 100644 --- a/arch/arm/boot/dts/bcm988312hr.dts +++ b/arch/arm/boot/dts/bcm988312hr.dts @@ -184,9 +184,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>; From patchwork Thu Nov 12 04:50:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11899057 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5DA0C2D0A3 for ; Thu, 12 Nov 2020 05:43:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4628721534 for ; Thu, 12 Nov 2020 05:43:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JhzIVeWx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728559AbgKLFdx (ORCPT ); Thu, 12 Nov 2020 00:33:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729118AbgKLEwy (ORCPT ); Wed, 11 Nov 2020 23:52:54 -0500 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96434C061A4B; Wed, 11 Nov 2020 20:51:54 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id g7so3394766pfc.2; Wed, 11 Nov 2020 20:51:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WhuYA1a6TERII5H+wgmmnG4EhgqA+DZXglaNonkZwz4=; b=JhzIVeWx81eexEi3AeJHg1mMK3yPoixKMojlX1N72qHq4lnFoP568Iq7SE+/46h/2b Z0H0tW+eQO5KoelEREnWBJ1He2sDnsijEiyP+7JoeR4+640Q4ZAT5Knxe9X5aAmmEjxR 6UcCwLPJ4M6qBQPjpzlQZkpP589pgrgAS8ZUGNM1LAurqrKC/W3vdOpZOtZq6bQyd03r o0zTZd+xYEFnbPZNT42LHYfGyyhDZgDGAqBzxQli3q//asxWmtzO60ihmTTQsUl/b7av ZBTa/B6KvyKLfv3ySQ6BCiYo+HuH7TJNi8TX524c4ol/CidOZiZLnCg77GUBWXhp3lSS oUxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WhuYA1a6TERII5H+wgmmnG4EhgqA+DZXglaNonkZwz4=; b=pAM4s70iYXs0+xGnTRvUKOCu74UtXFUvVblzySMJvgTYIScyiHIcrvkQP+FZKwfHA/ VgTbNMPKAuYkX7dVI6wcQ02OyTB9Ppc9pfEKDVX5OC0SDA6uKClGkfiyNNRWPJQgpAsS S/72xQ6XdPMrFaZcEKT3XYAtgXuXRN5uZ29ufFaG761sUAFuqYJVcLHsCgUKt3uNbd0q KjhhjphNYxyhDswftYDsbaepHfUi/AY/o+ovCqRpkYM3CO5gGL1z6rAEZQh/ESoXZU1L 9cPVW3fiTpbwu1W5BqsXAcz21nPnzULBrQW0H5zdSQdpfi1LeHzR81ymEMPQarrsRYIq IDUw== X-Gm-Message-State: AOAM533jO9vWXPmZUdgkXtOXYe/GXSBBNXeYK/2QqwEQYBMqNqj/bgB6 1kvJnXoJqoIsMnFDzKFLAhY= X-Google-Smtp-Source: ABdhPJyQJfGr595gk9r5bWUCaSBbmEGS7XMmoDf64r3aRYSfVqpN94GQLFOwmfTsAK59x3VdGMAMVQ== X-Received: by 2002:a17:90a:5b16:: with SMTP id o22mr7824361pji.224.1605156714133; Wed, 11 Nov 2020 20:51:54 -0800 (PST) Received: from 1G5JKC2.Broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gk22sm4189087pjb.39.2020.11.11.20.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 20:51:53 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Kurt Kanzenbach , Rob Herring , Florian Fainelli , Andrew Lunn , Vivien Didelot , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 10/10] dt-bindings: net: dsa: b53: Add YAML bindings Date: Wed, 11 Nov 2020 20:50:20 -0800 Message-Id: <20201112045020.9766-11-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112045020.9766-1-f.fainelli@gmail.com> References: <20201112045020.9766-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Kurt Kanzenbach Convert the b53 DSA device tree bindings to YAML in order to allow for automatic checking and such. Reviewed-by: Rob Herring Suggested-by: Florian Fainelli Signed-off-by: Kurt Kanzenbach --- .../devicetree/bindings/net/dsa/b53.txt | 149 ----------- .../devicetree/bindings/net/dsa/brcm,b53.yaml | 249 ++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 250 insertions(+), 150 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/dsa/b53.txt create mode 100644 Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml diff --git a/Documentation/devicetree/bindings/net/dsa/b53.txt b/Documentation/devicetree/bindings/net/dsa/b53.txt deleted file mode 100644 index f1487a751b1a..000000000000 --- a/Documentation/devicetree/bindings/net/dsa/b53.txt +++ /dev/null @@ -1,149 +0,0 @@ -Broadcom BCM53xx Ethernet switches -================================== - -Required properties: - -- compatible: For external switch chips, compatible string must be exactly one - of: "brcm,bcm5325" - "brcm,bcm53115" - "brcm,bcm53125" - "brcm,bcm53128" - "brcm,bcm5365" - "brcm,bcm5395" - "brcm,bcm5389" - "brcm,bcm5397" - "brcm,bcm5398" - - For the BCM11360 SoC, must be: - "brcm,bcm11360-srab" and the mandatory "brcm,cygnus-srab" string - - For the BCM5310x SoCs with an integrated switch, must be one of: - "brcm,bcm53010-srab" - "brcm,bcm53011-srab" - "brcm,bcm53012-srab" - "brcm,bcm53018-srab" - "brcm,bcm53019-srab" and the mandatory "brcm,bcm5301x-srab" string - - For the BCM5831X/BCM1140x SoCs with an integrated switch, must be one of: - "brcm,bcm11404-srab" - "brcm,bcm11407-srab" - "brcm,bcm11409-srab" - "brcm,bcm58310-srab" - "brcm,bcm58311-srab" - "brcm,bcm58313-srab" and the mandatory "brcm,omega-srab" string - - For the BCM585xx/586XX/88312 SoCs with an integrated switch, must be one of: - "brcm,bcm58522-srab" - "brcm,bcm58523-srab" - "brcm,bcm58525-srab" - "brcm,bcm58622-srab" - "brcm,bcm58623-srab" - "brcm,bcm58625-srab" - "brcm,bcm88312-srab" and the mandatory "brcm,nsp-srab string - - For the BCM63xx/33xx SoCs with an integrated switch, must be one of: - "brcm,bcm3384-switch" - "brcm,bcm6328-switch" - "brcm,bcm6368-switch" and the mandatory "brcm,bcm63xx-switch" - -Required properties for BCM585xx/586xx/88312 SoCs: - - - reg: a total of 3 register base addresses, the first one must be the - Switch Register Access block base, the second is the port 5/4 mux - configuration register and the third one is the SGMII configuration - and status register base address. - - - interrupts: a total of 13 interrupts must be specified, in the following - order: port 0-5, 7-8 link status change, then the integrated PHY interrupt, - then the timestamping interrupt and the sleep timer interrupts for ports - 5,7,8. - -Optional properties for BCM585xx/586xx/88312 SoCs: - - - reg-names: a total of 3 names matching the 3 base register address, must - be in the following order: - "srab" - "mux_config" - "sgmii_config" - - - interrupt-names: a total of 13 names matching the 13 interrupts specified - must be in the following order: - "link_state_p0" - "link_state_p1" - "link_state_p2" - "link_state_p3" - "link_state_p4" - "link_state_p5" - "link_state_p7" - "link_state_p8" - "phy" - "ts" - "imp_sleep_timer_p5" - "imp_sleep_timer_p7" - "imp_sleep_timer_p8" - -See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional -required and optional properties. - -Examples: - -Ethernet switch connected via MDIO to the host, CPU port wired to eth0: - - eth0: ethernet@10001000 { - compatible = "brcm,unimac"; - reg = <0x10001000 0x1000>; - - fixed-link { - speed = <1000>; - full-duplex; - }; - }; - - mdio0: mdio@10000000 { - compatible = "brcm,unimac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - - switch0: ethernet-switch@1e { - compatible = "brcm,bcm53125"; - reg = <30>; - #address-cells = <1>; - #size-cells = <0>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port0@0 { - reg = <0>; - label = "lan1"; - }; - - port1@1 { - reg = <1>; - label = "lan2"; - }; - - port5@5 { - reg = <5>; - label = "cable-modem"; - fixed-link { - speed = <1000>; - full-duplex; - }; - phy-mode = "rgmii-txid"; - }; - - port8@8 { - reg = <8>; - label = "cpu"; - fixed-link { - speed = <1000>; - full-duplex; - }; - phy-mode = "rgmii-txid"; - ethernet = <ð0>; - }; - }; - }; - }; diff --git a/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml b/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml new file mode 100644 index 000000000000..c3c938893ad9 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml @@ -0,0 +1,249 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/dsa/brcm,b53.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom BCM53xx Ethernet switches + +allOf: + - $ref: dsa.yaml# + +maintainers: + - Florian Fainelli + +description: + Broadcom BCM53xx Ethernet switches + +properties: + compatible: + oneOf: + - const: brcm,bcm5325 + - const: brcm,bcm53115 + - const: brcm,bcm53125 + - const: brcm,bcm53128 + - const: brcm,bcm5365 + - const: brcm,bcm5395 + - const: brcm,bcm5389 + - const: brcm,bcm5397 + - const: brcm,bcm5398 + - items: + - const: brcm,bcm11360-srab + - const: brcm,cygnus-srab + - items: + - enum: + - brcm,bcm53010-srab + - brcm,bcm53011-srab + - brcm,bcm53012-srab + - brcm,bcm53018-srab + - brcm,bcm53019-srab + - const: brcm,bcm5301x-srab + - items: + - enum: + - brcm,bcm11404-srab + - brcm,bcm11407-srab + - brcm,bcm11409-srab + - brcm,bcm58310-srab + - brcm,bcm58311-srab + - brcm,bcm58313-srab + - const: brcm,omega-srab + - items: + - enum: + - brcm,bcm58522-srab + - brcm,bcm58523-srab + - brcm,bcm58525-srab + - brcm,bcm58622-srab + - brcm,bcm58623-srab + - brcm,bcm58625-srab + - brcm,bcm88312-srab + - const: brcm,nsp-srab + - items: + - enum: + - brcm,bcm3384-switch + - brcm,bcm6328-switch + - brcm,bcm6368-switch + - const: brcm,bcm63xx-switch + +required: + - compatible + - reg + +# BCM585xx/586xx/88312 SoCs +if: + properties: + compatible: + contains: + enum: + - brcm,bcm58522-srab + - brcm,bcm58523-srab + - brcm,bcm58525-srab + - brcm,bcm58622-srab + - brcm,bcm58623-srab + - brcm,bcm58625-srab + - brcm,bcm88312-srab +then: + properties: + reg: + minItems: 3 + maxItems: 3 + reg-names: + items: + - const: srab + - const: mux_config + - const: sgmii_config + interrupts: + minItems: 13 + maxItems: 13 + interrupt-names: + items: + - const: link_state_p0 + - const: link_state_p1 + - const: link_state_p2 + - const: link_state_p3 + - const: link_state_p4 + - const: link_state_p5 + - const: link_state_p7 + - const: link_state_p8 + - const: phy + - const: ts + - const: imp_sleep_timer_p5 + - const: imp_sleep_timer_p7 + - const: imp_sleep_timer_p8 + required: + - interrupts +else: + properties: + reg: + maxItems: 1 + +unevaluatedProperties: false + +examples: + - | + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-switch@1e { + compatible = "brcm,bcm53125"; + reg = <30>; + + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan1"; + }; + + port@1 { + reg = <1>; + label = "lan2"; + }; + + port@5 { + reg = <5>; + label = "cable-modem"; + phy-mode = "rgmii-txid"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + port@8 { + reg = <8>; + label = "cpu"; + phy-mode = "rgmii-txid"; + ethernet = <ð0>; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + }; + }; + - | + #include + #include + + axi { + #address-cells = <1>; + #size-cells = <1>; + + switch@36000 { + compatible = "brcm,bcm58623-srab", "brcm,nsp-srab"; + reg = <0x36000 0x1000>, + <0x3f308 0x8>, + <0x3f410 0xc>; + reg-names = "srab", "mux_config", "sgmii_config"; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names = "link_state_p0", + "link_state_p1", + "link_state_p2", + "link_state_p3", + "link_state_p4", + "link_state_p5", + "link_state_p7", + "link_state_p8", + "phy", + "ts", + "imp_sleep_timer_p5", + "imp_sleep_timer_p7", + "imp_sleep_timer_p8"; + + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + label = "port0"; + reg = <0>; + }; + + port@1 { + label = "port1"; + reg = <1>; + }; + + port@2 { + label = "port2"; + reg = <2>; + }; + + port@3 { + label = "port3"; + reg = <3>; + }; + + port@4 { + label = "port4"; + reg = <4>; + }; + + port@8 { + ethernet = <&amac2>; + label = "cpu"; + reg = <8>; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index e73636b75f29..3786322d0bfb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3380,7 +3380,7 @@ M: Florian Fainelli L: netdev@vger.kernel.org L: openwrt-devel@lists.openwrt.org (subscribers-only) S: Supported -F: Documentation/devicetree/bindings/net/dsa/b53.txt +F: Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml F: drivers/net/dsa/b53/* F: include/linux/platform_data/b53.h