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

Commit 9cbbc515 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper
Browse files

ARM: mvebu: move DT boards to SoC-centric clock init 



SoC centric clock init for Armada 370/XP can be used by calling of_clk_init.
Use it and get rid of mvebu_clocks_init.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarMike Turquette <mturquette@linaro.org>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent ed9f30a2

arch/arm/mach-mvebu/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ config ARCH_MVEBU 
	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 MIGHT_HAVE_PCI
@@ -31,6 +28,7 @@ config MACH_ARMADA_370_XP 


config MACH_ARMADA_370

	bool "Marvell Armada 370 boards"

	select ARMADA_370_CLK

	select MACH_ARMADA_370_XP

	select PINCTRL_ARMADA_370

	help
@@ -39,6 +37,7 @@ config MACH_ARMADA_370 


config MACH_ARMADA_XP

	bool "Marvell Armada XP boards"

	select ARMADA_XP_CLK

	select MACH_ARMADA_370_XP

	select PINCTRL_ARMADA_XP

	help

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

+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk-provider.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>
@@ -45,7 +45,7 @@ void __init armada_370_xp_map_io(void) 


void __init armada_370_xp_timer_and_clk_init(void)

{

	mvebu_clocks_init();

	of_clk_init(NULL);

	armada_370_xp_timer_init();

}