6b783f7c5d
irq_domain_add_simple() was a stop-gap measure until complete irq_domain support was complete. This patch removes the irq_domain_add_simple() interface. This patch also drops the explicit irq_domain initialization performed by the mach-versatile code because the versatile interrupt controller already has irq_domain support built into it. This was a bug that was hanging around quietly for a while, but with the full irq_domain which actually verifies that irq_domain ranges are available it would cause the registration to fail and the system wouldn't boot. v4: Fixed number of irqs in mx5 gpio code v2: Updated to pass in host_data pointer on irq_domain allocation. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Milton Miller <miltonm@bga.com> Cc: Russell King <linux@arm.linux.org.uk> Tested-by: Olof Johansson <olof@lixom.net>
151 lines
3.9 KiB
C
151 lines
3.9 KiB
C
/* Copyright (c) 2010, 2011, Code Aurora Forum. 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/kernel.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/memblock.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/hardware/gic.h>
|
|
#include <asm/setup.h>
|
|
|
|
#include <mach/board.h>
|
|
#include <mach/msm_iomap.h>
|
|
|
|
static void __init msm8x60_fixup(struct tag *tag, char **cmdline,
|
|
struct meminfo *mi)
|
|
{
|
|
for (; tag->hdr.size; tag = tag_next(tag))
|
|
if (tag->hdr.tag == ATAG_MEM &&
|
|
tag->u.mem.start == 0x40200000) {
|
|
tag->u.mem.start = 0x40000000;
|
|
tag->u.mem.size += SZ_2M;
|
|
}
|
|
}
|
|
|
|
static void __init msm8x60_reserve(void)
|
|
{
|
|
memblock_remove(0x40000000, SZ_2M);
|
|
}
|
|
|
|
static void __init msm8x60_map_io(void)
|
|
{
|
|
msm_map_msm8x60_io();
|
|
}
|
|
|
|
static void __init msm8x60_init_irq(void)
|
|
{
|
|
gic_init(0, GIC_PPI_START, MSM_QGIC_DIST_BASE,
|
|
(void *)MSM_QGIC_CPU_BASE);
|
|
|
|
/* Edge trigger PPIs except AVS_SVICINT and AVS_SVICINTSWDONE */
|
|
writel(0xFFFFD7FF, MSM_QGIC_DIST_BASE + GIC_DIST_CONFIG + 4);
|
|
|
|
/* RUMI does not adhere to GIC spec by enabling STIs by default.
|
|
* Enable/clear is supposed to be RO for STIs, but is RW on RUMI.
|
|
*/
|
|
if (!machine_is_msm8x60_sim())
|
|
writel(0x0000FFFF, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);
|
|
}
|
|
|
|
static void __init msm8x60_init(void)
|
|
{
|
|
}
|
|
|
|
#ifdef CONFIG_OF
|
|
static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = {
|
|
{}
|
|
};
|
|
|
|
static struct of_device_id msm_dt_gic_match[] __initdata = {
|
|
{ .compatible = "qcom,msm-8660-qgic", },
|
|
{}
|
|
};
|
|
|
|
static void __init msm8x60_dt_init(void)
|
|
{
|
|
irq_domain_generate_simple(msm_dt_gic_match, MSM8X60_QGIC_DIST_PHYS,
|
|
GIC_SPI_START);
|
|
|
|
if (of_machine_is_compatible("qcom,msm8660-surf")) {
|
|
printk(KERN_INFO "Init surf UART registers\n");
|
|
msm8x60_init_uart12dm();
|
|
}
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table,
|
|
msm_auxdata_lookup, NULL);
|
|
}
|
|
|
|
static const char *msm8x60_fluid_match[] __initdata = {
|
|
"qcom,msm8660-fluid",
|
|
"qcom,msm8660-surf",
|
|
NULL
|
|
};
|
|
#endif /* CONFIG_OF */
|
|
|
|
MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3")
|
|
.fixup = msm8x60_fixup,
|
|
.reserve = msm8x60_reserve,
|
|
.map_io = msm8x60_map_io,
|
|
.init_irq = msm8x60_init_irq,
|
|
.handle_irq = gic_handle_irq,
|
|
.init_machine = msm8x60_init,
|
|
.timer = &msm_timer,
|
|
MACHINE_END
|
|
|
|
MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF")
|
|
.fixup = msm8x60_fixup,
|
|
.reserve = msm8x60_reserve,
|
|
.map_io = msm8x60_map_io,
|
|
.init_irq = msm8x60_init_irq,
|
|
.handle_irq = gic_handle_irq,
|
|
.init_machine = msm8x60_init,
|
|
.timer = &msm_timer,
|
|
MACHINE_END
|
|
|
|
MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR")
|
|
.fixup = msm8x60_fixup,
|
|
.reserve = msm8x60_reserve,
|
|
.map_io = msm8x60_map_io,
|
|
.init_irq = msm8x60_init_irq,
|
|
.handle_irq = gic_handle_irq,
|
|
.init_machine = msm8x60_init,
|
|
.timer = &msm_timer,
|
|
MACHINE_END
|
|
|
|
MACHINE_START(MSM8X60_FFA, "QCT MSM8X60 FFA")
|
|
.fixup = msm8x60_fixup,
|
|
.reserve = msm8x60_reserve,
|
|
.map_io = msm8x60_map_io,
|
|
.init_irq = msm8x60_init_irq,
|
|
.handle_irq = gic_handle_irq,
|
|
.init_machine = msm8x60_init,
|
|
.timer = &msm_timer,
|
|
MACHINE_END
|
|
|
|
#ifdef CONFIG_OF
|
|
/* TODO: General device tree support for all MSM. */
|
|
DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
|
|
.map_io = msm8x60_map_io,
|
|
.init_irq = msm8x60_init_irq,
|
|
.init_machine = msm8x60_dt_init,
|
|
.timer = &msm_timer,
|
|
.dt_compat = msm8x60_fluid_match,
|
|
MACHINE_END
|
|
#endif /* CONFIG_OF */
|