diff options
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r-- | arch/arm/mach-mvebu/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 5dcb369b58aa..99df4df680fd 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile | |||
@@ -1,6 +1,8 @@ | |||
1 | ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ | 1 | ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ |
2 | -I$(srctree)/arch/arm/plat-orion/include | 2 | -I$(srctree)/arch/arm/plat-orion/include |
3 | 3 | ||
4 | AFLAGS_coherency_ll.o := -Wa,-march=armv7-a | ||
5 | |||
4 | obj-y += system-controller.o | 6 | obj-y += system-controller.o |
5 | obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o coherency.o coherency_ll.o pmsu.o | 7 | obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o coherency.o coherency_ll.o pmsu.o |
6 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o | 8 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o |
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 7434b5e36197..a5ea616d6d12 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c | |||
@@ -56,10 +56,6 @@ void __init armada_370_xp_init_early(void) | |||
56 | init_dma_coherent_pool_size(SZ_1M); | 56 | init_dma_coherent_pool_size(SZ_1M); |
57 | } | 57 | } |
58 | 58 | ||
59 | struct sys_timer armada_370_xp_timer = { | ||
60 | .init = armada_370_xp_timer_and_clk_init, | ||
61 | }; | ||
62 | |||
63 | static void __init armada_370_xp_dt_init(void) | 59 | static void __init armada_370_xp_dt_init(void) |
64 | { | 60 | { |
65 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 61 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
@@ -78,7 +74,7 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") | |||
78 | .init_early = armada_370_xp_init_early, | 74 | .init_early = armada_370_xp_init_early, |
79 | .init_irq = armada_370_xp_init_irq, | 75 | .init_irq = armada_370_xp_init_irq, |
80 | .handle_irq = armada_370_xp_handle_irq, | 76 | .handle_irq = armada_370_xp_handle_irq, |
81 | .timer = &armada_370_xp_timer, | 77 | .init_time = armada_370_xp_timer_and_clk_init, |
82 | .restart = mvebu_restart, | 78 | .restart = mvebu_restart, |
83 | .dt_compat = armada_370_xp_dt_compat, | 79 | .dt_compat = armada_370_xp_dt_compat, |
84 | MACHINE_END | 80 | MACHINE_END |