From: Olof Johansson <olof@lixom.net>
Date: Sat, 1 Jun 2013 06:23:25 +0000 (-0700)
Subject: Merge tag 'seb_clk-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=85b9174fda1d516198b4a46a7795e43636a3ea4c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

From Jason Cooper:
mvebu clock restructuring for v3.11

 - clk: mvebu
    - reorganize by SoC to remove built up #ifdefs
    - add clk flags per clock gate

* tag 'seb_clk-3.11' of git://git.infradead.org/users/jcooper/linux:
  clk: mvebu: disintegrate obsolete file
  ARM: mvebu: move DT boards to SoC-centric clock init
  ARM: kirkwood: move DT boards to SoC-centric clock init
  ARM: dove: move DT boards to SoC-centric clock init
  clk: mvebu: add Armada XP SoC-centric clock init
  clk: mvebu: add Armada 370 SoC-centric clock init
  clk: mvebu: add Kirkwood SoC-centric clock init
  clk: mvebu: add Dove SoC-centric clock init
  clk: mvebu: add common clock functions for core clk and clk gating
  clk: mvebu: introduce per-clock-gate flags
---

85b9174fda1d516198b4a46a7795e43636a3ea4c
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