kernel-6.15.2-200

* Tue Jun 10 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.15.2-0] - Revert "drm/amd/display: more liberal vmin/vmax update for freesync" (Justin M. Forbes) - Linux v6.15.2 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2025-06-10 08:46:23 -06:00 · 2025-06-10 08:46:23 -06:00 · db0a8fb7e7
commit db0a8fb7e7
parent a2ee230199
5 changed files with 363 additions and 6 deletions
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,5 +1,44 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/360edb99bae1b906107ec7dbb0d5a5410306fccd
- 360edb99bae1b906107ec7dbb0d5a5410306fccd Revert "drm/amd/display: more liberal vmin/vmax update for freesync"
+https://gitlab.com/cki-project/kernel-ark/-/commit/fed56a38083dbd26bde4eba51ea6878797b01376
+ fed56a38083dbd26bde4eba51ea6878797b01376 Revert "drm/amd/display: more liberal vmin/vmax update for freesync"
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/d7909c16c62ed14251352afd2ac6a17246533c14
+ d7909c16c62ed14251352afd2ac6a17246533c14 arm64: dts: rockchip: Drop assigned-clock* from cpu nodes on rk3588
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/f6fe2f2da41fd014a8d4a1b7275527706b9038e1
+ f6fe2f2da41fd014a8d4a1b7275527706b9038e1 arm64: dts: rockchip: Improve LED config for NanoPi R5S
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/f47c758ab8faa5cac82fcf47abf030258c0cd130
+ f47c758ab8faa5cac82fcf47abf030258c0cd130 arm64: dts: rockchip: Move rk3568 PCIe3 MSI to use GIC ITS
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/b6aeff3f14aef90537e7182d613bf386ec5e8786
+ b6aeff3f14aef90537e7182d613bf386ec5e8786 arm64: dts: rockchip: Update eMMC for NanoPi R5 series
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/e2eedda3d3f2c4be70753804cf5431f817991772
+ e2eedda3d3f2c4be70753804cf5431f817991772 arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/af4f01cfac541cdfcdf3ee7a74804249d0a62a1a
+ af4f01cfac541cdfcdf3ee7a74804249d0a62a1a arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-quartz64-b
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/bbf40beb1a9a3729b99101da133ae1ece5ee7ab1
+ bbf40beb1a9a3729b99101da133ae1ece5ee7ab1 arm64: dts: rockchip: Add phy-supply to gmac0 on NanoPi R5S
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/22cebdf881b3d6fb20f2c9e0cc91f80ea359a105
+ 22cebdf881b3d6fb20f2c9e0cc91f80ea359a105 arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3588-rock-5b
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/09864738a9a39780a147c9cb94a8e1320116a712
+ 09864738a9a39780a147c9cb94a8e1320116a712 arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-rockpro64
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/43438a08982d340ae5e384a02b2bfb99aa22333e
+ 43438a08982d340ae5e384a02b2bfb99aa22333e arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3328-rock64
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/c1f80e194a5d3bbfc66eaa55e65a00349ab15541
+ c1f80e194a5d3bbfc66eaa55e65a00349ab15541 arm64: dts: rockchip: Move SHMEM memory to reserved memory on rk3588
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/f3a28964ec84f5a742a9bf7d68d548370c734dc6
+ f3a28964ec84f5a742a9bf7d68d548370c734dc6 arm64: dts: rockchip: Add gmac phy reset GPIO to QNAP TS433
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/f8201d5b071e16b72238977851c23982c8a72114
+ f8201d5b071e16b72238977851c23982c8a72114 arm64: dts: rockchip: Correct gmac phy address on QNAP TS433

 https://gitlab.com/cki-project/kernel-ark/-/commit/889cf0727884fcc305faed0ff3278555fc63ad02
 889cf0727884fcc305faed0ff3278555fc63ad02 media: i2c: Add Omnivision OV02C10 sensor driver
--- a/kernel.changelog
+++ b/kernel.changelog
@ -1,5 +1,22 @@
 * Tue Jun 10 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.15.2-0]
 - Revert "drm/amd/display: more liberal vmin/vmax update for freesync" (Justin M. Forbes)
