diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-01-14 12:09:16 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 13:24:08 -0500 |
commit | bb2c1de9ffadc0e1cca1925a89cc04204b247f5b (patch) | |
tree | 16f54860ec023bce97c945e33199b67082045151 /arch/arm/boot/dts/tegra20.dtsi | |
parent | 0698ed1986b1f87623b1c1ca0c977c352736897e (diff) |
ARM: tegra: swap cache-/interrupt-ctrlr nodes in DT
This ensures nodes are sorted in order of reg address. This makes it
easier to compare against e.g. the U-Boot device trees, and is simply
consistent and clean.
While we're at it, remove the unit address from the cache-controller
node name, since it's unique without it.
Reported-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/boot/dts/tegra20.dtsi')
-rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 584596a47abb..c4c0bb76dd6c 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
@@ -120,15 +120,6 @@ | |||
120 | interrupts = <1 13 0x304>; | 120 | interrupts = <1 13 0x304>; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | cache-controller@50043000 { | ||
124 | compatible = "arm,pl310-cache"; | ||
125 | reg = <0x50043000 0x1000>; | ||
126 | arm,data-latency = <5 5 2>; | ||
127 | arm,tag-latency = <4 4 2>; | ||
128 | cache-unified; | ||
129 | cache-level = <2>; | ||
130 | }; | ||
131 | |||
132 | intc: interrupt-controller { | 123 | intc: interrupt-controller { |
133 | compatible = "arm,cortex-a9-gic"; | 124 | compatible = "arm,cortex-a9-gic"; |
134 | reg = <0x50041000 0x1000 | 125 | reg = <0x50041000 0x1000 |
@@ -137,6 +128,15 @@ | |||
137 | #interrupt-cells = <3>; | 128 | #interrupt-cells = <3>; |
138 | }; | 129 | }; |
139 | 130 | ||
131 | cache-controller { | ||
132 | compatible = "arm,pl310-cache"; | ||
133 | reg = <0x50043000 0x1000>; | ||
134 | arm,data-latency = <5 5 2>; | ||
135 | arm,tag-latency = <4 4 2>; | ||
136 | cache-unified; | ||
137 | cache-level = <2>; | ||
138 | }; | ||
139 | |||
140 | timer@60005000 { | 140 | timer@60005000 { |
141 | compatible = "nvidia,tegra20-timer"; | 141 | compatible = "nvidia,tegra20-timer"; |
142 | reg = <0x60005000 0x60>; | 142 | reg = <0x60005000 0x60>; |