aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/tegra114-dalmore.dts2
-rw-r--r--arch/arm/boot/dts/tegra114-roth.dts2
-rw-r--r--arch/arm/boot/dts/tegra114-tn7.dts2
-rw-r--r--arch/arm/boot/dts/tegra124-jetson-tk1.dts2
-rw-r--r--arch/arm/boot/dts/tegra124-nyan.dtsi4
-rw-r--r--arch/arm/boot/dts/tegra124-venice2.dts2
-rw-r--r--arch/arm/boot/dts/tegra20-harmony.dts2
-rw-r--r--arch/arm/boot/dts/tegra20-paz00.dts2
-rw-r--r--arch/arm/boot/dts/tegra20-seaboard.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-trimslice.dts2
-rw-r--r--arch/arm/boot/dts/tegra20-ventana.dts2
-rw-r--r--arch/arm/boot/dts/tegra20-whistler.dts2
-rw-r--r--arch/arm/boot/dts/tegra30-apalis-eval.dts2
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu.dtsi2
-rw-r--r--arch/arm/boot/dts/tegra30-colibri-eval-v3.dts2
15 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 8b7aa0dcdc6e..40b88051ea3e 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -1164,7 +1164,7 @@
1164 label = "Power"; 1164 label = "Power";
1165 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; 1165 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
1166 linux,code = <KEY_POWER>; 1166 linux,code = <KEY_POWER>;
1167 gpio-key,wakeup; 1167 wakeup-source;
1168 }; 1168 };
1169 1169
1170 volume_down { 1170 volume_down {
diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts
index 38acf78d7815..9d868af97b8e 100644
--- a/arch/arm/boot/dts/tegra114-roth.dts
+++ b/arch/arm/boot/dts/tegra114-roth.dts
@@ -1047,7 +1047,7 @@
1047 label = "Power"; 1047 label = "Power";
1048 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; 1048 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
1049 linux,code = <KEY_POWER>; 1049 linux,code = <KEY_POWER>;
1050 gpio-key,wakeup; 1050 wakeup-source;
1051 }; 1051 };
1052 }; 1052 };
1053 1053
diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts
index f91c2c9b2f94..89047edb5c5f 100644
--- a/arch/arm/boot/dts/tegra114-tn7.dts
+++ b/arch/arm/boot/dts/tegra114-tn7.dts
@@ -292,7 +292,7 @@
292 label = "Power"; 292 label = "Power";
293 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; 293 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
294 linux,code = <KEY_POWER>; 294 linux,code = <KEY_POWER>;
295 gpio-key,wakeup; 295 wakeup-source;
296 }; 296 };
297 297
298 volume_down { 298 volume_down {
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 67e96f7d5654..95b580a9369b 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1787,7 +1787,7 @@
1787 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; 1787 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
1788 linux,code = <KEY_POWER>; 1788 linux,code = <KEY_POWER>;
1789 debounce-interval = <10>; 1789 debounce-interval = <10>;
1790 gpio-key,wakeup; 1790 wakeup-source;
1791 }; 1791 };
1792 }; 1792 };
1793 1793
diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index ec1aa64ded68..c8495eb41fdd 100644
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -509,7 +509,7 @@
509 linux,input-type = <5>; 509 linux,input-type = <5>;
510 linux,code = <KEY_RESERVED>; 510 linux,code = <KEY_RESERVED>;
511 debounce-interval = <1>; 511 debounce-interval = <1>;
512 gpio-key,wakeup; 512 wakeup-source;
513 }; 513 };
514 514
515 power { 515 power {
@@ -517,7 +517,7 @@
517 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; 517 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
518 linux,code = <KEY_POWER>; 518 linux,code = <KEY_POWER>;
519 debounce-interval = <30>; 519 debounce-interval = <30>;
520 gpio-key,wakeup; 520 wakeup-source;
521 }; 521 };
522 }; 522 };
523 523
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index cfbdf429b45d..4a5f23c5d893 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -975,7 +975,7 @@
975 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; 975 gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
976 linux,code = <KEY_POWER>; 976 linux,code = <KEY_POWER>;
977 debounce-interval = <10>; 977 debounce-interval = <10>;
978 gpio-key,wakeup; 978 wakeup-source;
979 }; 979 };
980 }; 980 };
981 981
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index b926a07b9443..679f9c49e9f4 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -655,7 +655,7 @@
655 label = "Power"; 655 label = "Power";
656 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 656 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
657 linux,code = <KEY_POWER>; 657 linux,code = <KEY_POWER>;
658 gpio-key,wakeup; 658 wakeup-source;
659 }; 659 };
660 }; 660 };
661 661
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index ed7e1009326c..fce397e3e2ce 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -521,7 +521,7 @@
521 label = "Power"; 521 label = "Power";
522 gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>; 522 gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>;
523 linux,code = <KEY_POWER>; 523 linux,code = <KEY_POWER>;
524 gpio-key,wakeup; 524 wakeup-source;
525 }; 525 };
526 }; 526 };
527 527
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index aea8994b35f2..a112a415ecd5 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -807,7 +807,7 @@
807 label = "Power"; 807 label = "Power";
808 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 808 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
809 linux,code = <KEY_POWER>; 809 linux,code = <KEY_POWER>;
810 gpio-key,wakeup; 810 wakeup-source;
811 }; 811 };
812 812
813 lid { 813 lid {
@@ -816,7 +816,7 @@
816 linux,input-type = <5>; /* EV_SW */ 816 linux,input-type = <5>; /* EV_SW */
817 linux,code = <0>; /* SW_LID */ 817 linux,code = <0>; /* SW_LID */
818 debounce-interval = <1>; 818 debounce-interval = <1>;
819 gpio-key,wakeup; 819 wakeup-source;
820 }; 820 };
821 }; 821 };
822 822
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index d99af4ef9c64..a4aaff326f99 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -392,7 +392,7 @@
392 label = "Power"; 392 label = "Power";
393 gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>; 393 gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
394 linux,code = <KEY_POWER>; 394 linux,code = <KEY_POWER>;
395 gpio-key,wakeup; 395 wakeup-source;
396 }; 396 };
397 }; 397 };
398 398
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index 04c58e9ca490..b205935a1236 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -601,7 +601,7 @@
601 label = "Power"; 601 label = "Power";
602 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 602 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
603 linux,code = <KEY_POWER>; 603 linux,code = <KEY_POWER>;
604 gpio-key,wakeup; 604 wakeup-source;
605 }; 605 };
606 }; 606 };
607 607
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 340d81108df1..5564d6e975d8 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -508,7 +508,7 @@
508 nvidia,repeat-delay-ms = <160>; 508 nvidia,repeat-delay-ms = <160>;
509 nvidia,kbc-row-pins = <0 1 2>; 509 nvidia,kbc-row-pins = <0 1 2>;
510 nvidia,kbc-col-pins = <16 17>; 510 nvidia,kbc-col-pins = <16 17>;
511 nvidia,wakeup-source; 511 wakeup-source;
512 linux,keymap = <MATRIX_KEY(0x00, 0x00, KEY_POWER) 512 linux,keymap = <MATRIX_KEY(0x00, 0x00, KEY_POWER)
513 MATRIX_KEY(0x01, 0x00, KEY_HOME) 513 MATRIX_KEY(0x01, 0x00, KEY_HOME)
514 MATRIX_KEY(0x01, 0x01, KEY_BACK) 514 MATRIX_KEY(0x01, 0x01, KEY_BACK)
diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
index f2879cfcca62..3ca3b4c6975b 100644
--- a/arch/arm/boot/dts/tegra30-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -196,7 +196,7 @@
196 gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_LOW>; 196 gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_LOW>;
197 linux,code = <KEY_WAKEUP>; 197 linux,code = <KEY_WAKEUP>;
198 debounce-interval = <10>; 198 debounce-interval = <10>;
199 gpio-key,wakeup; 199 wakeup-source;
200 }; 200 };
201 }; 201 };
202 202
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index bb1ca158273c..1714e755c3de 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -626,7 +626,7 @@
626 interrupts = <2 0>; 626 interrupts = <2 0>;
627 linux,code = <KEY_POWER>; 627 linux,code = <KEY_POWER>;
628 debounce-interval = <100>; 628 debounce-interval = <100>;
629 gpio-key,wakeup; 629 wakeup-source;
630 }; 630 };
631 631
632 volume-down { 632 volume-down {
diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index 3ff019f47d00..72c79ac9a72f 100644
--- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -142,7 +142,7 @@
142 gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>; 142 gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
143 linux,code = <KEY_WAKEUP>; 143 linux,code = <KEY_WAKEUP>;
144 debounce-interval = <10>; 144 debounce-interval = <10>;
145 gpio-key,wakeup; 145 wakeup-source;
146 }; 146 };
147 }; 147 };
148 148