projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
exynos5420-arndale-octa.dts
diff --git
a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index
dd7f838
..
bf457d0
100644
(file)
--- a/
arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/
arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@
-39,7
+39,7
@@
};
};
- gpio
_
keys {
+ gpio
-
keys {
compatible = "gpio-keys";
wakeup {
@@
-344,7
+344,7
@@
&hsi2c_4 {
status = "okay";
-
s2mps11_
pmic@66 {
+ pmic@66 {
compatible = "samsung,s2mps11-pmic";
reg = <0x66>;