Merge remote-tracking branch 'v9fs/for-next'

[karo-tx-linux.git] / arch / arm / mach-berlin / berlin.c

diff --git a/arch/arm/mach-berlin/berlin.c b/arch/arm/mach-berlin/berlin.c
index 025bcb5473eb56748b5a7f906b47db755c32e3c2..25d73870cccad498e98eab1c4a43666a36fbaa9c 100644 (file)
--- a/arch/arm/mach-berlin/berlin.c
+++ b/arch/arm/mach-berlin/berlin.c
@@ -18,14 +18,9 @@
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
 
-static void __init berlin_init_machine(void)
+static void __init berlin_init_late(void)
 {
-       /*
-        * with DT probing for L2CCs, berlin_init_machine can be removed.
-        * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc
-        */
-       l2x0_of_init(0x70c00000, 0xfeffffff);
-       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+       platform_device_register_simple("cpufreq-dt", -1, NULL, 0);
 }
 
 static const char * const berlin_dt_compat[] = {
@@ -35,5 +30,11 @@ static const char * const berlin_dt_compat[] = {
 
 DT_MACHINE_START(BERLIN_DT, "Marvell Berlin")
        .dt_compat      = berlin_dt_compat,
-       .init_machine   = berlin_init_machine,
+       .init_late      = berlin_init_late,
+       /*
+        * with DT probing for L2CCs, berlin_init_machine can be removed.
+        * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc
+        */
+       .l2c_aux_val    = 0x30c00000,
+       .l2c_aux_mask   = 0xfeffffff,
 MACHINE_END