git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-dt-5.1-2' of git://git.infradead.org/linux-mvebu into arm/dt
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am437x-gp-evm.dts
diff --git
a/arch/arm/boot/dts/am437x-gp-evm.dts
b/arch/arm/boot/dts/am437x-gp-evm.dts
index f4a20cade80858a72d1327e5c671121f8c7d5bec..4c6ee37ea5738be30a3e8245c6e111a78e487f38 100644
(file)
--- a/
arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/
arch/arm/boot/dts/am437x-gp-evm.dts
@@
-71,7
+71,7
@@
pinctrl-0 = <&matrix_keypad_default>;
pinctrl-1 = <&matrix_keypad_sleep>;
-
linux,wakeup
;
+
wakeup-source
;
row-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH /* Bank0, pin3 */
&gpio4 3 GPIO_ACTIVE_HIGH /* Bank4, pin3 */