Skip to contentSkip to conversation

ARM: dts: replace gpio-key, wakeup with wakeup-source property

PATCH New Sudeep Holla 5 participants 9 messages Oct 24, 2018 – Nov 5, 2018

Subsystems (4)
Device tree bindings Arm i.MX and Layerscape Arm/Microchip (AT91) SoC support Arm/Zynq architecture
lore
Share & tools
lore

Sudeep Holla

author
#0 lore raw

PATCH 1/1 ARM: dts: replace gpio-key, wakeup with wakeup-source property

Most of the legacy "gpio-key,wakeup" and "enable-sdio-wakeup" boolean properties are already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Cc Nicolas Ferre <[email protected]>
Cc Alexandre Belloni <[email protected]>
Cc Peter Rosin <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Michal Simek <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
 arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 2 +-
 arch/arm/boot/dts/at91-wb45n.dts            | 2 +-
 arch/arm/boot/dts/at91-wb50n.dts            | 4 ++--
 arch/arm/boot/dts/imx6q-pistachio.dts       | 2 +-
 arch/arm/boot/dts/imx6sll-evk.dts           | 2 +-
 arch/arm/boot/dts/zynq-zturn.dts            | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

Hi all,

If possible and if ARM SoC agrees, I would prefer to keep this as simple one patch instead of splitting into 3 different once and push as a fix.

Regards,
Sudeep

arch/arm/boot/dts/at91-nattis-2-natte-2.dts +1 -1
index af9f38456d04..375f54010b79 100644
@@ -62,7 +62,7 @@
 		wakeup {
 			label = "Wakeup";
 			linux,code = <10>;
-			gpio-key,wakeup;
+			wakeup-source;
 			gpios = <&pioB 27 GPIO_ACTIVE_LOW>;
 		};
 	};
arch/arm/boot/dts/at91-wb45n.dts +1 -1
index 5b9512a6c89c..54d130c92185 100644
@@ -22,7 +22,7 @@
 			label = "IRQBTN";
 			linux,code = <99>;
 			gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 		};
 	};
 };
arch/arm/boot/dts/at91-wb50n.dts +2 -2
index 8cecc7051a86..a5e45bb95c04 100644
@@ -23,7 +23,7 @@
 			label = "BTNESC";
 			linux,code = <1>; /* ESC button */
 			gpios = <&pioA 10 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 		};
 
 		irqbtn at 31 {

@@ -31,7 +31,7 @@
 			label = "IRQBTN";
 			linux,code = <99>; /* SysReq button */
 			gpios = <&pioE 31 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/imx6q-pistachio.dts +1 -1
index a31e83cd07a3..8f4b60dd819c 100644
@@ -102,7 +102,7 @@
 		power {
 			label = "Power Button";
 			gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup;
+			wakeup-source;
 			linux,code = <KEY_POWER>;
 		};
 	};
arch/arm/boot/dts/imx6sll-evk.dts +1 -1
index c8e115564ba2..30b5d63ed319 100644
@@ -296,7 +296,7 @@
 	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
 	cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	vmmc-supply = <&reg_sd3_vmmc>;
 	status = "okay";
 };
arch/arm/boot/dts/zynq-zturn.dts +1 -1
index b38704657960..5ec616ebca08 100644
@@ -54,7 +54,7 @@
 			label = "K1";
 			gpios = <&gpio0 0x32 0x1>;
 			linux,code = <0x66>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};

--
2.17.1

author
#1 lore raw

PATCH 1/1 arm64: dts: zynqmp: replace gpio-key, wakeup with wakeup-source property

Most of the legacy "gpio-key,wakeup" boolean property is already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Cc Michal Simek <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
 arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +1 -1
index eb5e8bddb610..527b4d0f88e2 100644
@@ -49,7 +49,7 @@
 			label = "sw4";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +1 -1
index 25dd57485323..0397bf66b2e7 100644
@@ -46,7 +46,7 @@
 			label = "sw19";
 			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_DOWN>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +1 -1
index 259f21b0c001..7238f022a671 100644
@@ -46,7 +46,7 @@
 			label = "sw19";
 			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_DOWN>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +1 -1
