Patch "ARM: dts: stm32: Fix TA3-GPIO-C key on STM32MP1 DHCOM PDK2" has been added to the 5.9-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ARM: dts: stm32: Fix TA3-GPIO-C key on STM32MP1 DHCOM PDK2

to the 5.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-dts-stm32-fix-ta3-gpio-c-key-on-stm32mp1-dhcom-p.patch
and it can be found in the queue-5.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 76dc2697b180366d29fd2e35dae4f8110bad2a53
Author: Marek Vasut <marex@xxxxxxx>
Date:   Thu Oct 8 21:35:38 2020 +0200

    ARM: dts: stm32: Fix TA3-GPIO-C key on STM32MP1 DHCOM PDK2
    
    [ Upstream commit 52d9edbe6efc5042cf57fae6a25d07572ddf398b ]
    
    On the prototype DHCOM, the TA3-GPIO-C button was connected to pin PI11 of
    the STM32MP15xx, however on the production SoM this was changed to pin PG0
    to free up the IRQ line 11 for LAN8710i PHY IRQ. Update the connection in
    the DT. Since the IRQ line 0 is used for PMIC as well and cannot be shared
    with the button, make the button polled.
    
    Fixes: 87cabf9405cb ("ARM: dts: stm32: Add GPIO keys for STM32MP1 DHCOM PDK2")
    Signed-off-by: Marek Vasut <marex@xxxxxxx>
    Cc: Alexandre Torgue <alexandre.torgue@xxxxxx>
    Cc: Maxime Coquelin <mcoquelin.stm32@xxxxxxxxx>
    Cc: Patrice Chotard <patrice.chotard@xxxxxx>
    Cc: Patrick Delaunay <patrick.delaunay@xxxxxx>
    Cc: linux-stm32@xxxxxxxxxxxxxxxxxxxxxxxxxxxx
    To: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
    Signed-off-by: Alexandre Torgue <alexandre.torgue@xxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
index e4e3c92eb30d3..7cddeb1a545a3 100644
--- a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
@@ -46,6 +46,16 @@
 			linux,code = <KEY_A>;
 			gpios = <&gpiof 3 GPIO_ACTIVE_LOW>;
 		};
+
+		/*
+		 * The EXTi IRQ line 0 is shared with PMIC,
+		 * so mark this as polled GPIO key.
+		 */
+		button-2 {
+			label = "TA3-GPIO-C";
+			linux,code = <KEY_C>;
+			gpios = <&gpiog 0 GPIO_ACTIVE_LOW>;
+		};
 	};
 
 	gpio-keys {
@@ -59,13 +69,6 @@
 			wakeup-source;
 		};
 
-		button-2 {
-			label = "TA3-GPIO-C";
-			linux,code = <KEY_C>;
-			gpios = <&gpioi 11 GPIO_ACTIVE_LOW>;
-			wakeup-source;
-		};
-
 		button-3 {
 			label = "TA4-GPIO-D";
 			linux,code = <KEY_D>;