Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Madalin Bucur <madalin.bucur@nxp.com>,
        Camelia Alexandra Groza <camelia.groza@nxp.com>,
        netdev@vger.kernel.org
Cc:     "linuxppc-dev @ lists . ozlabs . org" <linuxppc-dev@lists.ozlabs.org>,
        linux-kernel@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
        linux-arm-kernel@lists.infradead.org,
        Eric Dumazet <edumazet@google.com>,
        Russell King <linux@armlinux.org.uk>,
        Sean Anderson <sean.anderson@seco.com>,
        Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Li Yang <leoyang.li@nxp.com>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Paul Mackerras <paulus@samba.org>,
        Rob Herring <robh+dt@kernel.org>, devicetree@vger.kernel.org
Subject: [PATCH net-next v4 6/8] powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
Date:   Thu,  4 Aug 2022 15:47:03 -0400
Message-Id: <20220804194705.459670-7-sean.anderson@seco.com>
In-Reply-To: <20220804194705.459670-1-sean.anderson@seco.com>
References: <20220804194705.459670-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fYu6L3x6qWm/vFvx6EGpMwbllSNfoC6l0r/Fdcx55i5Ekj3vAfI0wMjzSGSZ?=
 =?us-ascii?Q?d9RQOF+VA2NQll6yOfM2k5qIBNueApcjFI5i2IsGpcdRn+vtpWGO3WL7cU5l?=
 =?us-ascii?Q?qVzQcqaBi/5tt63W4GUbXxD4x7wBXqH7qhZr98M6U7J9eMY75xJeL7Rh8LMY?=
 =?us-ascii?Q?mv13/4jRkJHIMICiW+CY/7y3dr+WpKKl1/uBS//4j/DjvcbhzhBdXSLJy4Sb?=
 =?us-ascii?Q?nyFbovcu3qG75bmTns+8PnxRx200r/FLdYLIwdLy1GDkWOz+6zQyNRhToeit?=
 =?us-ascii?Q?OCRqeb91IqWnWnMGjK10ZkZQjL+7aBfAPHlEKTlp+Op5kCSmjqhWyiRWMIqd?=
 =?us-ascii?Q?Z1/rNU0ThxiXrHh4iGKPygERs2Y77+yZSOpNGCXfC1UB/bdqhwxtpYogXl80?=
 =?us-ascii?Q?aBET+G++3iMQVaSK/hgcens4LaSQIy/7nU7kq2K2VigJbFthAwk08CYoimPP?=
 =?us-ascii?Q?CoWSgAqlKKJFm+oHyXl7AaIMVY4Iv7J9m/XnaIVwW5imDhk1Jij9Yl06oXHf?=
 =?us-ascii?Q?6GCMg5mbj3t7Cff/f0haqPbbg9/Nj8UbhY8oMsJtQjryrMAAUGZqSCY/iUbE?=
 =?us-ascii?Q?Ik7YMN7lOLpoibliDNPSShD06WzikAdxrnep9hMrnntieV+Bofc6cvE+IfFk?=
 =?us-ascii?Q?XvTnHG0jhE63dlTu0mXkBXOKQlcUcLPOHQKlccnE31Bq4cvBwPWDQyj0QJoY?=
 =?us-ascii?Q?y5FSNfL06jaZF1aZ1gDp+cao4ynbaawa0YYE8U5o6bki1XsS11BNU5zWp2do?=
 =?us-ascii?Q?t/kk59ztqip5zp3KQt/7DtzhVX0vnfB5FzmSMlUnp67mmz0lsy8EWtHoalOZ?=
 =?us-ascii?Q?mEa8acAzHeCB7u2E548cwnIy3VyCatfQJCRcy26vGFox3zoHQ3dkSK1wyNI+?=
 =?us-ascii?Q?ZGg7PV0hHsFVMvXyEqk6FP8ntGtjQJBXe5DIaHpApJPNZXogr5fjxQCpDQB1?=
 =?us-ascii?Q?55hN52F+aYtSZwVc1gpVtPp4uYrfwhiUQPpjFhonARDlBWqOTl6zITszGVOa?=
 =?us-ascii?Q?PEENnHkAUx+/PsNxK4seIZqwErtZ3oopOJGn3IXBDzf3j6P2/RafEP0swDGq?=
 =?us-ascii?Q?ryo14lBnGGDA4PIs1PEKFVhBZFuUop3HClPTiIgka6LXRhIOr8IkpjIwNpQg?=
 =?us-ascii?Q?Vlb/G4/kGS6xon37eg9mo0B5C+ViIzZvVx7crGXU2CR6n6lpwTOIYW7dRpaC?=
 =?us-ascii?Q?Oyu65020fc1yaTVslwxacFELmhB+ORRqGiAmafaxHQwawElE0z+aDckQvLOp?=
 =?us-ascii?Q?AbY7Xjg10AkzzhPqubz98oMI526fwoD902PO7rCgXjjWkfnnzoWHo4pR8GQQ?=
 =?us-ascii?Q?M+S3IfgmgEJDfApR+OKKmvOpvPpuadD9eXrSBCXOdkDablZ7Li682ZvasAdQ?=
 =?us-ascii?Q?cuDlYgigMvekerVmOW7wllbwqEZ2qGeFEePS5iTV67xZfQx5z7udDBbcB6+o?=
 =?us-ascii?Q?ftR3YgDHryg9vAiPoCvHzmUKFvQQErN3MmlczebhGyGewY0vUjWJgqXwzn8r?=
 =?us-ascii?Q?n8C+UrSPyjt7G1DRRhqgZVyjxch3p2fpW43d3Gyh26sVr8sO9+DbvCoTt047?=
 =?us-ascii?Q?WryfmpCEXRkWanWlbLCgHB4Tm4uxoRe/ewNZYXdg2ak4uNbcSCNc4LnmayrV?=
 =?us-ascii?Q?Vg=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 681d5b4a-2cb3-461e-58c0-08da76522d53
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 19:47:34.7585
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: AMzIhOrqC6BxnY0VGkU+ouFwaySHmktzUQ/y+ax7RDzPOYCrEVFwzBFlcS9Mk1MocxiwJlgOSFt8gKKQLU/MxQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0301MB2297
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On the T208X SoCs, MAC1 and MAC2 support XGMII. Add some new MAC dtsi
fragments, and mark the QMAN ports as 10G.

