drop powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch from everywhere

diff --git a/queue-4.14/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch b/queue-4.14/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
deleted file mode 100644 (file)
index eee6675..0000000
--- a/queue-4.14/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 5a6002f1b82d270b797191ea58d82428336587f9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Oct 2022 16:22:39 -0400
-Subject: powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
-
-From: Sean Anderson <sean.anderson@seco.com>
-
-[ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
-
-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>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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 a97296c64eb2..a3cee1acd7ab 100644
---- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-@@ -631,8 +631,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
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 98b86aea983e960b0e856b84f011706e5465e8ad..61783dd832ee48db003c50cbd336c598af7043df 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -67,7 +67,6 @@ hfs-fix-oob-write-in-hfs_asc2mac.patch
 rapidio-devices-fix-missing-put_device-in-mport_cdev.patch
 wifi-ath9k-hif_usb-fix-memory-leak-of-urbs-in-ath9k_.patch
 wifi-ath9k-hif_usb-fix-use-after-free-in-ath9k_hif_u.patch
-powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
 media-i2c-ad5820-fix-error-path.patch
 spi-update-reference-to-struct-spi_controller.patch
 media-vivid-fix-compose-size-exceed-boundary.patch

diff --git a/queue-4.19/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch b/queue-4.19/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
deleted file mode 100644 (file)
index 9eea079..0000000
--- a/queue-4.19/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 156389fc09d204f632cbc6af4d896839246e6d1d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Oct 2022 16:22:39 -0400
-Subject: powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
-
-From: Sean Anderson <sean.anderson@seco.com>
-
-[ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
-
-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>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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 a97296c64eb2..a3cee1acd7ab 100644
---- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-@@ -631,8 +631,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
-

diff --git a/queue-4.19/series b/queue-4.19/series
index c0863a955a0cb758f4eb9e9600e7c36533940cb5..49bb91e65b790ed1e86fd8422eff8cb69f45438d 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -83,7 +83,6 @@ wifi-ath9k-hif_usb-fix-memory-leak-of-urbs-in-ath9k_.patch
 wifi-ath9k-hif_usb-fix-use-after-free-in-ath9k_hif_u.patch
 wifi-rtl8xxxu-fix-reading-the-vendor-of-combo-chips.patch
 pata_ipx4xx_cf-fix-unsigned-comparison-with-less-tha.patch
-powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
 media-i2c-ad5820-fix-error-path.patch
 can-kvaser_usb-do-not-increase-tx-statistics-when-se.patch
 can-kvaser_usb-kvaser_usb_leaf-get-capabilities-from.patch

diff --git a/queue-4.9/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch b/queue-4.9/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
deleted file mode 100644 (file)
index 1744553..0000000
--- a/queue-4.9/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From d91de12937cdb1742a6e098e871af05ed7637a79 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Oct 2022 16:22:39 -0400
-Subject: powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
-
-From: Sean Anderson <sean.anderson@seco.com>
-
-[ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
-
-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>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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 c744569a20e1..5fa9068a2929 100644
---- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-@@ -631,8 +631,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
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 3669c223ff76c3d5bc0baabdc7d045bf5ab4169f..7e29cd960798ee770165749b4cd54c108ef69a66 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -51,7 +51,6 @@ hfs-fix-oob-write-in-hfs_asc2mac.patch
 rapidio-devices-fix-missing-put_device-in-mport_cdev.patch
 wifi-ath9k-hif_usb-fix-memory-leak-of-urbs-in-ath9k_.patch
 wifi-ath9k-hif_usb-fix-use-after-free-in-ath9k_hif_u.patch
-powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
 media-i2c-ad5820-fix-error-path.patch
 media-vivid-fix-compose-size-exceed-boundary.patch
 mtd-fix-device-name-leak-when-register-device-failed.patch

diff --git a/queue-5.10/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch b/queue-5.10/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
deleted file mode 100644 (file)
index 15828bb..0000000
--- a/queue-5.10/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 8e60735bc53f2dbaa46787b087ecc07bd4833591 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Oct 2022 16:22:39 -0400
-Subject: powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
-
-From: Sean Anderson <sean.anderson@seco.com>
-
-[ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
-
-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>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 8ccf7fe96d0b5d1071c4a8be1d3a230e05955a85..eea6f65c8aea511bcadf4c36760a83523af2bb8d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -109,7 +109,6 @@ drm-bridge-adv7533-remove-dynamic-lane-switching-fro.patch
 libbpf-fix-use-after-free-in-btf_dump_name_dups.patch
 libbpf-fix-null-pointer-dereference-in-find_prog_by_.patch
 pata_ipx4xx_cf-fix-unsigned-comparison-with-less-tha.patch
-powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
 media-coda-jpeg-add-check-for-kmalloc.patch
 media-i2c-ad5820-fix-error-path.patch
 venus-pm_helpers-fix-error-check-in-vcodec_domains_g.patch

diff --git a/queue-5.15/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch b/queue-5.15/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
deleted file mode 100644 (file)
index cd44e8b..0000000
--- a/queue-5.15/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From ef27d82d516114e7ea78f98db542b2c38525df54 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Oct 2022 16:22:39 -0400
-Subject: powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
-
-From: Sean Anderson <sean.anderson@seco.com>
-
-[ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
-
-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>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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
-

diff --git a/queue-5.15/series b/queue-5.15/series
index ae6c7f94beee5cc7320d54fb820b9359d1dd6837..29d5e55d97c8e582d28992c7bd78cbca227dc878 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -149,7 +149,6 @@ ata-add-use-ata_taskfile-error-status-fields.patch
 ata-libata-fix-ncq-autosense-logic.patch
 ipmi-kcs-poll-obf-briefly-to-reduce-obe-latency.patch
 drm-amdgpu-powerplay-psm-fix-memory-leak-in-power-st.patch
-powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
 media-v4l2-ctrls-fix-off-by-one-error-in-integer-men.patch
 media-coda-jpeg-add-check-for-kmalloc.patch
 media-adv748x-afe-select-input-port-when-initializin.patch

diff --git a/queue-5.4/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch b/queue-5.4/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
deleted file mode 100644 (file)
index 221c196..0000000
--- a/queue-5.4/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 5060b24b8797480f15616087e4f6fe903ec72599 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Oct 2022 16:22:39 -0400
-Subject: powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
-
-From: Sean Anderson <sean.anderson@seco.com>
-
-[ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
-
-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>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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
-

diff --git a/queue-5.4/series b/queue-5.4/series
index d917802c10967b89c298b80b2dd310d586cd4b3f..40dd121ede4ce2a3718667c6229e196efeb55a89 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -102,7 +102,6 @@ wifi-ath9k-hif_usb-fix-memory-leak-of-urbs-in-ath9k_.patch
 wifi-ath9k-hif_usb-fix-use-after-free-in-ath9k_hif_u.patch
 wifi-rtl8xxxu-fix-reading-the-vendor-of-combo-chips.patch
 pata_ipx4xx_cf-fix-unsigned-comparison-with-less-tha.patch
-powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
 media-i2c-ad5820-fix-error-path.patch
 can-kvaser_usb-do-not-increase-tx-statistics-when-se.patch
 can-kvaser_usb-kvaser_usb_leaf-get-capabilities-from.patch

diff --git a/queue-6.0/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch b/queue-6.0/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
deleted file mode 100644 (file)
index ca04d7d..0000000
--- a/queue-6.0/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 663b528ff261d85d0f399a8307543ae0e2023740 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Oct 2022 16:22:39 -0400
-Subject: powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
-
-From: Sean Anderson <sean.anderson@seco.com>
-
-[ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
-
-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>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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
-

diff --git a/queue-6.0/series b/queue-6.0/series
index c4b3c397e45b7b2c99a3d682634da0c0e0d98f8a..b7db16a0e99762d8c385d0da76a113de681fd3b1 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -214,7 +214,6 @@ asoc-intel-avs-fix-dma-mask-assignment.patch
 asoc-intel-avs-fix-potential-rx-buffer-overflow.patch
 ipmi-kcs-poll-obf-briefly-to-reduce-obe-latency.patch
 drm-amdgpu-powerplay-psm-fix-memory-leak-in-power-st.patch
-powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
 samples-bpf-fix-map-iteration-in-xdp1_user.patch
 samples-bpf-fix-mac-address-swapping-in-xdp2_kern.patch
 drm-bridge-it6505-initialize-aux-channel-in-it6505_i.patch

diff --git a/queue-6.1/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch b/queue-6.1/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
deleted file mode 100644 (file)
index 72a703f..0000000
--- a/queue-6.1/powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 25b447b0fa0ea19fab95889286472895d8776373 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 17 Oct 2022 16:22:39 -0400
-Subject: powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
-
-From: Sean Anderson <sean.anderson@seco.com>
-
-[ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
-
-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>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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
-

diff --git a/queue-6.1/series b/queue-6.1/series
index f5275ea52af31835be8c21784562a96510304de4..01521e559521deb528f943cc77a7c103bf4f4407 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -219,7 +219,6 @@ asoc-intel-avs-fix-potential-rx-buffer-overflow.patch
 ipmi-kcs-poll-obf-briefly-to-reduce-obe-latency.patch
 drm-amdgpu-revert-drm-amdgpu-getting-fan-speed-pwm-f.patch
 drm-amdgpu-powerplay-psm-fix-memory-leak-in-power-st.patch
-powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch
 net-ethernet-adi-adin1110-fix-spi-transfers.patch
 samples-bpf-fix-map-iteration-in-xdp1_user.patch
 samples-bpf-fix-mac-address-swapping-in-xdp2_kern.patch