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 'socfpga_nand_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
vexpress-v2p-ca15_a7.dts
diff --git
a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index
a4c7713
..
ac6b90e
100644
(file)
--- a/
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@
-9,6
+9,7
@@
*/
/dts-v1/;
*/
/dts-v1/;
+#include "vexpress-v2m-rs1.dtsi"
/ {
model = "V2P-CA15_CA7";
/ {
model = "V2P-CA15_CA7";
@@
-203,7
+204,7
@@
<1 10 0xf08>;
};
<1 10 0xf08>;
};
- pmu
_
a15 {
+ pmu
-
a15 {
compatible = "arm,cortex-a15-pmu";
interrupts = <0 68 4>,
<0 69 4>;
compatible = "arm,cortex-a15-pmu";
interrupts = <0 68 4>,
<0 69 4>;
@@
-211,7
+212,7
@@
<&cpu1>;
};
<&cpu1>;
};
- pmu
_
a7 {
+ pmu
-
a7 {
compatible = "arm,cortex-a7-pmu";
interrupts = <0 128 4>,
<0 129 4>,
compatible = "arm,cortex-a7-pmu";
interrupts = <0 128 4>,
<0 129 4>,
@@
-584,7
+585,7
@@
};
};
};
};
- smb@8000000 {
+ smb
: smb
@8000000 {
compatible = "simple-bus";
#address-cells = <2>;
compatible = "simple-bus";
#address-cells = <2>;
@@
-641,8
+642,6
@@
<0 0 40 &gic 0 40 4>,
<0 0 41 &gic 0 41 4>,
<0 0 42 &gic 0 42 4>;
<0 0 40 &gic 0 40 4>,
<0 0 41 &gic 0 41 4>,
<0 0 42 &gic 0 42 4>;
-
- /include/ "vexpress-v2m-rs1.dtsi"
};
site2: hsb@40000000 {
};
site2: hsb@40000000 {