projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/fix/rt5640' and 'asoc/fix/wm8962' into asoc...
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
imx35-eukrea-mbimxsd35-baseboard.dts
diff --git
a/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
b/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
index 75b036700d314cefa0040e88b92bc54e2f595a22..4727bbb804e1266a423203118dd22770a853d97f 100644
(file)
--- a/
arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
+++ b/
arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
@@
-30,7
+30,7
@@
label = "BP1";
gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>;
-
gpio-key,wakeup
;
+
wakeup-source
;
linux,input-type = <1>;
};
};