From nobody Tue Apr 7 09:37:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45A0CC433FE for ; Thu, 13 Oct 2022 16:52:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbiJMQwq (ORCPT ); Thu, 13 Oct 2022 12:52:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229874AbiJMQwf (ORCPT ); Thu, 13 Oct 2022 12:52:35 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8228C10A7D6 for ; Thu, 13 Oct 2022 09:52:31 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id by36so3073840ljb.4 for ; Thu, 13 Oct 2022 09:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BWIwo+mIwSXhxLgpwwdJO6e+2GcvcXvg+9gu/sbvq84=; b=Xi5DZ5qK+qk1qquLLkpXhdYUNmdfgyLafBxDhrB9rpscC/EIrl+UVUQguUo0PzTfq5 8K9wmjiGS3GJvD8GrzFFMXpqMchc/FBU7Jaz1btWIhp/ZB54mbEal084Svq3VEEF3UXF WUcXAqfju0Af83SfunDSrm2pXxwj4YqGvARML/gBSRq4TntIOyjk51zX14Kym9RRyVD5 pDqgpGuLwl99Q0pHv+D8QIWvxCtZhnYiWlwN44KdXBACx6nb+jh5+4CHmMcwd66xW5Uj UPXDX0PefoIkPA98z6cxVXiQOPv9LESdB1DVb4Eeab6Us2nrXxi11nlmqM+TkysLl6De qwLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BWIwo+mIwSXhxLgpwwdJO6e+2GcvcXvg+9gu/sbvq84=; b=N6Cb296yrjohqpaXN3dJrhIeEEfRS6FsEAHop51tDsgyXbKAACH58cwd6EC1LxgtvI YDQGUSa2wPd9U0Ao6WVG5oXAhxxa01PgiPZJdnH0VC6iowYyhRP1aEv3ihvU3NbBI6l7 qU8GVV8koSaYjyKK+mF66IpCUHUh8tTj22mNt7vqrmoIFUrAn/ivleILY1NCb2mpcRSY uxPSi+fSL8mUyPt/PSTHIKxoMR9aoybnZlyHNNBfmM6i76mx1W89zz+X1B9CEKOY9XjW LKrHpyw5I4IAWZcnHtMVm1m/yYitGCtigGIDeg7Sy5MTbrux52xrAZdrG8AGoZ30t1aV GXOQ== X-Gm-Message-State: ACrzQf16gozYY6z9HKjFjA89HDpco0cJvP05Nkv3TDUSY3KAszk8qsdC kJqbmHzdXnven6oC8+DuWqeA3Q== X-Google-Smtp-Source: AMsMyM63g/W8O1g5lvdBVlFYJvInzSl0E+zJLeXuYwVpee2XRfgYaxeUhNgdwVvtEu+yzg0nEPLNJg== X-Received: by 2002:a05:651c:1685:b0:26e:e61:9c3f with SMTP id bd5-20020a05651c168500b0026e0e619c3fmr290114ljb.477.1665679949349; Thu, 13 Oct 2022 09:52:29 -0700 (PDT) Received: from fedora.. ([78.10.206.53]) by smtp.gmail.com with ESMTPSA id k7-20020a2e9207000000b00262fae1ffe6sm540752ljg.110.2022.10.13.09.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 09:52:29 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20Grzelak?= To: devicetree@vger.kernel.org Cc: mw@semihalf.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, upstream@semihalf.com Subject: [PATCH v4 2/3] arm64: dts: marvell: Update network description to match schema Date: Thu, 13 Oct 2022 18:51:33 +0200 Message-Id: <20221013165134.78234-3-mig@semihalf.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221013165134.78234-1-mig@semihalf.com> References: <20221013165134.78234-1-mig@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marcin Wojtas Update the PP2 ethernet ports subnodes' names to match schema enforced by the marvell,pp2.yaml contents. Add new required properties ('reg') which contains information about the port ID, keeping 'port-id' ones for backward compatibility. Signed-off-by: Marcin Wojtas --- arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boo= t/dts/marvell/armada-cp11x.dtsi index d6c0990a267d..7d0043824f2a 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi @@ -58,6 +58,8 @@ config-space@CP11X_BASE { ranges =3D <0x0 0x0 ADDRESSIFY(CP11X_BASE) 0x2000000>; =20 CP11X_LABEL(ethernet): ethernet@0 { + #address-cells =3D <1>; + #size-cells =3D <0>; compatible =3D "marvell,armada-7k-pp22"; reg =3D <0x0 0x100000>, <0x129000 0xb000>, <0x220000 0x800>; clocks =3D <&CP11X_LABEL(clk) 1 3>, <&CP11X_LABEL(clk) 1 9>, @@ -69,7 +71,7 @@ CP11X_LABEL(ethernet): ethernet@0 { status =3D "disabled"; dma-coherent; =20 - CP11X_LABEL(eth0): eth0 { + CP11X_LABEL(eth0): ethernet-port@0 { interrupts =3D <39 IRQ_TYPE_LEVEL_HIGH>, <43 IRQ_TYPE_LEVEL_HIGH>, <47 IRQ_TYPE_LEVEL_HIGH>, @@ -83,12 +85,13 @@ CP11X_LABEL(eth0): eth0 { interrupt-names =3D "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - port-id =3D <0>; + reg =3D <0>; + port-id =3D <0>; /* For backward compatibility. */ gop-port-id =3D <0>; status =3D "disabled"; }; =20 - CP11X_LABEL(eth1): eth1 { + CP11X_LABEL(eth1): ethernet-port@1 { interrupts =3D <40 IRQ_TYPE_LEVEL_HIGH>, <44 IRQ_TYPE_LEVEL_HIGH>, <48 IRQ_TYPE_LEVEL_HIGH>, @@ -102,12 +105,13 @@ CP11X_LABEL(eth1): eth1 { interrupt-names =3D "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - port-id =3D <1>; + reg =3D <1>; + port-id =3D <1>; /* For backward compatibility. */ gop-port-id =3D <2>; status =3D "disabled"; }; =20 - CP11X_LABEL(eth2): eth2 { + CP11X_LABEL(eth2): ethernet-port@2 { interrupts =3D <41 IRQ_TYPE_LEVEL_HIGH>, <45 IRQ_TYPE_LEVEL_HIGH>, <49 IRQ_TYPE_LEVEL_HIGH>, @@ -121,7 +125,8 @@ CP11X_LABEL(eth2): eth2 { interrupt-names =3D "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - port-id =3D <2>; + reg =3D <2>; + port-id =3D <2>; /* For backward compatibility. */ gop-port-id =3D <3>; status =3D "disabled"; }; --=20 2.37.3