projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
vexpress-v2p-ca9.dts
diff --git
a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index 1420bb14d95c9bdeecea3aff5598612df359b924..62d9b225dcceec8b27464027cd9dba60640c33f5 100644
(file)
--- a/
arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/
arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@
-98,6
+98,7
@@
<0 49 4>;
clocks = <&oscclk2>, <&oscclk2>;
clock-names = "timclk", "apb_pclk";
+ status = "disabled";
};
watchdog@100e5000 {