+- Linux v6.15.2
+Resolves: 
+
+* Wed Jun 04 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.15.1-0]
+- arm64: dts: rockchip: Drop assigned-clock* from cpu nodes on rk3588 (Diederik de Haas)
+- arm64: dts: rockchip: Improve LED config for NanoPi R5S (Diederik de Haas)
+- arm64: dts: rockchip: Move rk3568 PCIe3 MSI to use GIC ITS (Chukun Pan)
+- arm64: dts: rockchip: Update eMMC for NanoPi R5 series (Peter Robinson)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c (Peter Robinson)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-quartz64-b (Diederik de Haas)
+- arm64: dts: rockchip: Add phy-supply to gmac0 on NanoPi R5S (Diederik de Haas)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3588-rock-5b (Diederik de Haas)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-rockpro64 (Diederik de Haas)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3328-rock64 (Diederik de Haas)
+- arm64: dts: rockchip: Move SHMEM memory to reserved memory on rk3588 (Chukun Pan)
+- arm64: dts: rockchip: Add gmac phy reset GPIO to QNAP TS433 (Uwe Kleine-König)
+- arm64: dts: rockchip: Correct gmac phy address on QNAP TS433 (Uwe Kleine-König)
 - Reset build id for fedora-srpm script (Justin M. Forbes)
 - redhat/configs: Add configs for new ov02c10 and ov02e10 drivers (Hans de Goede)
 - media: i2c: Add Omnivision OV02C10 sensor driver (Heimir Thor Sverrisson)
@ -20,7 +37,7 @@
 - redhat: add downstream SBAT for UKI addons (Emanuele Giuseppe Esposito)
 - uki_addons: provide custom SBAT as input parameter (Emanuele Giuseppe Esposito)
 - uki_addons: remove completely sbat/sbat.conf (Emanuele Giuseppe Esposito)
- Linux v6.15.2
+- Linux v6.15.1
 Resolves: 

 * Mon May 26 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-60]
--- a/kernel.spec
+++ b/kernel.spec
@ -4263,6 +4263,22 @@ fi\
 %changelog
 * Tue Jun 10 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.15.2-0]
 - Revert "drm/amd/display: more liberal vmin/vmax update for freesync" (Justin M. Forbes)
+- Linux v6.15.2
+
+* Wed Jun 04 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.15.1-0]
+- arm64: dts: rockchip: Drop assigned-clock* from cpu nodes on rk3588 (Diederik de Haas)
+- arm64: dts: rockchip: Improve LED config for NanoPi R5S (Diederik de Haas)
+- arm64: dts: rockchip: Move rk3568 PCIe3 MSI to use GIC ITS (Chukun Pan)
+- arm64: dts: rockchip: Update eMMC for NanoPi R5 series (Peter Robinson)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c (Peter Robinson)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-quartz64-b (Diederik de Haas)
+- arm64: dts: rockchip: Add phy-supply to gmac0 on NanoPi R5S (Diederik de Haas)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3588-rock-5b (Diederik de Haas)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-rockpro64 (Diederik de Haas)
+- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3328-rock64 (Diederik de Haas)
+- arm64: dts: rockchip: Move SHMEM memory to reserved memory on rk3588 (Chukun Pan)
+- arm64: dts: rockchip: Add gmac phy reset GPIO to QNAP TS433 (Uwe Kleine-König)
+- arm64: dts: rockchip: Correct gmac phy address on QNAP TS433 (Uwe Kleine-König)
 - Reset build id for fedora-srpm script (Justin M. Forbes)
 - redhat/configs: Add configs for new ov02c10 and ov02e10 drivers (Hans de Goede)
 - media: i2c: Add Omnivision OV02C10 sensor driver (Heimir Thor Sverrisson)
@ -4283,7 +4299,7 @@ fi\
 - redhat: add downstream SBAT for UKI addons (Emanuele Giuseppe Esposito)
 - uki_addons: provide custom SBAT as input parameter (Emanuele Giuseppe Esposito)
 - uki_addons: remove completely sbat/sbat.conf (Emanuele Giuseppe Esposito)
- Linux v6.15.2
+- Linux v6.15.1

 * Mon May 26 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-60]
 - Consolidate configs to common for 6.15 (Justin M. Forbes)
