hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2013-05-11 03:08:09 +02:00 committed by Jason Cooper
parent ed9f30a273
commit 9cbbc51551
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-mvebu/Kconfig
View File

@ -10,9 +10,6 @@ config ARCH_MVEBU
select PLAT_ORION select PLAT_ORION
select SPARSE_IRQ select SPARSE_IRQ
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select MVEBU_CLK_CORE
select MVEBU_CLK_CPU
select MVEBU_CLK_GATING
select MVEBU_MBUS select MVEBU_MBUS
select ZONE_DMA if ARM_LPAE select ZONE_DMA if ARM_LPAE
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
@ -31,6 +28,7 @@ config MACH_ARMADA_370_XP
config MACH_ARMADA_370 config MACH_ARMADA_370
bool "Marvell Armada 370 boards" bool "Marvell Armada 370 boards"
select ARMADA_370_CLK
select MACH_ARMADA_370_XP select MACH_ARMADA_370_XP
select PINCTRL_ARMADA_370 select PINCTRL_ARMADA_370
help help
@ -39,6 +37,7 @@ config MACH_ARMADA_370
config MACH_ARMADA_XP config MACH_ARMADA_XP
bool "Marvell Armada XP boards" bool "Marvell Armada XP boards"
select ARMADA_XP_CLK
select MACH_ARMADA_370_XP select MACH_ARMADA_370_XP
select PINCTRL_ARMADA_XP select PINCTRL_ARMADA_XP
help help

4
arch/arm/mach-mvebu/armada-370-xp.c
View File

@ -14,10 +14,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/clk-provider.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/time-armada-370-xp.h> #include <linux/time-armada-370-xp.h>
#include <linux/clk/mvebu.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <linux/irqchip.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) void __init armada_370_xp_timer_and_clk_init(void)
{ {
mvebu_clocks_init(); of_clk_init(NULL);
armada_370_xp_timer_init(); armada_370_xp_timer_init();
} }