Skip to contentSkip to conversation

ARM: dts: tegra: replace legacy *, wakeup property with wakeup-source

PATCH New Sudeep Holla 2 participants 3 messages Feb 8, 2016 – Feb 16, 2016

Subsystems (2)
Device tree bindings Tegra architecture support
lore
Share & tools
lore

Sudeep Holla

author
#0 lore raw

PATCH 1/1 ARM: dts: tegra: replace legacy *, wakeup property with wakeup-source

Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "nvidia,wakeup-source" boolean property to enable the wakeup source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified "wakeup-source" property in order to avoid any further copy-paste duplication.

Cc Stephen Warren <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Alexandre Courbot <[email protected]>
Cc linux-tegra at vger.kernel.org
Signed-off-by Sudeep Holla <[email protected]>
---
 arch/arm/boot/dts/tegra114-dalmore.dts         | 2 +-
 arch/arm/boot/dts/tegra114-roth.dts            | 2 +-
 arch/arm/boot/dts/tegra114-tn7.dts             | 2 +-
 arch/arm/boot/dts/tegra124-jetson-tk1.dts      | 2 +-
 arch/arm/boot/dts/tegra124-nyan.dtsi           | 4 ++--
 arch/arm/boot/dts/tegra124-venice2.dts         | 2 +-
 arch/arm/boot/dts/tegra20-harmony.dts          | 2 +-
 arch/arm/boot/dts/tegra20-paz00.dts            | 2 +-
 arch/arm/boot/dts/tegra20-seaboard.dts         | 4 ++--
 arch/arm/boot/dts/tegra20-trimslice.dts        | 2 +-
 arch/arm/boot/dts/tegra20-ventana.dts          | 2 +-
 arch/arm/boot/dts/tegra20-whistler.dts         | 2 +-
 arch/arm/boot/dts/tegra30-apalis-eval.dts      | 2 +-
 arch/arm/boot/dts/tegra30-cardhu.dtsi          | 2 +-
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts  | 2 +-
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 ++--
 16 files changed, 19 insertions(+), 19 deletions(-)

Hi Thierry/Stephen,

Most of the other platform/SoC maintainers preferred to take it via their tree and few of these got missed during v4.5 merge window. Can you take it via your tree for v4.6 ?

Regards,
Sudeep

