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:     Russell King <linux@armlinux.org.uk>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Paolo Abeni <pabeni@redhat.com>,
        Eric Dumazet <edumazet@google.com>,
        "linuxppc-dev @ lists . ozlabs . org" <linuxppc-dev@lists.ozlabs.org>,
        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 v6 7/9] powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
Date:   Fri, 30 Sep 2022 16:09:31 -0400
Message-Id: <20220930200933.4111249-8-sean.anderson@seco.com>
In-Reply-To: <20220930200933.4111249-1-sean.anderson@seco.com>
References: <20220930200933.4111249-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?j3aojaxRKeI0mcCk8vLMldJFpzxQ822xvvIbqnIK4xTbnmpGuvAecg5gWWqh?=
 =?us-ascii?Q?eaIyFJKYN5IT3tTeZRSQfuTSNREi8Ef7L0dXw/hr8GbO/+o12NlIx1SU/rLS?=
 =?us-ascii?Q?aiSk+qZiZplHP/9NYF04YZh+lreMjywwz2FkkNEmZPWW+8lTDX5kNRyQr9tC?=
 =?us-ascii?Q?5R1xKx2lq7jJHgfVDsnOWSHYwm2uDU4P8qq2uSn1sKc1y6iBht2bGDs1op+8?=
 =?us-ascii?Q?1aFdAlMz0gfzIso39i6+4p651jKOSlXT8wNOFxj5Rb3m7wC5/ZM/fE36LPfp?=
 =?us-ascii?Q?EmnQ3B77xB+Mg6gmxBR4E3oA8gizgo10+002szq9P6GL/IpyUA1GpHMQ69hY?=
 =?us-ascii?Q?lOB+GwVD1i+IC/OmliNhpPKf6ozVSPMU87GcJYhhLcQbYCpShvhKdZNC4cCQ?=
 =?us-ascii?Q?2kqFQx5TmvsCIP9vuMYz+6au99LEor8kY4AZeVuiuzSmjWoJN8BZvPVrIH6n?=
 =?us-ascii?Q?fudQHAsemyFtxKt9Cg/9FF9hc4h1V0sSKKx9+Slr1KLLk8xQLWRF9tPZK9U1?=
 =?us-ascii?Q?r6L/N+xRi0k1BNWVV1eO571IiNwYWwEUyhrlXqVu1EjVgzO/zEymfTotIIGj?=
 =?us-ascii?Q?bApt4NJ0zefErRawIbquIwqdknKUUMS9ZyE6cYwWoFVkNvZQ30AzNeuwoJoL?=
 =?us-ascii?Q?U2pvqLowUbpCwgwKjgS64FsVrlEEyMnLx3DxiO1/uyvO+OAMWzNccOSo7CAE?=
 =?us-ascii?Q?DzJuQDUD74ioEr5zFIqA8KCOfg5FOy/yrHtesGwizcoSkO68CLd5K3vxDcNv?=
 =?us-ascii?Q?dI5e/4bpYd2KgQ9etTTWtZ1wA+yyTLwjxq64tkxzH2EX1BDWnTo5zVPLYWRK?=
 =?us-ascii?Q?Zg8C96d5rxZ1c0XUMFWQsoebwfsPcOL0JXGN5D0Wx/jVcaZV7nSiK0SneDt8?=
 =?us-ascii?Q?4IgEaQHHfO/eB99i6cnDZTn81mNzQdoW6qpq67bR6Cj7veP1lxn4B89QXGyD?=
 =?us-ascii?Q?LOgEuEHbgaSNOHTi6xGFYWY9KqxmeoYNKHsj+FnSsAHZRMIo6qgO5NdVu1Zy?=
 =?us-ascii?Q?CotIUHIB/dAb8Q5Gv3Ip7th9/KKmpf6cI+5Wo+WRIB5JLZtXMxpQ+ZsGnuHK?=
 =?us-ascii?Q?2G5dekGeZpke7Lx5Dtq06nqMJhUUamf+4K87Gv/FFI2Yqbni8eH3SkYHSWVD?=
 =?us-ascii?Q?4LKKbE/wY4HcngByh5DcBt4xo7d05RgC58KifEgDgUr8wrxZVr9R6wuScjJp?=
 =?us-ascii?Q?iyiWSmTYsafccxGQi1l0UH2+Ge5z7iks6QHNJhGBaH+qwj+4Z99wJQQD0GNT?=
 =?us-ascii?Q?K3OL87Oy0qjUh6oVB6Yg8nOdNxUmJ/yvhSw4nSE6e9cLJMrVWuXgpyxV/1bJ?=
 =?us-ascii?Q?KkcVdHHhf8grVua4WlqRCK8t0QDmUctcHCqPgOo3QRTw3oH+N5YDQUYmf7J3?=
 =?us-ascii?Q?mb8RH57Bg3yQkJmI5lEn7wm6e/KydqWs3Me5HBzgvR/ng5inqk1fOr1T+Ws+?=
 =?us-ascii?Q?H/vFv/1pmLrirY1VZcMYrViorGEZR4w+94XwdbVSs1wI7j2wz53n7mc1t241?=
 =?us-ascii?Q?JnSAvbF2gaUQtc217fgAQAIbT3dT+PlRIzGSLE+1zaolhOEwg1FZognsC7Sm?=
 =?us-ascii?Q?IWQ+Rq/sJCBA8fUkOXlMAD1kfWqIXwH4rFuV1IySCeHG4bMK9jDA/VDJG3Gr?=
 =?us-ascii?Q?YA=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4a8b79d6-beca-4957-e11d-08daa31fbfdf
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 20:09:58.6499
 (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: FIRKc+m7iWdx47p/NG0KYI7oE9aE8T2kxo/Wbxxyl/PSwptAoISvhiP+orMJwPQ25MZseMcrV37PCPwPbwIJ5Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7749
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_NONE,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