mirror of
https://github.com/torvalds/linux.git
synced 2024-11-02 02:01:29 +00:00
6bb27d7349
Now that the only field in struct sys_timer is .init, delete the struct, and replace the machine descriptor .timer field with the initialization function itself. This will enable moving timer drivers into drivers/clocksource without having to place a public prototype of each struct sys_timer object into include/linux; the intent is to create a single of_clocksource_init() function that determines which timer driver to initialize by scanning the device dtree, much like the proposed irqchip_init() at: http://www.spinics.net/lists/arm-kernel/msg203686.html Includes mach-omap2 fixes from Igor Grinberg. Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Stephen Warren <swarren@nvidia.com>
80 lines
2.6 KiB
C
80 lines
2.6 KiB
C
/*
|
|
* linux/arch/arm/mach-mmp/mmp-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/irq.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/time.h>
|
|
#include <mach/irqs.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 pxa168_auxdata_lookup[] __initconst = {
|
|
OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", 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("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),
|
|
{}
|
|
};
|
|
|
|
static const struct of_dev_auxdata pxa910_auxdata_lookup[] __initconst = {
|
|
OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),
|
|
OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),
|
|
{}
|
|
};
|
|
|
|
static void __init pxa168_dt_init(void)
|
|
{
|
|
of_platform_populate(NULL, of_default_bus_match_table,
|
|
pxa168_auxdata_lookup, NULL);
|
|
}
|
|
|
|
static void __init pxa910_dt_init(void)
|
|
{
|
|
of_platform_populate(NULL, of_default_bus_match_table,
|
|
pxa910_auxdata_lookup, NULL);
|
|
}
|
|
|
|
static const char *mmp_dt_board_compat[] __initdata = {
|
|
"mrvl,pxa168-aspenite",
|
|
"mrvl,pxa910-dkb",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)")
|
|
.map_io = mmp_map_io,
|
|
.init_irq = mmp_dt_irq_init,
|
|
.init_time = mmp_dt_init_timer,
|
|
.init_machine = pxa168_dt_init,
|
|
.dt_compat = mmp_dt_board_compat,
|
|
MACHINE_END
|
|
|
|
DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)")
|
|
.map_io = mmp_map_io,
|
|
.init_irq = mmp_dt_irq_init,
|
|
.init_time = mmp_dt_init_timer,
|
|
.init_machine = pxa910_dt_init,
|
|
.dt_compat = mmp_dt_board_compat,
|
|
MACHINE_END
|