index a61b3cc6f4c9..fa055e718d4b 100644
@@ -46,7 +46,7 @@
 			label = "sw19";
 			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_DOWN>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};

--
2.17.1

Applied
#2 lore raw

PATCH 1/1 arm64: dts: zynqmp: replace gpio-key,wakeup with wakeup-source property

Quoted 69 lines · Sudeep Holla

Most of the legacy "gpio-key,wakeup" boolean property is already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Cc Michal Simek <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
 arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +1 -1
index eb5e8bddb610..527b4d0f88e2 100644
@@ -49,7 +49,7 @@
 			label = "sw4";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +1 -1
index 25dd57485323..0397bf66b2e7 100644
@@ -46,7 +46,7 @@
 			label = "sw19";
 			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_DOWN>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +1 -1
index 259f21b0c001..7238f022a671 100644
@@ -46,7 +46,7 @@
 			label = "sw19";
 			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_DOWN>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +1 -2
index a61b3cc6f4c9..fa055e718d4b 100644
@@ -46,7 +46,7 @@
 			label = "sw19";
 			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_DOWN>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};
--
Quoted 3 lines

2.17.1

Will be good to point to 700a38b27eefc which introduced but that's fine.

Applied.

Thanks,
Michal

author
#3 lore raw

PATCH 1/1 arm64: dts: zynqmp: replace gpio-key,wakeup with wakeup-source property

Quoted 11 lines · Michal Simek
Quoted 7 lines · Sudeep Holla

Most of the legacy "gpio-key,wakeup" boolean property is already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Will be good to point to 700a38b27eefc which introduced but that's fine.

If you prefer, you can add the reference as you have already applied. I am fine with that. Are you fine with 32-bit change ? I have posted single patch covering multiple platforms so that I can ask ARM SoC to pick it. If you can Ack it, I will ask them to pick directly.

Signature · 2 lines
Regards,
Sudeep
#4 lore raw

PATCH 1/1 arm64: dts: zynqmp: replace gpio-key,wakeup with wakeup-source property

Quoted 13 lines · Sudeep Holla
Quoted 9 lines · Michal Simek
Quoted 7 lines · Sudeep Holla

Most of the legacy "gpio-key,wakeup" boolean property is already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Quoted 8 lines
Quoted 2 lines

Will be good to point to 700a38b27eefc which introduced but that's fine.

If you prefer, you can add the reference as you have already applied. I am fine with that. Are you fine with 32-bit change ? I have posted single patch covering multiple platforms so that I can ask ARM SoC to pick it. If you can Ack it, I will ask them to pick directly.

32bit version should go directly via arm-soc guys. I have sent you my review. Also I have updated that commit message to match with sha1 above.

Thanks,
Michal

maintainer
#5 lore raw

PATCH 1/1 ARM: dts: replace gpio-key,wakeup with wakeup-source property

In reply to Sudeep Holla
Quoted 8 lines · Sudeep Holla

Most of the legacy "gpio-key,wakeup" and "enable-sdio-wakeup" boolean properties are already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Quoted 8 lines
Cc Nicolas Ferre <[email protected]>
Cc Alexandre Belloni <[email protected]>
Cc Peter Rosin <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Michal Simek <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
Acked-by Alexandre Belloni <[email protected]>
Quoted 108 lines
---
 arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 2 +-
 arch/arm/boot/dts/at91-wb45n.dts            | 2 +-
 arch/arm/boot/dts/at91-wb50n.dts            | 4 ++--
 arch/arm/boot/dts/imx6q-pistachio.dts       | 2 +-
 arch/arm/boot/dts/imx6sll-evk.dts           | 2 +-
 arch/arm/boot/dts/zynq-zturn.dts            | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

Hi all,

If possible and if ARM SoC agrees, I would prefer to keep this as simple one patch instead of splitting into 3 different once and push as a fix.

Regards,
Sudeep

arch/arm/boot/dts/at91-nattis-2-natte-2.dts +1 -1
index af9f38456d04..375f54010b79 100644
@@ -62,7 +62,7 @@
 		wakeup {
 			label = "Wakeup";
 			linux,code = <10>;
-			gpio-key,wakeup;
+			wakeup-source;
 			gpios = <&pioB 27 GPIO_ACTIVE_LOW>;
 		};
 	};
