]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop some renesas dts patches from 6.6
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Dec 2024 12:54:23 +0000 (13:54 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Dec 2024 12:54:23 +0000 (13:54 +0100)
queue-6.6/arm-dts-renesas-genmai-add-flash-nodes.patch [deleted file]
queue-6.6/arm-dts-renesas-genmai-fix-partition-size-for-qspi-n.patch [deleted file]
queue-6.6/arm-dts-renesas-remove-unused-lbsc-nodes-from-board-.patch [deleted file]
queue-6.6/series

diff --git a/queue-6.6/arm-dts-renesas-genmai-add-flash-nodes.patch b/queue-6.6/arm-dts-renesas-genmai-add-flash-nodes.patch
deleted file mode 100644 (file)
index c2dc167..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-From a670e8540da2de723c0eae14ef8234b0ada6b542 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Aug 2023 13:52:32 +0200
-Subject: ARM: dts: renesas: genmai: Add FLASH nodes
-
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-
-[ Upstream commit 30e0a8cf886cb459dc8a895ba9a4fb5132b41499 ]
-
-Add device nodes for the dual Spansion S25FL512S QSPI NOR FLASH and the
-two Spansion S29GL512S CFI NOR FLASHes on the Genmai development board.
-The former is mapped directly through the SPI Multi I/O Bus Controller.
-The latter reside in the address space of the Bus State Controller
-(BSC).
-
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Link: https://lore.kernel.org/r/53c89c70c6b010702fd9ab5247e19986857671ba.1693481518.git.geert+renesas@glider.be
-Stable-dep-of: 48e17816c3ef ("ARM: dts: renesas: genmai: Fix partition size for QSPI NOR Flash")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 85 +++++++++++++++++++
- 1 file changed, 85 insertions(+)
-
-diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-index ee52c6d5349d0..29ba098f5dd5e 100644
---- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-@@ -29,6 +29,35 @@ memory@8000000 {
-               reg = <0x08000000 0x08000000>;
-       };
-+      flash@18000000 {
-+              compatible = "mtd-rom";
-+              reg = <0x18000000 0x08000000>;
-+              bank-width = <4>;
-+              device-width = <1>;
-+
-+              clocks = <&mstp9_clks R7S72100_CLK_SPIBSC0>;
-+              power-domains = <&cpg_clocks>;
-+
-+              #address-cells = <1>;
-+              #size-cells = <1>;
-+
-+              partitions {
-+                      compatible = "fixed-partitions";
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+
-+                      partition@0 {
-+                              label = "user";
-+                              reg = <0x00000000 0x04000000>;
-+                      };
-+
-+                      partition@4000000 {
-+                              label = "user1";
-+                              reg = <0x04000000 0x40000000>;
-+                      };
-+              };
-+      };
-+
-       leds {
-               status = "okay";
-               compatible = "gpio-leds";
-@@ -82,6 +111,62 @@ &extal_clk {
-       clock-frequency = <13330000>;
- };
-+&bsc {
-+      flash@0 {
-+              compatible = "cfi-flash";
-+              reg = <0x00000000 0x04000000>;
-+              bank-width = <2>;
-+
-+              partitions {
-+                      compatible = "fixed-partitions";
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+
-+                      partition@0 {
-+                              label = "uboot";
-+                              reg = <0x00000000 0x00040000>;
-+                      };
-+
-+                      partition@40000 {
-+                              label = "uboot-env";
-+                              reg = <0x00040000 0x00020000>;
-+                      };
-+
-+                      partition@60000 {
-+                              label = "flash";
-+                              reg = <0x00060000 0x03fa0000>;
-+                      };
-+              };
-+      };
-+
-+      flash@4000000 {
-+              compatible = "cfi-flash";
-+              reg = <0x04000000 0x04000000>;
-+              bank-width = <2>;
-+
-+              partitions {
-+                      compatible = "fixed-partitions";
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+
-+                      partition@0 {
-+                              label = "uboot1";
-+                              reg = <0x00000000 0x00040000>;
-+                      };
-+
-+                      partition@40000 {
-+                              label = "uboot-env1";
-+                              reg = <0x00040000 0x00020000>;
-+                      };
-+
-+                      partition@60000 {
-+                              label = "flash1";
-+                              reg = <0x00060000 0x03fa0000>;
-+                      };
-+              };
-+      };
-+};
-+
- &usb_x1_clk {
-       clock-frequency = <48000000>;
- };
--- 
-2.43.0
-
diff --git a/queue-6.6/arm-dts-renesas-genmai-fix-partition-size-for-qspi-n.patch b/queue-6.6/arm-dts-renesas-genmai-fix-partition-size-for-qspi-n.patch
deleted file mode 100644 (file)
index 60f2f2c..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6c09c60f2dcb961d8c45f1bdbc5195f7595b6b45 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 14 Sep 2024 20:28:44 +0200
-Subject: ARM: dts: renesas: genmai: Fix partition size for QSPI NOR Flash
-
-From: Wolfram Sang <wsa+renesas@sang-engineering.com>
-
-[ Upstream commit 48e17816c3effa3545e21cd4f7d5a00c55c17a18 ]
-
-Second partition was too large, looks like two digits got mixed up.
-Fixes:
-
-mtd: partition "user1" extends beyond the end of device "18000000.flash" -- size truncated to 0x4000000
-
-Fixes: 30e0a8cf886c ("ARM: dts: renesas: genmai: Add FLASH nodes")
-Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
-Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Link: https://lore.kernel.org/20240914182948.94031-2-wsa+renesas@sang-engineering.com
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-index 29ba098f5dd5e..28e703e0f152b 100644
---- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-@@ -53,7 +53,7 @@ partition@0 {
-                       partition@4000000 {
-                               label = "user1";
--                              reg = <0x04000000 0x40000000>;
-+                              reg = <0x04000000 0x04000000>;
-                       };
-               };
-       };
--- 
-2.43.0
-
diff --git a/queue-6.6/arm-dts-renesas-remove-unused-lbsc-nodes-from-board-.patch b/queue-6.6/arm-dts-renesas-remove-unused-lbsc-nodes-from-board-.patch
deleted file mode 100644 (file)
index e33a21b..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-From 7be17c95180dabc384599c5ac342e5d4c2226031 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Aug 2023 13:52:25 +0200
-Subject: ARM: dts: renesas: Remove unused LBSC nodes from board DTS
-
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-
-[ Upstream commit 7801764bb8ff68d9ca3dc6967d4642e205a22a0f ]
-
-Several board DTS files contain minimal device nodes that represent
-on-SoC Local Bus State Controllers (LBSC), although they belong in the
-SoC-specific DTS files instead.  As these device nodes are incomplete
-and unused, and hamper adding proper nodes later, it is better to just
-remove them.
-
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Link: https://lore.kernel.org/r/76ece7602045670cbb8dff684c3366ba6eb89add.1693481518.git.geert+renesas@glider.be
-Stable-dep-of: 48e17816c3ef ("ARM: dts: renesas: genmai: Fix partition size for QSPI NOR Flash")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/renesas/r7s72100-genmai.dts   | 5 -----
- arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts | 5 -----
- arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts  | 5 -----
- arch/arm/boot/dts/renesas/r7s9210-rza2mevb.dts  | 5 -----
- arch/arm/boot/dts/renesas/r8a7790-lager.dts     | 5 -----
- arch/arm/boot/dts/renesas/r8a7791-koelsch.dts   | 5 -----
- arch/arm/boot/dts/renesas/r8a7794-alt.dts       | 5 -----
- 7 files changed, 35 deletions(-)
-
-diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-index 1e8447176b105..ee52c6d5349d0 100644
---- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-@@ -29,11 +29,6 @@ memory@8000000 {
-               reg = <0x08000000 0x08000000>;
-       };
--      lbsc {
--              #address-cells = <1>;
--              #size-cells = <1>;
--      };
--
-       leds {
-               status = "okay";
-               compatible = "gpio-leds";
-diff --git a/arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts b/arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts
-index 105f9c71f9fd5..f3a0eaf22f52d 100644
---- a/arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts
-+++ b/arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts
-@@ -29,11 +29,6 @@ memory@20000000 {
-               reg = <0x20000000 0x00a00000>;
-       };
--      lbsc {
--              #address-cells = <1>;
--              #size-cells = <1>;
--      };
--
-       flash@18000000 {
-               compatible = "mtd-rom";
-               probe-type = "map_rom";
-diff --git a/arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts b/arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts
-index 1c5acf6944074..14249be7435a5 100644
---- a/arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts
-+++ b/arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts
-@@ -60,11 +60,6 @@ key-3 {
-               };
-       };
--      lbsc {
--              #address-cells = <1>;
--              #size-cells = <1>;
--      };
--
-       leds {
-               compatible = "gpio-leds";
-diff --git a/arch/arm/boot/dts/renesas/r7s9210-rza2mevb.dts b/arch/arm/boot/dts/renesas/r7s9210-rza2mevb.dts
-index 69a5a44b8a2fd..cd2324b8e8ffb 100644
---- a/arch/arm/boot/dts/renesas/r7s9210-rza2mevb.dts
-+++ b/arch/arm/boot/dts/renesas/r7s9210-rza2mevb.dts
-@@ -63,11 +63,6 @@ key-3 {
-               };
-       };
--      lbsc {
--              #address-cells = <1>;
--              #size-cells = <1>;
--      };
--
-       leds {
-               compatible = "gpio-leds";
-diff --git a/arch/arm/boot/dts/renesas/r8a7790-lager.dts b/arch/arm/boot/dts/renesas/r8a7790-lager.dts
-index ab7e9fa90b9fe..b17a9f9307e59 100644
---- a/arch/arm/boot/dts/renesas/r8a7790-lager.dts
-+++ b/arch/arm/boot/dts/renesas/r8a7790-lager.dts
-@@ -73,11 +73,6 @@ memory@140000000 {
-               reg = <1 0x40000000 0 0xc0000000>;
-       };
--      lbsc {
--              #address-cells = <1>;
--              #size-cells = <1>;
--      };
--
-       keyboard {
-               compatible = "gpio-keys";
-diff --git a/arch/arm/boot/dts/renesas/r8a7791-koelsch.dts b/arch/arm/boot/dts/renesas/r8a7791-koelsch.dts
-index 4a76be68887b4..ec01cc8595161 100644
---- a/arch/arm/boot/dts/renesas/r8a7791-koelsch.dts
-+++ b/arch/arm/boot/dts/renesas/r8a7791-koelsch.dts
-@@ -73,11 +73,6 @@ memory@200000000 {
-               reg = <2 0x00000000 0 0x40000000>;
-       };
--      lbsc {
--              #address-cells = <1>;
--              #size-cells = <1>;
--      };
--
-       keyboard {
-               compatible = "gpio-keys";
-diff --git a/arch/arm/boot/dts/renesas/r8a7794-alt.dts b/arch/arm/boot/dts/renesas/r8a7794-alt.dts
-index 3a9db455ddec9..73ec4d3541541 100644
---- a/arch/arm/boot/dts/renesas/r8a7794-alt.dts
-+++ b/arch/arm/boot/dts/renesas/r8a7794-alt.dts
-@@ -90,11 +90,6 @@ vccq_sdhi1: regulator-vccq-sdhi1 {
-               states = <3300000 1>, <1800000 0>;
-       };
--      lbsc {
--              #address-cells = <1>;
--              #size-cells = <1>;
--      };
--
-       keyboard {
-               compatible = "gpio-keys";
--- 
-2.43.0
-
index 19de6a41342b439599b8bf89d38cccdd9ef75aee..679b99012bc00d921b685455765cbdb07abbbe8a 100644 (file)
@@ -110,9 +110,6 @@ kcsan-seqlock-fix-incorrect-assumption-in-read_seqbe.patch
 clocksource-drivers-sp804-make-user-selectable.patch
 clocksource-drivers-timer-ti-dm-fix-child-node-refco.patch
 spi-spi-fsl-lpspi-use-irqf_no_autoen-flag-in-request.patch
-arm-dts-renesas-remove-unused-lbsc-nodes-from-board-.patch
-arm-dts-renesas-genmai-add-flash-nodes.patch
-arm-dts-renesas-genmai-fix-partition-size-for-qspi-n.patch
 drivers-soc-xilinx-add-the-missing-kfree-in-xlnx_add.patch
 microblaze-export-xmb_manager-functions.patch
 arm64-dts-mt8195-fix-dtbs_check-error-for-mutex-node.patch