From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 13 Jun 2013 18:04:40 +0000 (+0000)
Subject: Merge branch 'mvebu/regmap' into for-next
X-Git-Tag: next-20130617~11^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=50531ed35f3951a5e0d5d6c4ea31b603d3852061;p=karo-tx-linux.git

Merge branch 'mvebu/regmap' into for-next

Conflicts:
	arch/arm/mach-mvebu/armada-370-xp.c
---

50531ed35f3951a5e0d5d6c4ea31b603d3852061
diff --cc arch/arm/mach-mvebu/armada-370-xp.c
index 8721e2d26066,0dbc370f9e35..97cbb8021919
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@@ -14,7 -14,7 +14,8 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
 +#include <linux/clk-provider.h>
+ #include <linux/of_address.h>
  #include <linux/of_platform.h>
  #include <linux/io.h>
  #include <linux/time-armada-370-xp.h>
@@@ -61,12 -56,22 +56,22 @@@ static void __init armada_370_xp_mbus_i
  	else
  		mbus_soc_name = "marvell,armadaxp-mbus";
  
+ 	dn = of_find_node_by_name(NULL, "internal-regs");
+ 	BUG_ON(!dn);
+ 
  	mvebu_mbus_init(mbus_soc_name,
- 			ARMADA_370_XP_MBUS_WINS_BASE,
+ 			of_translate_address(dn, &mbus_wins_offs),
  			ARMADA_370_XP_MBUS_WINS_SIZE,
- 			ARMADA_370_XP_SDRAM_WINS_BASE,
+ 			of_translate_address(dn, &sdram_wins_offs),
  			ARMADA_370_XP_SDRAM_WINS_SIZE);
+ }
  
+ static void __init armada_370_xp_timer_and_clk_init(void)
+ {
 -	mvebu_clocks_init();
++	of_clk_init(NULL);
+ 	armada_370_xp_timer_init();
+ 	coherency_init();
+ 	armada_370_xp_mbus_init();
  #ifdef CONFIG_CACHE_L2X0
  	l2x0_of_init(0, ~0UL);
  #endif