Skip to contentSkip to conversation

ARM/arm64: apalis/colibri-imx6/6ull/7/verdin-imx8mp: gpio-key node names

PATCH Applied Marcel Ziswiler 2 participants 6 messages Jan 9, 2023 – Jan 26, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ARM/arm64: apalis/colibri-imx6/6ull/7/verdin-imx8mp: gpio-key node names

From: Marcel Ziswiler <[email protected]>

This series unifies/fixes wakeup gpio-key node names across all Toradex modules. And yes, the Tegra-based Apalis/Colibri T20/T30/TK1 already look good (;-p).

Marcel Ziswiler (4):
ARM: dts: colibri-imx6: improve wake-up with gpio key
ARM: dts: colibri-imx6ull: improve wake-up with gpio key
ARM: dts: apalis/colibri-imx6/6ull/7: proper gpio-key node names
arm64: dts: verdin-imx8mp: unify gpio-key node name

 arch/arm/boot/dts/imx6qdl-apalis.dtsi            | 2 +-
 arch/arm/boot/dts/imx6qdl-colibri.dtsi           | 4 ++--
 arch/arm/boot/dts/imx6ull-colibri.dtsi           | 4 ++--
 arch/arm/boot/dts/imx7-colibri.dtsi              | 2 +-
 arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/4 ARM: dts: colibri-imx6: improve wake-up with gpio key

From: Marcel Ziswiler <[email protected]>

The pin GPIO2_IO22 externally pulls down, it is required to sequentially connect this pin (signal WAKE_MICO#) to +3v3 and then disconnect it to trigger a wakeup interrupt.
Adding the flag GPIO_PULL_DOWN allows the system to be woken up just connecting the pin GPIO2_IO22 to +3v3.

---

 arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6qdl-colibri.dtsi +1 -1
index d8f985f297e4..9abce6bc6dd4 100644
@@ -38,7 +38,7 @@ gpio-keys {
 
 		wakeup {
 			debounce-interval = <10>;
-			gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */
+			gpios = <&gpio2 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 */
 			label = "Wake-Up";
 			linux,code = <KEY_WAKEUP>;
 			wakeup-source;
Signature · 1 line
2.35.1
#2 lore raw

PATCH 2/4 ARM: dts: colibri-imx6ull: improve wake-up with gpio key

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

The pin GPIO5_IO01 externally pulls down, it is required to sequentially connect this pin (signal WAKE_MICO#) to +3v3 and then disconnect it to trigger a wakeup interrupt.
Adding the flag GPIO_PULL_DOWN allows the system to be woken up just connecting the pin GPIO5_IO01 to +3v3.

---

 arch/arm/boot/dts/imx6ull-colibri.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6ull-colibri.dtsi +1 -1
index 336ab2e0534c..368d11ae7a8a 100644
@@ -53,7 +53,7 @@ gpio-keys {
 
 		wakeup {
 			debounce-interval = <10>;
-			gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */
+			gpios = <&gpio5 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 */
 			label = "Wake-Up";
 			linux,code = <KEY_WAKEUP>;
 			wakeup-source;
Signature · 1 line
2.35.1
#3 lore raw

PATCH 3/4 ARM: dts: apalis/colibri-imx6/6ull/7: proper gpio-key node names

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

The node names should be generic and DT schema expects certain pattern (e.g. starting with key/button/switch).

---

 arch/arm/boot/dts/imx6qdl-apalis.dtsi  | 2 +-
 arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +-
 arch/arm/boot/dts/imx6ull-colibri.dtsi | 2 +-
 arch/arm/boot/dts/imx7-colibri.dtsi    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +1 -1
index 7c17b91f0965..bb9aa5b7f03d 100644
@@ -41,7 +41,7 @@ gpio-keys {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_keys>;
 
-		wakeup {
+		key-wakeup {
 			debounce-interval = <10>;
 			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 			label = "Wake-Up";
arch/arm/boot/dts/imx6qdl-colibri.dtsi +1 -1
index 9abce6bc6dd4..5c647339f8d0 100644
@@ -36,7 +36,7 @@ gpio-keys {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_keys>;
 
-		wakeup {
+		key-wakeup {
 			debounce-interval = <10>;
 			gpios = <&gpio2 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 */
 			label = "Wake-Up";
arch/arm/boot/dts/imx6ull-colibri.dtsi +1 -1
index 368d11ae7a8a..bf64ba84b358 100644
@@ -51,7 +51,7 @@ gpio-keys {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_snvs_gpiokeys>;
 
-		wakeup {
+		key-wakeup {
 			debounce-interval = <10>;
 			gpios = <&gpio5 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 */
 			label = "Wake-Up";
arch/arm/boot/dts/imx7-colibri.dtsi +1 -1
index f8b8372b6851..104580d51d74 100644
@@ -39,7 +39,7 @@ gpio-keys {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpiokeys>;
 
-		wakeup {
+		key-wakeup {
 			debounce-interval = <10>;
 			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 */
 			label = "Wake-Up";
Signature · 1 line
2.35.1
#4 lore raw

PATCH 4/4 arm64: dts: verdin-imx8mp: unify gpio-key node name

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Any other of our modules calls it key-wakeup rather than button-wakeup so let us stick to that.

---

 arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +1 -1
index 6a1890a4b5d8..0e183c9757f6 100644
@@ -50,7 +50,7 @@ gpio-keys {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_keys>;
 
-		button-wakeup {
+		key-wakeup {
 			debounce-interval = <10>;
 			/* Verdin CTRL_WAKE1_MICO# (SODIMM 252) */
 			gpios = <&gpio4 0 GPIO_ACTIVE_LOW>;
Signature · 1 line
2.35.1
Applied
#5 lore raw
In reply to Marcel Ziswiler
Quoted 8 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This series unifies/fixes wakeup gpio-key node names across all Toradex modules. And yes, the Tegra-based Apalis/Colibri T20/T30/TK1 already look good (;-p).

Quoted 5 lines

Marcel Ziswiler (4):
ARM: dts: colibri-imx6: improve wake-up with gpio key
ARM: dts: colibri-imx6ull: improve wake-up with gpio key
ARM: dts: apalis/colibri-imx6/6ull/7: proper gpio-key node names
arm64: dts: verdin-imx8mp: unify gpio-key node name

Applied all, thanks!