projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tegra-for-4.5-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
at91-sama5d4ek.dts
diff --git
a/arch/arm/boot/dts/at91-sama5d4ek.dts
b/arch/arm/boot/dts/at91-sama5d4ek.dts
index
6d272c0
..
2d4a331
100644
(file)
--- a/
arch/arm/boot/dts/at91-sama5d4ek.dts
+++ b/
arch/arm/boot/dts/at91-sama5d4ek.dts
@@
-50,7
+50,6
@@
compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5";
chosen {
compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5";
chosen {
- bootargs = "ignore_loglevel earlyprintk";
stdout-path = "serial0:115200n8";
};
stdout-path = "serial0:115200n8";
};
@@
-59,15
+58,6
@@
};
clocks {
};
clocks {
- #address-cells = <1>;
- #size-cells = <1>;
- ranges;
-
- main_clock: clock@0 {
- compatible = "atmel,osc", "fixed-clock";
- clock-frequency = <12000000>;
- };
-
slow_xtal {
clock-frequency = <32768>;
};
slow_xtal {
clock-frequency = <32768>;
};
@@
-304,7
+294,7
@@
label = "pb_user1";
gpios = <&pioE 13 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>;
label = "pb_user1";
gpios = <&pioE 13 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>;
-
gpio-key,wakeup
;
+
wakeup-source
;
};
};
};
};