From: Olof Johansson <olof@lixom.net>
Date: Fri, 14 Jun 2013 22:18:25 +0000 (-0700)
Subject: Merge tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5ae13ef4e1045d6ec5d445947b42c839b9731bec;p=deliverable%2Flinux.git

Merge tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc

mvebu register map changes for v3.11

This series removes the hardcoded register base address for mvebu.

Depends:
 - mvebu/fixes-non-critical (up to tags/fixes-non-3.11-1)
 - mvebu/cleanup (up to tags/cleanup-3.11-3)

* tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: disable DEBUG_LL/EARLY_PRINTK in defconfig
  arm: mvebu: add another earlyprintk Kconfig option
  arm: mvebu: don't hardcode the physical address for mvebu-mbus
  arm: mvebu: don't hardcode a physical address in headsmp.S
  arm: mvebu: remove hardcoded static I/O mapping
  arm: mvebu: move cache and mvebu-mbus initialization later
  arm: mvebu: avoid hardcoded virtual address in coherency code
  arm: mvebu: remove dependency of SMP init on static I/O mapping
  arm: mvebu: fix length of Ethernet registers area in .dtsi
  arm: mvebu: fix length of SATA registers area in .dtsi
  arm: mvebu: mark functions of armada-370-xp.c as static
  ARM: mvebu: Remove init_irq declaration in machine description
  ARM: Orion: Remove redundant init_dma_coherent_pool_size()

Signed-off-by: Olof Johansson <olof@lixom.net>
---

5ae13ef4e1045d6ec5d445947b42c839b9731bec
diff --cc arch/arm/mach-mvebu/armada-370-xp.c
index ebbc99739726,0dbc370f9e35..97cbb8021919
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@@ -14,13 -14,13 +14,13 @@@
  
  #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>
 -#include <linux/clk/mvebu.h>
  #include <linux/dma-mapping.h>
  #include <linux/mbus.h>
- #include <linux/irqchip.h>
  #include <asm/hardware/cache-l2x0.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
@@@ -62,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