--- a/patch-6.15-redhat.patch
+++ b/patch-6.15-redhat.patch
@ -2,6 +2,16 @@
 Makefile                                           |   40 +
 arch/arm/Kconfig                                   |    4 +-
 arch/arm64/Kconfig                                 |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |    1 +
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |    1 +
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts |    1 +
+ arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts    |    1 +
+ arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts |   19 +-
+ .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi |    5 +-
+ arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts |   15 +-
+ arch/arm64/boot/dts/rockchip/rk3568.dtsi           |    8 +-
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi      |   21 +-
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |    1 +
 arch/powerpc/include/uapi/asm/ioctls.h             |    8 +-
 arch/s390/include/asm/ipl.h                        |    1 +
 arch/s390/kernel/ipl.c                             |    5 +
@ -45,7 +55,7 @@
 security/integrity/platform_certs/load_uefi.c      |    6 +-
 security/lockdown/Kconfig                          |   13 +
 security/lockdown/lockdown.c                       |   11 +
- 47 files changed, 2682 insertions(+), 316 deletions(-)
+ 57 files changed, 2730 insertions(+), 341 deletions(-)

 diff --git a/MAINTAINERS b/MAINTAINERS
 index dd844ac8d910..dab2b4892122 100644
@ -169,6 +179,281 @@ index a182295e6f08..a3cfce882d26 100644
 	help
 	  For systems with 52-bit userspace VAs enabled, the kernel will attempt
 	  to maintain compatibility with older software by providing 48-bit VAs
+diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+index e550b6eeeff3..5367e5fa9232 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+@@ -343,6 +343,7 @@ flash@0 {
+ 
+ 		/* maximum speed for Rockchip SPI */
+ 		spi-max-frequency = <50000000>;
+		vcc-supply = <&vcc_io>;
+ 	};
+ };
+ 
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+index 51c6aa26d828..a7e4adf87e7a 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+@@ -850,6 +850,7 @@ flash@0 {
+ 		compatible = "jedec,spi-nor";
+ 		reg = <0>;
+ 		spi-max-frequency = <10000000>;
+		vcc-supply = <&vcc_3v0>;
+ 	};
+ };
+ 
+diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
+index 5707321a1144..f8cf03380636 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
+@@ -648,6 +648,7 @@ flash@0 {
+ 		spi-max-frequency = <24000000>;
+ 		spi-rx-bus-width = <4>;
+ 		spi-tx-bus-width = <1>;
+		vcc-supply = <&vcc_1v8>;
+ 	};
+ };
+ 
+diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts b/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts
+index 53e71528e4c4..6224d72813e5 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts
+@@ -636,6 +636,7 @@ flash@0 {
+ 		spi-max-frequency = <104000000>;
+ 		spi-rx-bus-width = <4>;
+ 		spi-tx-bus-width = <1>;
+		vcc-supply = <&vcc_1v8>;
+ 	};
+ };
+ 
+diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
+index b6ad8328c7eb..3b31f0dd8f3b 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
+@@ -20,33 +20,43 @@ aliases {
+ 	gpio-leds {
+ 		compatible = "gpio-leds";
+ 		pinctrl-names = "default";
+-		pinctrl-0 = <&lan1_led_pin>, <&lan2_led_pin>, <&power_led_pin>, <&wan_led_pin>;
+		pinctrl-0 = <&lan1_led_pin>, <&lan2_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
+ 
+ 		led-lan1 {
+ 			color = <LED_COLOR_ID_GREEN>;
+			default-state = "off";
+ 			function = LED_FUNCTION_LAN;
+ 			function-enumerator = <1>;
+ 			gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>;
+			label = "LAN-1";
+			linux,default-trigger = "netdev";
+ 		};
+ 
+ 		led-lan2 {
+ 			color = <LED_COLOR_ID_GREEN>;
+			default-state = "off";
+ 			function = LED_FUNCTION_LAN;
+ 			function-enumerator = <2>;
+ 			gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>;
+			label = "LAN-2";
+			linux,default-trigger = "netdev";
+ 		};
+ 
+-		power_led: led-power {
+		power_led: led-sys {
+ 			color = <LED_COLOR_ID_RED>;
+ 			function = LED_FUNCTION_POWER;
+-			linux,default-trigger = "heartbeat";
+ 			gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
+			label = "SYS";
+			linux,default-trigger = "heartbeat";
+ 		};
+ 
+ 		led-wan {
+ 			color = <LED_COLOR_ID_GREEN>;
+			default-state = "off";
+ 			function = LED_FUNCTION_WAN;
+ 			gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
+			label = "WAN";
+			linux,default-trigger = "netdev";
+ 		};
+ 	};
+ };
+@@ -58,6 +68,7 @@ &gmac0 {
+ 	clock_in_out = "output";
+ 	phy-handle = <&rgmii_phy0>;
+ 	phy-mode = "rgmii";
+	phy-supply = <&vcc_3v3>;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&gmac0_miim
+ 		     &gmac0_tx_bus2
+@@ -125,7 +136,7 @@ lan2_led_pin: lan2-led-pin {
+ 			rockchip,pins = <3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
+ 		};
+ 
+-		power_led_pin: power-led-pin {
+		sys_led_pin: sys-led-pin {
+ 			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+ 		};
+ 
+diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
+index 00c479aa1871..a28b4af10d13 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
+@@ -486,9 +486,12 @@ &saradc {
+ &sdhci {
+ 	bus-width = <8>;
+ 	max-frequency = <200000000>;
+	mmc-hs200-1_8v;
+ 	non-removable;
+ 	pinctrl-names = "default";
+-	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
+	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
+	vmmc-supply = <&vcc_3v3>;
+	vqmmc-supply = <&vcc_1v8>;
+ 	status = "okay";
+ };
+ 
+diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+index b80d628c426b..6ae4316761c4 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
+@@ -481,9 +481,14 @@ eeprom@56 {
+ };
+ 
+ &mdio0 {
+-	rgmii_phy0: ethernet-phy@0 {
+	rgmii_phy0: ethernet-phy@3 {
+		/* Motorcomm YT8521 phy */
+ 		compatible = "ethernet-phy-ieee802.3-c22";
+-		reg = <0x0>;
+		reg = <0x3>;
+		pinctrl-0 = <&eth_phy0_reset_pin>;
+		pinctrl-names = "default";
+		reset-assert-us = <10000>;
+		reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>;
+ 	};
+ };
+ 
+@@ -556,6 +561,12 @@ &pcie3x2 {
+ };
+ 
+ &pinctrl {
+	gmac0 {
+		eth_phy0_reset_pin: eth-phy0-reset-pin {
+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+ 	keys {
+ 		copy_button_pin: copy-button-pin {
+ 			rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
+diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+index 695cccbdab0f..e719a3df126c 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+@@ -152,7 +152,7 @@ pcie3x1: pcie@fe270000 {
+ 		compatible = "rockchip,rk3568-pcie";
+ 		#address-cells = <3>;
+ 		#size-cells = <2>;
+-		bus-range = <0x0 0xf>;
+		bus-range = <0x10 0x1f>;
+ 		clocks = <&cru ACLK_PCIE30X1_MST>, <&cru ACLK_PCIE30X1_SLV>,
+ 			 <&cru ACLK_PCIE30X1_DBI>, <&cru PCLK_PCIE30X1>,
+ 			 <&cru CLK_PCIE30X1_AUX_NDFT>;
+@@ -175,7 +175,7 @@ pcie3x1: pcie@fe270000 {
+ 		num-ib-windows = <6>;
+ 		num-ob-windows = <2>;
+ 		max-link-speed = <3>;
+-		msi-map = <0x0 &gic 0x1000 0x1000>;
+		msi-map = <0x1000 &its 0x1000 0x1000>;
+ 		num-lanes = <1>;
+ 		phys = <&pcie30phy>;
+ 		phy-names = "pcie-phy";
+@@ -205,7 +205,7 @@ pcie3x2: pcie@fe280000 {
+ 		compatible = "rockchip,rk3568-pcie";
+ 		#address-cells = <3>;
+ 		#size-cells = <2>;
+-		bus-range = <0x0 0xf>;
+		bus-range = <0x20 0x2f>;
+ 		clocks = <&cru ACLK_PCIE30X2_MST>, <&cru ACLK_PCIE30X2_SLV>,
+ 			 <&cru ACLK_PCIE30X2_DBI>, <&cru PCLK_PCIE30X2>,
+ 			 <&cru CLK_PCIE30X2_AUX_NDFT>;
+@@ -228,7 +228,7 @@ pcie3x2: pcie@fe280000 {
+ 		num-ib-windows = <6>;
+ 		num-ob-windows = <2>;
+ 		max-link-speed = <3>;
+-		msi-map = <0x0 &gic 0x2000 0x1000>;
+		msi-map = <0x2000 &its 0x2000 0x1000>;
+ 		num-lanes = <2>;
+ 		phys = <&pcie30phy>;
+ 		phy-names = "pcie-phy";
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+index 1e18ad93ba0e..5d8b96384856 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+@@ -95,8 +95,6 @@ cpu_l0: cpu@0 {
+ 			enable-method = "psci";
+ 			capacity-dmips-mhz = <530>;
+ 			clocks = <&scmi_clk SCMI_CLK_CPUL>;
+-			assigned-clocks = <&scmi_clk SCMI_CLK_CPUL>;
+-			assigned-clock-rates = <816000000>;
+ 			cpu-idle-states = <&CPU_SLEEP>;
+ 			i-cache-size = <32768>;
+ 			i-cache-line-size = <64>;
+@@ -173,8 +171,6 @@ cpu_b0: cpu@400 {
+ 			enable-method = "psci";
+ 			capacity-dmips-mhz = <1024>;
+ 			clocks = <&scmi_clk SCMI_CLK_CPUB01>;
+-			assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>;
+-			assigned-clock-rates = <816000000>;
+ 			cpu-idle-states = <&CPU_SLEEP>;
+ 			i-cache-size = <65536>;
+ 			i-cache-line-size = <64>;
+@@ -213,8 +209,6 @@ cpu_b2: cpu@600 {
+ 			enable-method = "psci";
+ 			capacity-dmips-mhz = <1024>;
+ 			clocks = <&scmi_clk SCMI_CLK_CPUB23>;
+-			assigned-clocks = <&scmi_clk SCMI_CLK_CPUB23>;
+-			assigned-clock-rates = <816000000>;
+ 			cpu-idle-states = <&CPU_SLEEP>;
+ 			i-cache-size = <65536>;
+ 			i-cache-line-size = <64>;
+@@ -439,16 +433,15 @@ xin32k: clock-2 {
+ 		#clock-cells = <0>;
+ 	};
+ 
+-	pmu_sram: sram@10f000 {
+-		compatible = "mmio-sram";
+-		reg = <0x0 0x0010f000 0x0 0x100>;
+-		ranges = <0 0x0 0x0010f000 0x100>;
+-		#address-cells = <1>;
+-		#size-cells = <1>;
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+ 
+-		scmi_shmem: sram@0 {
+		scmi_shmem: shmem@10f000 {
+ 			compatible = "arm,scmi-shmem";
+-			reg = <0x0 0x100>;
+			reg = <0x0 0x0010f000 0x0 0x100>;
+			no-map;
+ 		};
+ 	};
+ 
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+index d22068475c5d..17f4fd054cd3 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+@@ -562,6 +562,7 @@ flash@0 {
+ 		spi-max-frequency = <104000000>;
+ 		spi-rx-bus-width = <4>;
+ 		spi-tx-bus-width = <1>;
+		vcc-supply = <&vcc_3v3_s3>;
+ 	};
+ };
+ 
 diff --git a/arch/powerpc/include/uapi/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h
 index 2c145da3b774..b5211e413829 100644
 --- a/arch/powerpc/include/uapi/asm/ioctls.h
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 SHA512 (linux-6.15.2.tar.xz) = 3b2f701bafcb336d412a6c99c4651191edec506e6c406efe3780fba09f10b3a5b9bd4469870cf59e2a66ae4545f9ea07a57480660ebfd3c378c4da7c5b9a9fbf
-SHA512 (kernel-abi-stablelists-6.15.2.tar.xz) = d89cbc60ccd58906f0e88cd9a1911269439b8899a8f13ee80349f70183f6187f77e34ca39033c003e77a38ef1bb73b78eb80911bdca6c5b8297a01a28f5674d7
+SHA512 (kernel-abi-stablelists-6.15.2.tar.xz) = c6f904165e21796c5e987e5af3bcfc3bf12456a0510568f6d2a1daf3ffc735a60a2cb13ca4449bb31f2df3687275451336ecd468516b21598c6671d35596379d
 SHA512 (kernel-kabi-dw-6.15.2.tar.xz) = 5fa391a89c61ceff78a1d6d18bfa6f3506d402cdc346b4d792a87f1a5910c8c7081b4770ffabd5ec06128fcc849fb19ebcc0efd3b8dc10fb49a498c11a8a3c98