aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>2013-06-18 11:31:19 -0400
committerJason Cooper <jason@lakedaemon.net>2013-06-21 11:38:20 -0400
commit01db527e657d6cf646c6e6f059ad41e7023a25e7 (patch)
tree79091111d945018fd808c97ea67ce42e558766fd /arch/arm
parentb848f6224554afd621c92abcf7948796a214772c (diff)
ARM: Kirkwood: Fix the internal register ranges translation
Although the internal register window size is 1 MiB, the previous ranges translation for the internal register space had a size of 0x4000000. This was done to allow the crypto and nand node to access the corresponding 'sram' and 'nand' decoding windows. In order to describe the hardware more accurately, we declare the real 1 MiB internal register space in the ranges, and add a translation entry for the nand node to access the 'nand' window. This commit will make future improvements on the MBus DT binding easier. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 5d7b759f06a8..1ae3eb2dea2e 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -30,7 +30,8 @@
30 30
31 ocp@f1000000 { 31 ocp@f1000000 {
32 compatible = "simple-bus"; 32 compatible = "simple-bus";
33 ranges = <0x00000000 0xf1000000 0x4000000 33 ranges = <0x00000000 0xf1000000 0x0100000
34 0xf4000000 0xf4000000 0x0000400
34 0xf5000000 0xf5000000 0x0000400>; 35 0xf5000000 0xf5000000 0x0000400>;
35 #address-cells = <1>; 36 #address-cells = <1>;
36 #size-cells = <1>; 37 #size-cells = <1>;
@@ -163,7 +164,7 @@
163 ale = <1>; 164 ale = <1>;
164 bank-width = <1>; 165 bank-width = <1>;
165 compatible = "marvell,orion-nand"; 166 compatible = "marvell,orion-nand";
166 reg = <0x3000000 0x400>; 167 reg = <0xf4000000 0x400>;
167 chip-delay = <25>; 168 chip-delay = <25>;
168 /* set partition map and/or chip-delay in board dts */ 169 /* set partition map and/or chip-delay in board dts */
169 clocks = <&gate_clk 7>; 170 clocks = <&gate_clk 7>;