arch/arm/boot/dts/tegra114-dalmore.dts +1 -1
index 8b7aa0dcdc6e..40b88051ea3e 100644
@@ -1164,7 +1164,7 @@
 			label = "Power";
 			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		volume_down {
arch/arm/boot/dts/tegra114-roth.dts +1 -1
index 38acf78d7815..9d868af97b8e 100644
@@ -1047,7 +1047,7 @@
 			label = "Power";
 			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra114-tn7.dts +1 -1
index f91c2c9b2f94..89047edb5c5f 100644
@@ -292,7 +292,7 @@
 			label = "Power";
 			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		volume_down {
arch/arm/boot/dts/tegra124-jetson-tk1.dts +1 -1
index 66b4451eb2ca..067190532f78 100644
@@ -1761,7 +1761,7 @@
 			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
 			debounce-interval = <10>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra124-nyan.dtsi +2 -2
index ec1aa64ded68..c8495eb41fdd 100644
@@ -509,7 +509,7 @@
 			linux,input-type = <5>;
 			linux,code = <KEY_RESERVED>;
 			debounce-interval = <1>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		power {

@@ -517,7 +517,7 @@
 			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
 			debounce-interval = <30>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra124-venice2.dts +1 -1
index cfbdf429b45d..4a5f23c5d893 100644
@@ -975,7 +975,7 @@
 			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
 			debounce-interval = <10>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra20-harmony.dts +1 -1
index b926a07b9443..679f9c49e9f4 100644
@@ -655,7 +655,7 @@
 			label = "Power";
 			gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra20-paz00.dts +1 -1
index ed7e1009326c..fce397e3e2ce 100644
@@ -521,7 +521,7 @@
 			label = "Power";
 			gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra20-seaboard.dts +2 -2
index aea8994b35f2..a112a415ecd5 100644
@@ -807,7 +807,7 @@
 			label = "Power";
 			gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		lid {

@@ -816,7 +816,7 @@
 			linux,input-type = <5>; /* EV_SW */
 			linux,code = <0>; /* SW_LID */
 			debounce-interval = <1>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra20-trimslice.dts +1 -1
index d99af4ef9c64..a4aaff326f99 100644
@@ -392,7 +392,7 @@
 			label = "Power";
 			gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra20-ventana.dts +1 -1
index 04c58e9ca490..b205935a1236 100644
@@ -601,7 +601,7 @@
 			label = "Power";
 			gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra20-whistler.dts +1 -1
index 340d81108df1..5564d6e975d8 100644
@@ -508,7 +508,7 @@
 		nvidia,repeat-delay-ms = <160>;
 		nvidia,kbc-row-pins = <0 1 2>;
 		nvidia,kbc-col-pins = <16 17>;
-		nvidia,wakeup-source;
+		wakeup-source;
 		linux,keymap = <MATRIX_KEY(0x00, 0x00, KEY_POWER)
 				MATRIX_KEY(0x01, 0x00, KEY_HOME)
 				MATRIX_KEY(0x01, 0x01, KEY_BACK)
arch/arm/boot/dts/tegra30-apalis-eval.dts +1 -1
index f2879cfcca62..3ca3b4c6975b 100644
@@ -196,7 +196,7 @@
 			gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WAKEUP>;
 			debounce-interval = <10>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -1
index bb1ca158273c..1714e755c3de 100644
@@ -626,7 +626,7 @@
 			interrupts = <2 0>;
 			linux,code = <KEY_POWER>;
 			debounce-interval = <100>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		volume-down {
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
index 3ff019f47d00..72c79ac9a72f 100644
@@ -142,7 +142,7 @@
 			gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
 			linux,code = <KEY_WAKEUP>;
 			debounce-interval = <10>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +2 -2
index 7dfe1c085966..a5f365d67ca3 100644
@@ -971,7 +971,7 @@
 			linux,input-type = <5>;
 			linux,code = <0>;
 			debounce-interval = <1>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 
 		power {

@@ -979,7 +979,7 @@
 			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_POWER>;
 			debounce-interval = <10>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 ARM: dts: tegra: replace legacy *,wakeup property with wakeup-source

Quoted 23 lines · Sudeep Holla

Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "nvidia,wakeup-source" boolean property to enable the wakeup source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified "wakeup-source" property in order to avoid any further copy-paste duplication.

Cc Stephen Warren <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Alexandre Courbot <[email protected]>
Cc linux-tegra at vger.kernel.org
Signed-off-by Sudeep Holla <[email protected]>
---
 arch/arm/boot/dts/tegra114-dalmore.dts         | 2 +-
 arch/arm/boot/dts/tegra114-roth.dts            | 2 +-
 arch/arm/boot/dts/tegra114-tn7.dts             | 2 +-
 arch/arm/boot/dts/tegra124-jetson-tk1.dts      | 2 +-
 arch/arm/boot/dts/tegra124-nyan.dtsi           | 4 ++--
 arch/arm/boot/dts/tegra124-venice2.dts         | 2 +-
 arch/arm/boot/dts/tegra20-harmony.dts          | 2 +-
 arch/arm/boot/dts/tegra20-paz00.dts            | 2 +-
 arch/arm/boot/dts/tegra20-seaboard.dts         | 4 ++--
Quoted 8 lines
 arch/arm/boot/dts/tegra20-trimslice.dts        | 2 +-
 arch/arm/boot/dts/tegra20-ventana.dts          | 2 +-
 arch/arm/boot/dts/tegra20-whistler.dts         | 2 +-
 arch/arm/boot/dts/tegra30-apalis-eval.dts      | 2 +-
 arch/arm/boot/dts/tegra30-cardhu.dtsi          | 2 +-
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts  | 2 +-
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 ++--
 16 files changed, 19 insertions(+), 19 deletions(-)

I've applied this for 4.6, though I took the liberty of splitting this up into ARM and arm64 patches, since the ARM SoC maintainers prefer it that way.

Thanks,
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160216/bddd51d9/attachment.sig>

author
#2 lore raw

PATCH 1/1 ARM: dts: tegra: replace legacy *,wakeup property with wakeup-source

Quoted 33 lines · Thierry Reding
Quoted 23 lines · Sudeep Holla

Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "nvidia,wakeup-source" boolean property to enable the wakeup source, "wakeup-source" is the new standard binding.

This patch replaces all the legacy wakeup properties with the unified "wakeup-source" property in order to avoid any further copy-paste duplication.

Cc Stephen Warren <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Alexandre Courbot <[email protected]>
Cc linux-tegra at vger.kernel.org
Signed-off-by Sudeep Holla <[email protected]>
---
  arch/arm/boot/dts/tegra114-dalmore.dts         | 2 +-
  arch/arm/boot/dts/tegra114-roth.dts            | 2 +-
  arch/arm/boot/dts/tegra114-tn7.dts             | 2 +-
  arch/arm/boot/dts/tegra124-jetson-tk1.dts      | 2 +-
  arch/arm/boot/dts/tegra124-nyan.dtsi           | 4 ++--
  arch/arm/boot/dts/tegra124-venice2.dts         | 2 +-
  arch/arm/boot/dts/tegra20-harmony.dts          | 2 +-
  arch/arm/boot/dts/tegra20-paz00.dts            | 2 +-
  arch/arm/boot/dts/tegra20-seaboard.dts         | 4 ++--
Quoted 8 lines
  arch/arm/boot/dts/tegra20-trimslice.dts        | 2 +-
  arch/arm/boot/dts/tegra20-ventana.dts          | 2 +-
  arch/arm/boot/dts/tegra20-whistler.dts         | 2 +-
  arch/arm/boot/dts/tegra30-apalis-eval.dts      | 2 +-
  arch/arm/boot/dts/tegra30-cardhu.dtsi          | 2 +-
  arch/arm/boot/dts/tegra30-colibri-eval-v3.dts  | 2 +-
  arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 ++--
  16 files changed, 19 insertions(+), 19 deletions(-)
Quoted 3 lines

I've applied this for 4.6, though I took the liberty of splitting this up into ARM and arm64 patches, since the ARM SoC maintainers prefer it that way.

Ah right, I forgot. Thanks for that.

Signature · 2 lines
Regards,
Sudeep