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 tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubi
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
integratorcp.dts
diff --git
a/arch/arm/boot/dts/integratorcp.dts
b/arch/arm/boot/dts/integratorcp.dts
index 72693a69f8300421f687f404ffa9f95768ea33d3..7deb3a3182b42513d95bfdf34894692425a62c43 100644
(file)
--- a/
arch/arm/boot/dts/integratorcp.dts
+++ b/
arch/arm/boot/dts/integratorcp.dts
@@
-13,8
+13,8
@@
bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
};
-
cp
con {
- /* CP controller registers */
+
sys
con {
+ compatible = "arm,integrator-cp-syscon";
reg = <0xcb000000 0x100>;
};