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 --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index 82831dc6122f6b0c7be2a04f4ac2c3b83982ac6f..0c612d95bd5ccac3935b056b937530c3aa74b13a 100644 (file)
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -114,9 +114,8 @@ static const char * cpu8815_board_compat[] = {
 };
 
 DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")
-       /* At full speed latency must be >=2, so 0x249 in low bits */
-       .l2c_aux_val    = 0x00700249,
-       .l2c_aux_mask   = 0xfe0fefff,
+       .l2c_aux_val    = 0,
+       .l2c_aux_mask   = ~0,
        .map_io         = cpu8815_map_io,
        .restart        = cpu8815_restart,
        .dt_compat      = cpu8815_board_compat,