From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 28 May 2023 17:35:13 +0000 (+0100)
Subject: 6.3-stable patches
X-Git-Tag: review
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f4f9f392bf23fcde2bd81e62e8bfde81219e82f;p=thirdparty%2Fkernel%2Fstable-queue.git

6.3-stable patches

added patches:
	revert-arm64-dts-imx8mp-drop-simple-bus-from-fsl-imx8mp-media-blk-ctrl.patch
---

diff --git a/queue-6.3/revert-arm64-dts-imx8mp-drop-simple-bus-from-fsl-imx8mp-media-blk-ctrl.patch b/queue-6.3/revert-arm64-dts-imx8mp-drop-simple-bus-from-fsl-imx8mp-media-blk-ctrl.patch
new file mode 100644
index 00000000000..a7d73f1453c
--- /dev/null
+++ b/queue-6.3/revert-arm64-dts-imx8mp-drop-simple-bus-from-fsl-imx8mp-media-blk-ctrl.patch
@@ -0,0 +1,42 @@
+From 9f221454c71ab8d0d80d53526d2d71b0f664e65a Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sun, 28 May 2023 18:33:06 +0100
+Subject: Revert "arm64: dts: imx8mp: Drop simple-bus from fsl,imx8mp-media-blk-ctrl"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit bd2573ee0f91c0e6d2bee8599110453e2909060e which is
+commit 5a51e1f2b083423f75145c512ee284862ab33854 upstream.
+
+Marc writes:
+	can you please revert this patch, without the corresponding driver patch
+	[1] it breaks probing of the device, as no one populates the sub-nodes.
+
+	[1] 9cb6d1b39a8f ("soc: imx: imx8m-blk-ctrl: Scan subnodes and bind
+	drivers to them")
+
+Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Link: https://lore.kernel.org/r/20230523-justly-situated-317e792f4c1b-mkl@pengutronix.de
+Cc: Alexander Stein <alexander.stein@ew.tq-group.com>
+Cc: Liu Ying <victor.liu@nxp.com>
+Cc: Alexander Stein <alexander.stein@ew.tq-group.com>
+Cc: Marek Vasut <marex@denx.de>
+Cc: Shawn Guo <shawnguo@kernel.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+@@ -1151,7 +1151,7 @@
+ 
+ 			media_blk_ctrl: blk-ctrl@32ec0000 {
+ 				compatible = "fsl,imx8mp-media-blk-ctrl",
+-					     "syscon";
++					     "simple-bus", "syscon";
+ 				reg = <0x32ec0000 0x10000>;
+ 				#address-cells = <1>;
+ 				#size-cells = <1>;
diff --git a/queue-6.3/series b/queue-6.3/series
index accc8636f6c..0810d4fcbb1 100644
--- a/queue-6.3/series
+++ b/queue-6.3/series
@@ -124,3 +124,4 @@ net-smc-reset-connection-when-trying-to-use-smcrv2-fails.patch
 page_pool-fix-inconsistency-for-page_pool_ring_lock.patch
 net-ethernet-mtk_eth_soc-fix-qos-on-dsa-mac-on-non-mtk_netsys_v2-socs.patch
 net-phy-mscc-add-vsc8502-to-module_device_table.patch
+revert-arm64-dts-imx8mp-drop-simple-bus-from-fsl-imx8mp-media-blk-ctrl.patch