Skip to contentSkip to conversation

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

PATCH New Sudeep Holla 2 participants 2 messages Feb 8, 2016 – Feb 11, 2016 Device tree bindings

lore
Share & tools
lore
#0 lore raw

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

Commit 3efda00129bd ("ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property") replaces all the legacy "gpio-key,wakeup" with the unified "wakeup-source" property to prevent any further copy-paste duplication.

However couple of use of these legacy property sneaked in during the merge window. This patch replaces them too.

Cc "Beno?t Cousson" <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc linux-omap at vger.kernel.org
---
 arch/arm/boot/dts/am335x-shc.dts          | 4 ++--
 arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Hi Tony,

I see these files got introduced during v4.5 merge window and we could not stop the copy-paste from the earlier versions files from which they were copied.

Regards,
Sudeep

arch/arm/boot/dts/am335x-shc.dts +2 -2
index 1b5b044fcd91..865de8500f1c 100644
@@ -46,7 +46,7 @@
 			gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_BACK>;
 			debounce-interval = <1000>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		front_button {
@@ -54,7 +54,7 @@
 			gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_FRONT>;
 			debounce-interval = <1000>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
arch/arm/boot/dts/am57xx-cl-som-am57x.dts +1 -1
index c53882643ae9..497eb07ced19 100644
@@ -545,7 +545,7 @@
 		ti,debounce-tol = /bits/ 16 <10>;
 		ti,debounce-rep = /bits/ 16 <1>;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
Signature · 1 line
1.9.1
#1 lore raw

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

Quoted 17 lines · Sudeep Holla

Commit 3efda00129bd ("ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property") replaces all the legacy "gpio-key,wakeup" with the unified "wakeup-source" property to prevent any further copy-paste duplication.

However couple of use of these legacy property sneaked in during the merge window. This patch replaces them too.

Cc "Beno?t Cousson" <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc linux-omap at vger.kernel.org
---
 arch/arm/boot/dts/am335x-shc.dts          | 4 ++--
 arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Quoted 5 lines

Hi Tony,

I see these files got introduced during v4.5 merge window and we could not stop the copy-paste from the earlier versions files from which they were copied.

OK thanks for checking, applying this into omap-for-v4.5/fixes.

Regards,

Tony

Quoted 38 lines
arch/arm/boot/dts/am335x-shc.dts +2 -2
index 1b5b044fcd91..865de8500f1c 100644
@@ -46,7 +46,7 @@
 			gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_BACK>;
 			debounce-interval = <1000>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		front_button {
@@ -54,7 +54,7 @@
 			gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_FRONT>;
 			debounce-interval = <1000>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
arch/arm/boot/dts/am57xx-cl-som-am57x.dts +1 -1
index c53882643ae9..497eb07ced19 100644
@@ -545,7 +545,7 @@
 		ti,debounce-tol = /bits/ 16 <10>;
 		ti,debounce-rep = /bits/ 16 <1>;
 
-		linux,wakeup;
+		wakeup-source;
 	};
 };
 
Signature · 1 line
1.9.1