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 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6sx-sdb.dtsi
diff --git
a/arch/arm/boot/dts/imx6sx-sdb.dtsi
b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index f8f31872fa144d83b29c227a921125c482ebc4bf..53b3408b5fab1845248b2b7ff078eba462f730ab 100644
(file)
--- a/
arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/
arch/arm/boot/dts/imx6sx-sdb.dtsi
@@
-40,12
+40,14
@@
label = "Volume Up";
gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
+ wakeup-source;
};
volume-down {
label = "Volume Down";
gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
+ wakeup-source;
};
};