Fixes: da414bb923d9 ("powerpc/mpc85xx: Add FSL QorIQ DPAA FMan support to the SoC device tree(s)")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

Changes in v4:
- New

 .../boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi     | 44 +++++++++++++++++++
 .../boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi     | 44 +++++++++++++++++++
 arch/powerpc/boot/dts/fsl/t2081si-post.dtsi   |  4 +-
 3 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
new file mode 100644
index 000000000000..437dab3fc017
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later
+/*
+ * QorIQ FMan v3 10g port #2 device tree stub [ controller @ offset 0x400000 ]
+ *
+ * Copyright 2022 Sean Anderson <sean.anderson@seco.com>
+ * Copyright 2012 - 2015 Freescale Semiconductor Inc.
+ */
+
+fman@400000 {
+	fman0_rx_0x08: port@88000 {
+		cell-index = <0x8>;
+		compatible = "fsl,fman-v3-port-rx";
+		reg = <0x88000 0x1000>;
+		fsl,fman-10g-port;
+	};
+
+	fman0_tx_0x28: port@a8000 {
+		cell-index = <0x28>;
+		compatible = "fsl,fman-v3-port-tx";
+		reg = <0xa8000 0x1000>;
+		fsl,fman-10g-port;
+	};
+
+	ethernet@e0000 {
+		cell-index = <0>;
+		compatible = "fsl,fman-memac";
+		reg = <0xe0000 0x1000>;
+		fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
+		ptp-timer = <&ptp_timer0>;
+		pcsphy-handle = <&pcsphy0>;
+	};
+
+	mdio@e1000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
+		reg = <0xe1000 0x1000>;
+		fsl,erratum-a011043; /* must ignore read errors */
+
+		pcsphy0: ethernet-phy@0 {
+			reg = <0x0>;
+		};
+	};
+};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
new file mode 100644
index 000000000000..ad116b17850a
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later
+/*
+ * QorIQ FMan v3 10g port #3 device tree stub [ controller @ offset 0x400000 ]
+ *
+ * Copyright 2022 Sean Anderson <sean.anderson@seco.com>
+ * Copyright 2012 - 2015 Freescale Semiconductor Inc.
+ */
+
+fman@400000 {
+	fman0_rx_0x09: port@89000 {
+		cell-index = <0x9>;
+		compatible = "fsl,fman-v3-port-rx";
+		reg = <0x89000 0x1000>;
+		fsl,fman-10g-port;
+	};
+
+	fman0_tx_0x29: port@a9000 {
+		cell-index = <0x29>;
+		compatible = "fsl,fman-v3-port-tx";
+		reg = <0xa9000 0x1000>;
+		fsl,fman-10g-port;
+	};
+
+	ethernet@e2000 {
+		cell-index = <1>;
+		compatible = "fsl,fman-memac";
+		reg = <0xe2000 0x1000>;
+		fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
+		ptp-timer = <&ptp_timer0>;
+		pcsphy-handle = <&pcsphy1>;
+	};
+
+	mdio@e3000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
+		reg = <0xe3000 0x1000>;
+		fsl,erratum-a011043; /* must ignore read errors */
+
+		pcsphy1: ethernet-phy@0 {
+			reg = <0x0>;
+		};
+	};
+};
diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
index ecbb447920bc..74e17e134387 100644
--- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
@@ -609,8 +609,8 @@ usb1: usb@211000 {
 /include/ "qoriq-bman1.dtsi"
 
 /include/ "qoriq-fman3-0.dtsi"
-/include/ "qoriq-fman3-0-1g-0.dtsi"
-/include/ "qoriq-fman3-0-1g-1.dtsi"
+/include/ "qoriq-fman3-0-10g-2.dtsi"
+/include/ "qoriq-fman3-0-10g-3.dtsi"
 /include/ "qoriq-fman3-0-1g-2.dtsi"
 /include/ "qoriq-fman3-0-1g-3.dtsi"
 /include/ "qoriq-fman3-0-1g-4.dtsi"
-- 
2.35.1.1320.gc452695387.dirty