drop queue-5.15/riscv-dts-microchip-mpfs-fix-reference-clock-node.patch

diff --git a/queue-5.15/riscv-dts-microchip-mpfs-fix-reference-clock-node.patch b/queue-5.15/riscv-dts-microchip-mpfs-fix-reference-clock-node.patch
deleted file mode 100644 (file)
index 52491d8..0000000
--- a/queue-5.15/riscv-dts-microchip-mpfs-fix-reference-clock-node.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 4fa8e7d65f7a720ac13f22aab2ce447b921dbf97 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 17 Dec 2021 13:49:26 +0100
-Subject: riscv: dts: microchip: mpfs: Fix reference clock node
-
-From: Geert Uytterhoeven <geert@linux-m68k.org>
-
-[ Upstream commit 9d7b3078628f591e4007210c0d5d3f94805cff55 ]
-
-"make dtbs_check" reports:
-
-    arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: soc: refclk: {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[600000000]], 'clock-output-names': ['msspllclk'], 'phandle': [[7]]} should not be valid under {'type': 'object'}
-       From schema: dtschema/schemas/simple-bus.yaml
-
-Fix this by moving the node out of the "soc" subnode.
-While at it, rename it to "msspllclk", and drop the now superfluous
-"clock-output-names" property.
-Move the actual clock-frequency value to the board DTS, since it is not
-set until bitstream programming time.
-
-Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
-Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
-Tested-by: Conor Dooley <conor.dooley@microchip.com>
-Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../boot/dts/microchip/microchip-mpfs-icicle-kit.dts |  4 ++++
- arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi    | 12 +++++-------
- 2 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
-index cce5eca31f257..4b69ab4ff30a2 100644
---- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
-+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
-@@ -40,6 +40,10 @@
-       };
- };
- 
-+&refclk {
-+      clock-frequency = <600000000>;
-+};
-+
- &serial0 {
-       status = "okay";
- };
-diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
-index 4ef4bcb748729..9279ccf20009a 100644
---- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
-+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
-@@ -139,6 +139,11 @@
-               };
-       };
- 
-+      refclk: msspllclk {
-+              compatible = "fixed-clock";
-+              #clock-cells = <0>;
-+      };
-+
-       soc {
-               #address-cells = <2>;
-               #size-cells = <2>;
-@@ -188,13 +193,6 @@
-                       #dma-cells = <1>;
-               };
- 
--              refclk: refclk {
--                      compatible = "fixed-clock";
--                      #clock-cells = <0>;
--                      clock-frequency = <600000000>;
--                      clock-output-names = "msspllclk";
--              };
--
-               clkcfg: clkcfg@20002000 {
-                       compatible = "microchip,mpfs-clkcfg";
-                       reg = <0x0 0x20002000 0x0 0x1000>;
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 54beaac5e9435cb5612149bf2924e9c8483becae..f5c073a7c3fe7ddca971af06f1bf2d2139db8a28 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -45,7 +45,6 @@ nfs-save-some-space-in-the-inode.patch
 nfs-fix-another-fsync-issue-after-a-server-reboot.patch
 cgroup-elide-write-locking-threadgroup_rwsem-when-up.patch
 cgroup-fix-threadgroup_rwsem-cpus_read_lock-deadlock.patch
-riscv-dts-microchip-mpfs-fix-reference-clock-node.patch
 asoc-qcom-sm8250-add-missing-module-owner.patch
 rdma-rtrs-clt-use-the-right-sg_cnt-after-ib_dma_map_.patch
 rdma-rtrs-srv-pass-the-correct-number-of-entries-for.patch