Commit e29b65db authored by Pawel Moll's avatar Pawel Moll

ARM: vexpress: Device Tree updates

* Added extra regs for A15 VGIC
* Added A15 architected timer node
* Split A5 and A9 TWD nodes into two separate ones for timer
  and watchdog; interrupt definitions fixed on the way
* Fixed typo in A5 GIC compatible value

All the changes courtesy of Marc Zyngier.
Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
parent 76e10d15
...@@ -73,7 +73,10 @@ gic: interrupt-controller@2c001000 { ...@@ -73,7 +73,10 @@ gic: interrupt-controller@2c001000 {
#address-cells = <0>; #address-cells = <0>;
interrupt-controller; interrupt-controller;
reg = <0x2c001000 0x1000>, reg = <0x2c001000 0x1000>,
<0x2c002000 0x100>; <0x2c002000 0x1000>,
<0x2c004000 0x2000>,
<0x2c006000 0x2000>;
interrupts = <1 9 0xf04>;
}; };
memory-controller@7ffd0000 { memory-controller@7ffd0000 {
...@@ -93,6 +96,14 @@ dma@7ffb0000 { ...@@ -93,6 +96,14 @@ dma@7ffb0000 {
<0 91 4>; <0 91 4>;
}; };
timer {
compatible = "arm,armv7-timer";
interrupts = <1 13 0xf08>,
<1 14 0xf08>,
<1 11 0xf08>,
<1 10 0xf08>;
};
pmu { pmu {
compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu"; compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";
interrupts = <0 68 4>, interrupts = <0 68 4>,
......
...@@ -77,13 +77,18 @@ scu@2c000000 { ...@@ -77,13 +77,18 @@ scu@2c000000 {
timer@2c000600 { timer@2c000600 {
compatible = "arm,cortex-a5-twd-timer"; compatible = "arm,cortex-a5-twd-timer";
reg = <0x2c000600 0x38>; reg = <0x2c000600 0x20>;
interrupts = <1 2 0x304>, interrupts = <1 13 0x304>;
<1 3 0x304>; };
watchdog@2c000620 {
compatible = "arm,cortex-a5-twd-wdt";
reg = <0x2c000620 0x20>;
interrupts = <1 14 0x304>;
}; };
gic: interrupt-controller@2c001000 { gic: interrupt-controller@2c001000 {
compatible = "arm,corex-a5-gic", "arm,cortex-a9-gic"; compatible = "arm,cortex-a5-gic", "arm,cortex-a9-gic";
#interrupt-cells = <3>; #interrupt-cells = <3>;
#address-cells = <0>; #address-cells = <0>;
interrupt-controller; interrupt-controller;
......
...@@ -105,8 +105,13 @@ scu@1e000000 { ...@@ -105,8 +105,13 @@ scu@1e000000 {
timer@1e000600 { timer@1e000600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0x1e000600 0x20>; reg = <0x1e000600 0x20>;
interrupts = <1 2 0xf04>, interrupts = <1 13 0xf04>;
<1 3 0xf04>; };
watchdog@1e000620 {
compatible = "arm,cortex-a9-twd-wdt";
reg = <0x1e000620 0x20>;
interrupts = <1 14 0xf04>;
}; };
gic: interrupt-controller@1e001000 { gic: interrupt-controller@1e001000 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment