Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85b9174f authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents 2dbefbf6 ea7e0bd7

arch/arm/mach-dove/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ config MACH_CM_A510 


config MACH_DOVE_DT

	bool "Marvell Dove Flattened Device Tree"

	select MVEBU_CLK_CORE

	select MVEBU_CLK_GATING

	select DOVE_CLK

	select REGULATOR

	select REGULATOR_FIXED_VOLTAGE

	select USE_OF

arch/arm/mach-dove/board-dt.c

+1 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <linux/init.h>

#include <linux/clk-provider.h>

#include <linux/clk/mvebu.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/platform_data/usb-ehci-orion.h>
@@ -49,7 +48,7 @@ static void __init dove_legacy_clk_init(void) 


static void __init dove_of_clk_init(void)

{

	mvebu_clocks_init();

	of_clk_init(NULL);

	dove_legacy_clk_init();

}

arch/arm/mach-dove/common.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 */



#include <linux/clk-provider.h>

#include <linux/clk/mvebu.h>

#include <linux/dma-mapping.h>

#include <linux/init.h>

#include <linux/of.h>

arch/arm/mach-kirkwood/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -128,13 +128,12 @@ comment "Device tree entries" 


config ARCH_KIRKWOOD_DT

	bool "Marvell Kirkwood Flattened Device Tree"

	select KIRKWOOD_CLK

	select POWER_SUPPLY

	select POWER_RESET

	select POWER_RESET_GPIO

	select REGULATOR

	select REGULATOR_FIXED_VOLTAGE

	select MVEBU_CLK_CORE

	select MVEBU_CLK_GATING

	select USE_OF

	help

	  Say 'Y' here if you want your kernel to support the

arch/arm/mach-kirkwood/board-dt.c

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/clk-provider.h>

#include <linux/clk/mvebu.h>

#include <linux/kexec.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -72,7 +71,7 @@ static void __init kirkwood_legacy_clk_init(void) 


static void __init kirkwood_of_clk_init(void)

{

	mvebu_clocks_init();

	of_clk_init(NULL);

	kirkwood_legacy_clk_init();

}