diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-02-17 15:23:19 +0100 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 00:41:06 +0000 |
commit | 99b3d2946253713e8c7aa6544cb9474b0e226843 (patch) | |
tree | 0063ea6b143993d38c3c531942db365e1496847e /arch/arm/mach-mvebu/armada-370-xp.c | |
parent | d181e69c91718a3c7b727596cb06ce0fb39b41d1 (diff) | |
download | op-kernel-dev-99b3d2946253713e8c7aa6544cb9474b0e226843.zip op-kernel-dev-99b3d2946253713e8c7aa6544cb9474b0e226843.tar.gz |
ARM: mvebu: rename armada-370-xp.c to board-v7.c
In preparation to the introduction of the support of Armada 375 and
Armada 38x, this commit renames arch/arm/mach-mvebu/armada-370-xp.c to
arch/arm/mach-mvebu/board-v7.c. The board-v7.c name as we expect this
file to ultimately contain the DT_MACHINE_START definitions for all
ARMv7 Marvell EBU platforms (370, 375, 38x, XP and Dove as of today).
In relation to this file rename, this commit also:
* Renames the hidden Kconfig symbol MACH_ARMADA_370_XP to
MACH_MVEBU_V7. This hidden symbol is selected by the various
per-SoC visible Kconfig options to trigger the build of board-v7.c.
* Renames a certain number of functions in board-v7.c so that their
armada_370_xp prefix is replaced by a mvebu prefix. The .dt_compat
array keeps its armada_370_xp prefix because the new SOCs will be
introduced with separate .dt_compat arrays, due to the need for
different SMP operations.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-mvebu/armada-370-xp.c')
-rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c deleted file mode 100644 index 161cf2f..0000000 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Device Tree support for Armada 370 and XP platforms. - * - * Copyright (C) 2012 Marvell - * - * Lior Amsalem <alior@marvell.com> - * Gregory CLEMENT <gregory.clement@free-electrons.com> - * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/clk-provider.h> -#include <linux/of_address.h> -#include <linux/of_platform.h> -#include <linux/io.h> -#include <linux/clocksource.h> -#include <linux/dma-mapping.h> -#include <linux/mbus.h> -#include <linux/slab.h> -#include <asm/hardware/cache-l2x0.h> -#include <asm/mach/arch.h> -#include <asm/mach/map.h> -#include <asm/mach/time.h> -#include "armada-370-xp.h" -#include "common.h" -#include "coherency.h" -#include "mvebu-soc-id.h" - -static void __init armada_370_xp_timer_and_clk_init(void) -{ - of_clk_init(NULL); - clocksource_of_init(); - coherency_init(); - BUG_ON(mvebu_mbus_dt_init()); -#ifdef CONFIG_CACHE_L2X0 - l2x0_of_init(0, ~0UL); -#endif -} - -static void __init i2c_quirk(void) -{ - struct device_node *np; - u32 dev, rev; - - /* - * Only revisons more recent than A0 support the offload - * mechanism. We can exit only if we are sure that we can - * get the SoC revision and it is more recent than A0. - */ - if (mvebu_get_soc_id(&rev, &dev) == 0 && dev > MV78XX0_A0_REV) - return; - - for_each_compatible_node(np, NULL, "marvell,mv78230-i2c") { - struct property *new_compat; - - new_compat = kzalloc(sizeof(*new_compat), GFP_KERNEL); - - new_compat->name = kstrdup("compatible", GFP_KERNEL); - new_compat->length = sizeof("marvell,mv78230-a0-i2c"); - new_compat->value = kstrdup("marvell,mv78230-a0-i2c", - GFP_KERNEL); - - of_update_property(np, new_compat); - } - return; -} - -static void __init armada_370_xp_dt_init(void) -{ - if (of_machine_is_compatible("plathome,openblocks-ax3-4")) - i2c_quirk(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - -static const char * const armada_370_xp_dt_compat[] = { - "marvell,armada-370-xp", - NULL, -}; - -DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") - .smp = smp_ops(armada_xp_smp_ops), - .init_machine = armada_370_xp_dt_init, - .init_time = armada_370_xp_timer_and_clk_init, - .restart = mvebu_restart, - .dt_compat = armada_370_xp_dt_compat, -MACHINE_END |