Commit c1fd2794 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'berlin64-dt-for-v4.9-1' of...

Merge tag 'berlin64-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt64

Berlin64 DT changes for v4.9
- enable dw wdt nodes unconditionally,
  driver supports multiple instances now
- switch to Cortex-A53 pmu compatible
- add L2 cache topology

* tag 'berlin64-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  arm64: dts: berlin4ct: Add L2 cache topology
  arm64: dts: berlin4ct: enable all wdt nodes unconditionally
  arm64: dts: berlin4ct: switch to Cortex-A53 specific pmu nodes
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 80d9cf34 139787f4
...@@ -68,6 +68,7 @@ cpu0: cpu@0 { ...@@ -68,6 +68,7 @@ cpu0: cpu@0 {
device_type = "cpu"; device_type = "cpu";
reg = <0x0>; reg = <0x0>;
enable-method = "psci"; enable-method = "psci";
next-level-cache = <&l2>;
cpu-idle-states = <&CPU_SLEEP_0>; cpu-idle-states = <&CPU_SLEEP_0>;
}; };
...@@ -76,6 +77,7 @@ cpu1: cpu@1 { ...@@ -76,6 +77,7 @@ cpu1: cpu@1 {
device_type = "cpu"; device_type = "cpu";
reg = <0x1>; reg = <0x1>;
enable-method = "psci"; enable-method = "psci";
next-level-cache = <&l2>;
cpu-idle-states = <&CPU_SLEEP_0>; cpu-idle-states = <&CPU_SLEEP_0>;
}; };
...@@ -84,6 +86,7 @@ cpu2: cpu@2 { ...@@ -84,6 +86,7 @@ cpu2: cpu@2 {
device_type = "cpu"; device_type = "cpu";
reg = <0x2>; reg = <0x2>;
enable-method = "psci"; enable-method = "psci";
next-level-cache = <&l2>;
cpu-idle-states = <&CPU_SLEEP_0>; cpu-idle-states = <&CPU_SLEEP_0>;
}; };
...@@ -92,9 +95,14 @@ cpu3: cpu@3 { ...@@ -92,9 +95,14 @@ cpu3: cpu@3 {
device_type = "cpu"; device_type = "cpu";
reg = <0x3>; reg = <0x3>;
enable-method = "psci"; enable-method = "psci";
next-level-cache = <&l2>;
cpu-idle-states = <&CPU_SLEEP_0>; cpu-idle-states = <&CPU_SLEEP_0>;
}; };
l2: cache {
compatible = "cache";
};
idle-states { idle-states {
entry-method = "psci"; entry-method = "psci";
CPU_SLEEP_0: cpu-sleep-0 { CPU_SLEEP_0: cpu-sleep-0 {
...@@ -115,7 +123,7 @@ osc: osc { ...@@ -115,7 +123,7 @@ osc: osc {
}; };
pmu { pmu {
compatible = "arm,armv8-pmuv3"; compatible = "arm,cortex-a53-pmu", "arm,armv8-pmuv3";
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
...@@ -279,7 +287,6 @@ wdt1: watchdog@4000 { ...@@ -279,7 +287,6 @@ wdt1: watchdog@4000 {
reg = <0x4000 0x100>; reg = <0x4000 0x100>;
clocks = <&osc>; clocks = <&osc>;
interrupts = <1>; interrupts = <1>;
status = "disabled";
}; };
wdt2: watchdog@5000 { wdt2: watchdog@5000 {
...@@ -287,7 +294,6 @@ wdt2: watchdog@5000 { ...@@ -287,7 +294,6 @@ wdt2: watchdog@5000 {
reg = <0x5000 0x100>; reg = <0x5000 0x100>;
clocks = <&osc>; clocks = <&osc>;
interrupts = <2>; interrupts = <2>;
status = "disabled";
}; };
sm_gpio0: gpio@8000 { sm_gpio0: gpio@8000 {
......
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