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 branch 'fixes-base' into fixes
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
rockchip
/
rk3368-r88.dts
diff --git
a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 104cbee762bb116d37d06e39ec2b2e644e3adfeb..1f2b642e794ae98219ceb49a58bc177028982dc7 100644
(file)
--- a/
arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/
arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@
-71,7
+71,7
@@
pinctrl-0 = <&pwr_key>;
button@0 {
-
gpio-key,wakeup = <1>
;
+
wakeup-source
;
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
label = "GPIO Power";
linux,code = <116>;