drop 2 rockchip arm64 dts patches

diff --git a/queue-5.15/arm64-dts-rockchip-fix-rk3568-mbi-alias.patch b/queue-5.15/arm64-dts-rockchip-fix-rk3568-mbi-alias.patch
deleted file mode 100644 (file)
index e9021cc..0000000
--- a/queue-5.15/arm64-dts-rockchip-fix-rk3568-mbi-alias.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 66364be9ec7ea25b23bdd7346802a72245190110 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 28 Jul 2021 14:00:27 -0400
-Subject: arm64: dts: rockchip: fix rk3568 mbi-alias
-
-From: Peter Geis <pgwipeout@gmail.com>
-
-[ Upstream commit b6c1a590148c63f822091912b4c09c79fbb13971 ]
-
-The mbi-alias incorrectly points to 0xfd100000 when it should point to
-0xfd410000.
-This fixes MSIs on rk3568.
-
-Fixes: a3adc0b9071d ("arm64: dts: rockchip: add core dtsi for RK3568 SoC")
-Signed-off-by: Peter Geis <pgwipeout@gmail.com>
-Link: https://lore.kernel.org/r/20210728180034.717953-2-pgwipeout@gmail.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-index d225e6a45d5cb..fdfe283b7a30d 100644
---- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-@@ -201,7 +201,7 @@
-               interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-controller;
-               #interrupt-cells = <3>;
--              mbi-alias = <0x0 0xfd100000>;
-+              mbi-alias = <0x0 0xfd410000>;
-               mbi-ranges = <296 24>;
-               msi-controller;
-       };
--- 
-2.33.0
-

diff --git a/queue-5.15/arm64-dts-rockchip-move-rk3568-dtsi-to-rk356x-dtsi.patch b/queue-5.15/arm64-dts-rockchip-move-rk3568-dtsi-to-rk356x-dtsi.patch
deleted file mode 100644 (file)
index 5f03d56..0000000
--- a/queue-5.15/arm64-dts-rockchip-move-rk3568-dtsi-to-rk356x-dtsi.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4a788809d87d83f4b6e75620571931a003ebd854 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 10 Jul 2021 11:10:31 -0400
-Subject: arm64: dts: rockchip: move rk3568 dtsi to rk356x dtsi
-
-From: Peter Geis <pgwipeout@gmail.com>
-
-[ Upstream commit 4e50d2173b67115a5574f4f4ce64ec9c5d9c136e ]
-
-In preparation for separating the rk3568 and rk3566 device trees, move
-the base rk3568 dtsi to rk356x dtsi.
-This will allow us to strip out the rk3568 specific nodes.
-
-Signed-off-by: Peter Geis <pgwipeout@gmail.com>
-Link: https://lore.kernel.org/r/20210710151034.32857-2-pgwipeout@gmail.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/rockchip/{rk3568.dtsi => rk356x.dtsi} | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename arch/arm64/boot/dts/rockchip/{rk3568.dtsi => rk356x.dtsi} (100%)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-similarity index 100%
-rename from arch/arm64/boot/dts/rockchip/rk3568.dtsi
-rename to arch/arm64/boot/dts/rockchip/rk356x.dtsi
--- 
-2.33.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 94ed31362760c1a99ca15026be68a507b31571e1..8438d2f9262364ee887970b422e0a1338e8a3a8d 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -577,8 +577,6 @@ scsi-pm80xx-fix-lockup-in-outbound-queue-management.patch
 scsi-qla2xxx-edif-use-link-event-to-wake-up-app.patch
 scsi-lpfc-fix-nvme-i-o-failover-to-non-optimized-pat.patch
 arm-s3c-irq-s3c24xx-fix-return-value-check-for-s3c24.patch
-arm64-dts-rockchip-move-rk3568-dtsi-to-rk356x-dtsi.patch
-arm64-dts-rockchip-fix-rk3568-mbi-alias.patch
 arm64-dts-rockchip-fix-gpu-register-width-for-rk3328.patch
 arm-dts-qcom-msm8974-add-xo_board-reference-clock-to.patch
 rdma-bnxt_re-fix-query-srq-failure.patch