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:     Eric Dumazet <edumazet@google.com>,
        "linuxppc-dev @ lists . ozlabs . org" <linuxppc-dev@lists.ozlabs.org>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Russell King <linux@armlinux.org.uk>,
        Paolo Abeni <pabeni@redhat.com>,
        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 v7 08/10] powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
Date:   Mon, 17 Oct 2022 16:22:39 -0400
Message-Id: <20221017202241.1741671-9-sean.anderson@seco.com>
In-Reply-To: <20221017202241.1741671-1-sean.anderson@seco.com>
References: <20221017202241.1741671-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?sEGvWZv0+6W3pdoK05nx1t7LhjTBUvsHzihZ43rK3/0+dnBOnMtak3GCbR9i?=
 =?us-ascii?Q?AsFu95+rnfRLk4E2rKnPn3R06qJS6HbrJy6a3+o8WwLxPtYdh90Zsd7ert1R?=
 =?us-ascii?Q?YAze0TODyinyWolUNzF4rxlT5O1tKgON70zb+s4ObxjBPIkUJ2pknMlztTXj?=
 =?us-ascii?Q?omqOnzIMBLN27gCStSRtBICo4OD2GQP0uxHO/2Y1zuvKiTAknMQH4nf3muXm?=
 =?us-ascii?Q?gVFtYLpQ3q68DKCEdJFhnydGVtwb7MHbSgMPurfKgeC/o2gL0kxc6u43tNb+?=
 =?us-ascii?Q?tGOYxY2pVG6qz8Z3syKAhNx1KEAOTG6+tfd9uONQaE4uC52OAxixiQSy3Xsa?=
 =?us-ascii?Q?GWL7gPOoVM7BP9o31fyGWurlAA962SxcmcidlFXzOhwFdb9GYjippDvPPQAU?=
 =?us-ascii?Q?KjC7aoAQ0n0cYugV2MCqSn7byimX4SHV55Eu7PpiypyUWOeRlcTp+ovzaTlI?=
 =?us-ascii?Q?ZBw4tL7eidmijVXhmewLnFeGEa9Hp7Rqt9DbuMnIZcy+SpcHUO+XgdNIU4VL?=
 =?us-ascii?Q?jGE3bwPtQIZYG7TCV3OOEXNdX4cuGZR/JtgNNYjmBsoHF8WxKDWXy8x+6/hJ?=
 =?us-ascii?Q?hcu+1b/ZDuGDLDP0YWp/59sBPFBg6AuHu2FtcY0r0/lEhryjPM2Lyf91nkI1?=
 =?us-ascii?Q?tdM4KlylKsByNBNZkqiArTsu2kLkc6TDFqPlhVgCdcIsYF9L9N0mkx66p2in?=
 =?us-ascii?Q?OZpoZUXgo4JyfzKaBOAQvTOHHg1IW/AJK6L2KUiAStmJApNVm5Un55SoAr3u?=
 =?us-ascii?Q?FSNMIoNBvpmiUlw4zTTOdlm9aNwxwpXTFw2hAGuo4EOD5jLQA9JXIIvH5cOm?=
 =?us-ascii?Q?bVJC73SejiTg01njMA3DWs77JVuykLYboF47Yyp3SnrUPwuc8rDIYqCjO+DQ?=
 =?us-ascii?Q?7ljkL5k7K1mfwmaveiMCfs1h1cmr3jHPIlE9aK3BNx7jDpFYuh7XM7aGWfOM?=
 =?us-ascii?Q?fbX41clFTZ8Yo0VqsVsVwi1K9Ogqh52+rfOyIb7fXcgzIZK/PUAkou1UmnZ0?=
 =?us-ascii?Q?37GWuy0DL6OVffpgItNomqOIaxItAY+mm1Rga1YJy1j4ACjDML3J7A7eLIQx?=
 =?us-ascii?Q?NfM/hbmnG053/G0Fl7ZTTD4I6ypmyhqqyuJ0x6iWqWAvdT9ICaLmcFr4S/lc?=
 =?us-ascii?Q?CVdmMWjtxTok3Vr0mLiwmq6IdWxPfedfvXWP3oLYHXVsEaybQI1iGXgsTJ6I?=
 =?us-ascii?Q?6+5ujxGJ3igbxXyoPaOT8rM/k4e+Po1IPRV5jJJ45lihao3Vsovf00xLk4kH?=
 =?us-ascii?Q?gcqjJZ4JQ9ll/FgSFNBDUw7Nxtd6T/qkQb0dsG8akz5x2Ber7N4UfvXyJRI8?=
 =?us-ascii?Q?YV4EnGbd6YAmgzuaVb3Mz/fFUU1F/YznSvQ7b4HMkquynXAmcOMWiM5ACUOZ?=
 =?us-ascii?Q?tqfYl/q5mePt5tmc1RbpRBYhSgpOJwoqeyx9cu5iRPoenr6Ovi2sbHJxSOEf?=
 =?us-ascii?Q?vl0laR4YKdQw9a8ji5bZy56KDXDOhMvMoQSgl6jC6W0VX6A2TkIyzka7R/uq?=
 =?us-ascii?Q?tlLOxZ6dKJwc3s+5mpDz8OB3uQxA/XpkYtjSy7AdR7F/GUHd+jZGa/7BBOHt?=
 =?us-ascii?Q?89Tqb7BJ05Ncpu0JH9t1kBhT1LdrdcgXaEmb/34qrM9IBnQ19i2c3sT9XxIh?=
 =?us-ascii?Q?1Q=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d675a9f4-500f-41f7-07b0-08dab07d7671
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 20:23:33.2428
 (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: HuDfRfnQYzCvk8brAeOWuPfznQajZG2CVkvWaL9W/5SHOjALLrtviWj0ntLREtHdymBj0zUMjcvSkaN3IqyKgg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR03MB8406
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>
---

(no changes since v4)

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