arch/arm/boot/dts/at91-wb45n.dts +1 -1
index 5b9512a6c89c..54d130c92185 100644
@@ -22,7 +22,7 @@
 			label = "IRQBTN";
 			linux,code = <99>;
 			gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 		};
 	};
 };
arch/arm/boot/dts/at91-wb50n.dts +2 -2
index 8cecc7051a86..a5e45bb95c04 100644
@@ -23,7 +23,7 @@
 			label = "BTNESC";
 			linux,code = <1>; /* ESC button */
 			gpios = <&pioA 10 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 		};
 
 		irqbtn at 31 {

@@ -31,7 +31,7 @@
 			label = "IRQBTN";
 			linux,code = <99>; /* SysReq button */
 			gpios = <&pioE 31 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup = <1>;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/imx6q-pistachio.dts +1 -1
index a31e83cd07a3..8f4b60dd819c 100644
@@ -102,7 +102,7 @@
 		power {
 			label = "Power Button";
 			gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup;
+			wakeup-source;
 			linux,code = <KEY_POWER>;
 		};
 	};
arch/arm/boot/dts/imx6sll-evk.dts +1 -1
index c8e115564ba2..30b5d63ed319 100644
@@ -296,7 +296,7 @@
 	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
 	cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	vmmc-supply = <&reg_sd3_vmmc>;
 	status = "okay";
 };
arch/arm/boot/dts/zynq-zturn.dts +1 -2
index b38704657960..5ec616ebca08 100644
@@ -54,7 +54,7 @@
 			label = "K1";
 			gpios = <&gpio0 0x32 0x1>;
 			linux,code = <0x66>;
-			gpio-key,wakeup;
+			wakeup-source;
 			autorepeat;
 		};
 	};
--

2.17.1

Signature · 3 lines
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
reviewer
#6 lore raw

PATCH 1/1 ARM: dts: replace gpio-key, wakeup with wakeup-source property

In reply to Sudeep Holla
Quoted 9 lines · Sudeep Holla

Most of the legacy "gpio-key,wakeup" and "enable-sdio-wakeup" boolean properties are already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Quoted 8 lines
Cc Nicolas Ferre <[email protected]>
Cc Alexandre Belloni <[email protected]>
Cc Peter Rosin <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Michal Simek <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
Reviewed-by Fabio Estevam <[email protected]>
#7 lore raw

PATCH 1/1 ARM: dts: replace gpio-key,wakeup with wakeup-source property

In reply to Sudeep Holla
Quoted 8 lines · Sudeep Holla

Most of the legacy "gpio-key,wakeup" and "enable-sdio-wakeup" boolean properties are already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Quoted 8 lines
Cc Nicolas Ferre <[email protected]>
Cc Alexandre Belloni <[email protected]>
Cc Peter Rosin <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Michal Simek <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
Acked-by Peter Rosin <[email protected]>

Cheers,
Peter

#8 lore raw

PATCH 1/1 ARM: dts: replace gpio-key,wakeup with wakeup-source property

In reply to Sudeep Holla
Quoted 16 lines · Sudeep Holla

Most of the legacy "gpio-key,wakeup" and "enable-sdio-wakeup" boolean properties are already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.

This patch replaces the legacy properties with the unified "wakeup-source" property.

Cc Nicolas Ferre <[email protected]>
Cc Alexandre Belloni <[email protected]>
Cc Peter Rosin <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Michal Simek <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
Quoted 7 lines
---
 arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 2 +-
 arch/arm/boot/dts/at91-wb45n.dts            | 2 +-
 arch/arm/boot/dts/at91-wb50n.dts            | 4 ++--
 arch/arm/boot/dts/imx6q-pistachio.dts       | 2 +-
 arch/arm/boot/dts/imx6sll-evk.dts           | 2 +-
 arch/arm/boot/dts/zynq-zturn.dts            | 2 +-
Reviewed-by Michal Simek <[email protected]>

Thanks,
Michal