Merge branch 'tracking-armlt-tc2-dt' into lsk-3.10-vexpress

This commit is contained in:
Jon Medhurst
2013-07-17 12:01:44 +01:00

View File

@@ -31,44 +31,102 @@
i2c1 = &v2m_i2c_pcie;
};
cpus {
clusters {
#address-cells = <1>;
#size-cells = <0>;
cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
cluster0: cluster@0 {
reg = <0>;
cores {
#address-cells = <1>;
#size-cells = <0>;
core0: core@0 {
reg = <0>;
};
core1: core@1 {
reg = <1>;
};
};
};
cpu1: cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a15";
cluster1: cluster@1 {
reg = <1>;
cores {
#address-cells = <1>;
#size-cells = <0>;
core2: core@0 {
reg = <0>;
};
core3: core@1 {
reg = <1>;
};
core4: core@2 {
reg = <2>;
};
};
};
};
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu2: cpu@2 {
device_type = "cpu";
compatible = "arm,cortex-a7";
reg = <0x100>;
cluster = <&cluster1>;
core = <&core2>;
clock-frequency = <800000000>;
};
cpu3: cpu@3 {
device_type = "cpu";
compatible = "arm,cortex-a7";
reg = <0x101>;
cluster = <&cluster1>;
core = <&core3>;
clock-frequency = <800000000>;
};
cpu4: cpu@4 {
device_type = "cpu";
compatible = "arm,cortex-a7";
reg = <0x102>;
cluster = <&cluster1>;
core = <&core4>;
clock-frequency = <800000000>;
};
cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;
cluster = <&cluster0>;
core = <&core0>;
clock-frequency = <1000000000>;
};
cpu1: cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <1>;
cluster = <&cluster0>;
core = <&core1>;
clock-frequency = <1000000000>;
};
};
memory@80000000 {
device_type = "memory";
reg = <0 0x80000000 0 0x40000000>;
reg = <0 0x80000000 0 0x80000000>;
};
wdt@2a490000 {
@@ -106,6 +164,34 @@
<0 0x2c004000 0 0x2000>,
<0 0x2c006000 0 0x2000>;
interrupts = <1 9 0xf04>;
gic-cpuif@0 {
compatible = "arm,gic-cpuif";
cpuif-id = <0>;
cpu = <&cpu0>;
};
gic-cpuif@1 {
compatible = "arm,gic-cpuif";
cpuif-id = <1>;
cpu = <&cpu1>;
};
gic-cpuif@2 {
compatible = "arm,gic-cpuif";
cpuif-id = <2>;
cpu = <&cpu2>;
};
gic-cpuif@3 {
compatible = "arm,gic-cpuif";
cpuif-id = <3>;
cpu = <&cpu3>;
};
gic-cpuif@4 {
compatible = "arm,gic-cpuif";
cpuif-id = <4>;
cpu = <&cpu4>;
};
};
memory-controller@7ffd0000 {
@@ -137,12 +223,21 @@
<1 10 0xf08>;
};
pmu {
pmu_a15 {
compatible = "arm,cortex-a15-pmu";
cluster = <&cluster0>;
interrupts = <0 68 4>,
<0 69 4>;
};
pmu_a7 {
compatible = "arm,cortex-a7-pmu";
cluster = <&cluster1>;
interrupts = <0 128 4>,
<0 129 4>,
<0 130 4>;
};
oscclk6a: oscclk6a {
/* Reference 24MHz clock */
compatible = "fixed-clock";