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

Merge branch 'mvebu/seb_clk' into for-next
---

81edb2606382cc2dfaf918e488569555bd4ac17c
diff --cc arch/arm/mach-mvebu/Kconfig
index fb827ac9d906,ef4e21cf36bf..9eb63d724602
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -10,12 -10,8 +10,9 @@@ config ARCH_MVEB
  	select PLAT_ORION
  	select SPARSE_IRQ
  	select CLKDEV_LOOKUP
- 	select MVEBU_CLK_CORE
- 	select MVEBU_CLK_CPU
- 	select MVEBU_CLK_GATING
  	select MVEBU_MBUS
  	select ZONE_DMA if ARM_LPAE
 +	select ARCH_REQUIRE_GPIOLIB
  	select MIGHT_HAVE_PCI
  	select PCI_QUIRKS if PCI
  
diff --cc arch/arm/mach-mvebu/armada-370-xp.c
index cf8e357a0a02,1d018e420208..8721e2d26066
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@@ -17,9 -18,9 +18,8 @@@
  #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>
@@@ -42,9 -43,9 +42,9 @@@ static void __init armada_370_xp_map_io
  	iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
  }
  
 -void __init armada_370_xp_timer_and_clk_init(void)
 +static void __init armada_370_xp_timer_and_clk_init(void)
  {
- 	mvebu_clocks_init();
+ 	of_clk_init(NULL);
  	armada_370_xp_timer_init();
  }