ARM: nomadik: move l2x0 setup to device tree

The cache setup magic value in the Nomadik machine is plain wrong,
the correct settings can be done using device tree in accordance
with the settings from ST's own port.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index f68988ac800c764dffcd9ec6140473c693ac63f9..ce8936bebe5e7a24e5c83e4d060d0d8dc5142dd3 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -21,6 +21,13 @@
                interrupts = <30>;
                cache-unified;
                cache-level = <2>;
+               cache-size = <131072>;
+               cache-sets = <512>;
+               cache-line-size = <32>;
+               /* At full speed latency must be >=2 */
+               arm,tag-latency = <2>;
+               arm,data-latency = <2 2>;
+               arm,dirty-latency = <2>;
        };
 
        mtu0: mtu@101e2000 {

diff --cc arch/arm/mach-nomadik/cpu-8815.c
Simple merge