diff options
Diffstat (limited to 'arch/arm/mach-mmp/mmp2-dt.c')
| -rw-r--r-- | arch/arm/mach-mmp/mmp2-dt.c | 50 |
1 files changed, 14 insertions, 36 deletions
diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c index 4ac256720f7d..e5ddc327651b 100644 --- a/arch/arm/mach-mmp/mmp2-dt.c +++ b/arch/arm/mach-mmp/mmp2-dt.c @@ -1,56 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/arch/arm/mach-mmp/mmp2-dt.c * * Copyright (C) 2012 Marvell Technology Group Ltd. * Author: Haojian Zhuang <haojian.zhuang@marvell.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * publishhed by the Free Software Foundation. */ -#include <linux/io.h> -#include <linux/irq.h> -#include <linux/irqdomain.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> +#include <linux/of_clk.h> +#include <linux/clocksource.h> #include <asm/mach/arch.h> -#include <asm/mach/time.h> -#include <mach/irqs.h> -#include <mach/regs-apbc.h> +#include <asm/hardware/cache-tauros2.h> #include "common.h" -extern void __init mmp_dt_irq_init(void); -extern void __init mmp_dt_init_timer(void); - -static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = { - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4030000, "pxa2xx-uart.0", NULL), - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.1", NULL), - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.2", NULL), - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4016000, "pxa2xx-uart.3", NULL), - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL), - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", NULL), - OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp2-gpio", NULL), - OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), - {} -}; - -static void __init mmp2_dt_init(void) +static void __init mmp_init_time(void) { - of_platform_populate(NULL, of_default_bus_match_table, - mmp2_auxdata_lookup, NULL); +#ifdef CONFIG_CACHE_TAUROS2 + tauros2_init(0); +#endif + of_clk_init(NULL); + timer_probe(); } -static const char *mmp2_dt_board_compat[] __initdata = { - "mrvl,mmp2-brownstone", +static const char *const mmp2_dt_board_compat[] __initconst = { + "mrvl,mmp2", NULL, }; DT_MACHINE_START(MMP2_DT, "Marvell MMP2 (Device Tree Support)") - .map_io = mmp_map_io, - .init_irq = mmp_dt_irq_init, - .init_time = mmp_dt_init_timer, - .init_machine = mmp2_dt_init, + .map_io = mmp2_map_io, + .init_time = mmp_init_time, .dt_compat = mmp2_dt_board_compat, MACHINE_END |