From nobody Fri Apr 10 14:24:07 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 049F2C433FE for ; Fri, 14 Oct 2022 21:33:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230075AbiJNVdx (ORCPT ); Fri, 14 Oct 2022 17:33:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230055AbiJNVdn (ORCPT ); Fri, 14 Oct 2022 17:33:43 -0400 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FF4A1DD8A7 for ; Fri, 14 Oct 2022 14:33:41 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id c22so6176855lja.6 for ; Fri, 14 Oct 2022 14:33:41 -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=B/DXzD8t2nEeI0lXREfvngk3fEgJ2rA4VH95A2oHmA83Gb+GG8oJmp8fzbVkvgOc5F SODDb8VkxgUjCzXpefDuPQNlI04n/rbcFIea088lGIZwrQ0Hnw4NV46xGIwF7ubfm7kl XadvfTxkjyBtKFMRdnQj/ajSRgk4OAf0o8yEPFlD1QtWOomb4Dt78blsl1QKhPOR1YRQ cWfZXXzCWSIcKhv0t8TZUMEix82KIszGwfORT72SqoKKREA3eE0Pt2ujCiv1ogAfmxTW IEup5cUYWutePHZyhI4R+W1bEFfivf9CqCKy0kk1BCooUdHZPnsKyzJbHyd0FkYvIXh7 n54Q== 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=brU6GCmMjGNdPK1GiDp3lp84MShGOTWVvmgncYoJ65GP7jwjufv9JQCH8y4VQeQVrH 2Y++NFil46PFAh0qgBirVPZMKvu6BrUIvRIlGEjfDoB+MgAk7CKNK/BhkvItk419n18J ZkT1TUbCf8+BOGJ7FLZA3EhJMS2l/xzXSnZaWCiEMX4NjXb9rdhwKOccvOG0OnA5BzoR wNsriA+4L64jS32mO+xp1Qd3OXw8+miLnIFQnIWVcH6MbyaGIYokGsWnlf4cZP9frtiv ZkvNhMyd2LlNrvvuMmqgLWhd/Alyp0GSLgADAnVSxfR6fS1vHt0S/nrN04IpZvm2S5T6 +6og== X-Gm-Message-State: ACrzQf2N3HD8XR+k+H8FqvSkfiwb1HpkRtUGGPepll8cuesUDb8mlr5h CabirKF9O1LYU8WMAaPhebWKTg== X-Google-Smtp-Source: AMsMyM74UfwDrRVI+uSJOmdihIfCn9esHqz00xZikJRiuE7l0R6ojwioZkoGBQMsMCIvcAsk4dySUg== X-Received: by 2002:a2e:81c9:0:b0:26e:1cc:2951 with SMTP id s9-20020a2e81c9000000b0026e01cc2951mr2493966ljg.197.1665783219599; Fri, 14 Oct 2022 14:33:39 -0700 (PDT) Received: from fedora.. ([78.10.207.24]) by smtp.gmail.com with ESMTPSA id d4-20020ac24c84000000b00494978b0caesm494036lfl.276.2022.10.14.14.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 14:33:39 -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 v5 2/3] arm64: dts: marvell: Update network description to match schema Date: Fri, 14 Oct 2022 23:32:53 +0200 Message-Id: <20221014213254.30950-3-mig@semihalf.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221014213254.30950-1-mig@semihalf.com> References: <20221014213254.30950-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