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>
51 lines
1.4 KiB
C
51 lines
1.4 KiB
C
/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 and
|
|
* only version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
|
|
#include <asm/hardware/gic.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include "common.h"
|
|
|
|
static const struct of_device_id msm_dt_gic_match[] __initconst = {
|
|
{ .compatible = "qcom,msm-qgic2", .data = gic_of_init },
|
|
{ }
|
|
};
|
|
|
|
static void __init msm_dt_init_irq(void)
|
|
{
|
|
of_irq_init(msm_dt_gic_match);
|
|
}
|
|
|
|
static void __init msm_dt_init(void)
|
|
{
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char * const msm8960_dt_match[] __initconst = {
|
|
"qcom,msm8960-cdp",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
|
|
.smp = smp_ops(msm_smp_ops),
|
|
.map_io = msm_map_msm8960_io,
|
|
.init_irq = msm_dt_init_irq,
|
|
.init_time = msm_dt_timer_init,
|
|
.init_machine = msm_dt_init,
|
|
.dt_compat = msm8960_dt_match,
|
|
.handle_irq = gic_handle_irq,
|
|
MACHINE_END
|