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 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp.dtsi
diff --git
a/arch/arm/boot/dts/armada-xp.dtsi
b/arch/arm/boot/dts/armada-xp.dtsi
index 82917236a2fbfe99426b5a70127255848a917d6a..013d63f69e361e60bbe96466bec1883388155889 100644
(file)
--- a/
arch/arm/boot/dts/armada-xp.dtsi
+++ b/
arch/arm/boot/dts/armada-xp.dtsi
@@
-57,7
+57,8
@@
compatible = "marvell,armadaxp", "marvell,armada-370-xp";
aliases {
compatible = "marvell,armadaxp", "marvell,armada-370-xp";
aliases {
- eth2 = ð2;
+ serial2 = &uart2;
+ serial3 = &uart3;
};
soc {
};
soc {
@@
-78,6
+79,7
@@
compatible = "marvell,aurora-system-cache";
reg = <0x08000 0x1000>;
cache-id-part = <0x100>;
compatible = "marvell,aurora-system-cache";
reg = <0x08000 0x1000>;
cache-id-part = <0x100>;
+ cache-level = <2>;
cache-unified;
wt-override;
};
cache-unified;
wt-override;
};
@@
-149,11
+151,11
@@
cpuclk: clock-complex@18700 {
#clock-cells = <1>;
compatible = "marvell,armada-xp-cpu-clock";
cpuclk: clock-complex@18700 {
#clock-cells = <1>;
compatible = "marvell,armada-xp-cpu-clock";
- reg = <0x18700 0x
A0
>, <0x1c054 0x10>;
+ reg = <0x18700 0x
24
>, <0x1c054 0x10>;
clocks = <&coreclk 1>;
};
clocks = <&coreclk 1>;
};
- interrupt-controller@20
0
00 {
+ interrupt-controller@20
a
00 {
reg = <0x20a00 0x2d0>, <0x21070 0x58>;
};
reg = <0x20a00 0x2d0>, <0x21070 0x58>;
};