From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 26 May 2023 16:44:38 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: review~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57ed84b52ff9af2eefe76f60b8c6eca750349997;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	arm-dts-stm32-fix-av96-board-sai2-pin-muxing-on-stm32mp15.patch
---

diff --git a/queue-5.15/arm-dts-stm32-fix-av96-board-sai2-pin-muxing-on-stm32mp15.patch b/queue-5.15/arm-dts-stm32-fix-av96-board-sai2-pin-muxing-on-stm32mp15.patch
new file mode 100644
index 00000000000..1eb750862c5
--- /dev/null
+++ b/queue-5.15/arm-dts-stm32-fix-av96-board-sai2-pin-muxing-on-stm32mp15.patch
@@ -0,0 +1,33 @@
+From ee2aacb6f3a901a95b1dd68964b69c92cdbbf213 Mon Sep 17 00:00:00 2001
+From: Olivier Moysan <olivier.moysan@foss.st.com>
+Date: Mon, 24 Jan 2022 16:35:25 +0100
+Subject: ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
+
+From: Olivier Moysan <olivier.moysan@foss.st.com>
+
+commit ee2aacb6f3a901a95b1dd68964b69c92cdbbf213 upstream.
+
+Replace sai2a-2 node name by sai2a-sleep-2, to avoid name
+duplication.
+
+Fixes: 1a9a9d226f0f ("ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15")
+
+Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
+Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
+Cc: Marek Vasut <marex@denx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/stm32mp15-pinctrl.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
++++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+@@ -1190,7 +1190,7 @@
+ 		};
+ 	};
+ 
+-	sai2a_sleep_pins_c: sai2a-2 {
++	sai2a_sleep_pins_c: sai2a-sleep-2 {
+ 		pins {
+ 			pinmux = <STM32_PINMUX('D', 13, ANALOG)>, /* SAI2_SCK_A */
+ 				 <STM32_PINMUX('D', 11, ANALOG)>, /* SAI2_SD_A */
diff --git a/queue-5.15/series b/queue-5.15/series
index 6469057fab6..479615587be 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -3,3 +3,4 @@ usb-dwc3-fix-gadget-mode-suspend-interrupt-handler-i.patch
 dt-bindings-ata-ahci-ceva-convert-to-yaml.patch
 dt-bindings-ata-ahci-ceva-cover-all-4-iommus-entries.patch
 watchdog-sp5100_tco-immediately-trigger-upon-starting.patch
+arm-dts-stm32-fix-av96-board-sai2-pin-muxing-on-stm32mp15.patch