mirror of
https://github.com/torvalds/linux
synced 2024-10-17 16:58:15 +00:00
f8060f5446
This creates irqchip initialization infrastructure from Thomas Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips and adapted to use the new infrastructure. All DT enabled platforms using GIC and VIC are converted over to use the new irqchip_init. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJQ8ZobAAoJEMhvYp4jgsXiihIH/2VvxmSHZb0e3jN6AR0B42b7 9EwX0IE0B23t91hNTwdzzmTJQYA7pMmWkgHNfd3vIeqSepJAmrVv/gp4iM9CtPwE KNh+kDWOK2ZsOH4Vb0lYRJHN8WQOIQHuCUr9+MdYLNOgf/pPL6G/Y9kv9A1e7fTC W+tFRjC5N1ilZMGyowX12L1wnwDk6kHzed6YV6bskC17cZ9/pg8PhSVbM4A/3kAv NXYKqbXJb+eCsWGXg/knZXOL6V9gBwvVYoe4O9X3nQ0226AWB9caad8l8tchAjRB fmrYF1tbkpOWPnLxhvQy5b5MJichJgTMJHh7RgiEcc/3f63kOljjlx4QKiqHvT0= =q7gm -----END PGP SIGNATURE----- Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next/cleanup From Rob Herring: Initial irqchip init infrastructure and GIC and VIC clean-ups This creates irqchip initialization infrastructure from Thomas Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips and adapted to use the new infrastructure. All DT enabled platforms using GIC and VIC are converted over to use the new irqchip_init. * tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux: irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h ARM: picoxcell: use common irqchip_init function ARM: spear: use common irqchip_init function irqchip: Move ARM VIC to drivers/irqchip ARM: samsung: remove unused tick.h ARM: remove unneeded vic.h includes ARM: remove mach .handle_irq for VIC users ARM: VIC: set handle_arch_irq in VIC initialization ARM: VIC: shrink down vic.h irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h ARM: use common irqchip_init for GIC init irqchip: Move ARM GIC to drivers/irqchip ARM: remove mach .handle_irq for GIC users ARM: GIC: set handle_arch_irq in GIC initialization ARM: GIC: remove direct use of gic_raise_softirq ARM: GIC: remove assembly ifdefs from gic.h ARM: mach-ux500: use SGI0 to wake up the other core arm: add set_handle_irq() to register the parent IRQ controller handler function irqchip: add basic infrastructure irqchip: add to the directories part of the IRQ subsystem in MAINTAINERS Fixed up massive merge conflicts with the timer cleanup due to adjacent changes: Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/mach-bcm/board_bcm.c arch/arm/mach-cns3xxx/cns3420vb.c arch/arm/mach-ep93xx/adssphere.c arch/arm/mach-ep93xx/edb93xx.c arch/arm/mach-ep93xx/gesbc9312.c arch/arm/mach-ep93xx/micro9.c arch/arm/mach-ep93xx/simone.c arch/arm/mach-ep93xx/snappercl15.c arch/arm/mach-ep93xx/ts72xx.c arch/arm/mach-ep93xx/vision_ep9307.c arch/arm/mach-highbank/highbank.c arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-msm/board-dt-8960.c arch/arm/mach-netx/nxdb500.c arch/arm/mach-netx/nxdkn.c arch/arm/mach-netx/nxeb500hmi.c arch/arm/mach-nomadik/board-nhk8815.c arch/arm/mach-picoxcell/common.c arch/arm/mach-realview/realview_eb.c arch/arm/mach-realview/realview_pb1176.c arch/arm/mach-realview/realview_pb11mp.c arch/arm/mach-realview/realview_pba8.c arch/arm/mach-realview/realview_pbx.c arch/arm/mach-socfpga/socfpga.c arch/arm/mach-spear13xx/spear1310.c arch/arm/mach-spear13xx/spear1340.c arch/arm/mach-spear13xx/spear13xx.c arch/arm/mach-spear3xx/spear300.c arch/arm/mach-spear3xx/spear310.c arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear3xx/spear3xx.c arch/arm/mach-spear6xx/spear6xx.c arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/board-dt-tegra30.c arch/arm/mach-u300/core.c arch/arm/mach-ux500/board-mop500.c arch/arm/mach-ux500/cpu-db8500.c arch/arm/mach-versatile/versatile_ab.c arch/arm/mach-versatile/versatile_dt.c arch/arm/mach-versatile/versatile_pb.c arch/arm/mach-vexpress/v2m.c include/asm-generic/vmlinux.lds.h
96 lines
2.4 KiB
C
96 lines
2.4 KiB
C
/*
|
|
* Copyright (c) 2011 Picochip Ltd., Jamie Iles
|
|
*
|
|
* 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
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* All enquiries to support@picochip.com
|
|
*/
|
|
#include <linux/delay.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/irqchip.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/dw_apb_timer.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include "common.h"
|
|
|
|
#define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000)
|
|
#define PICOXCELL_PERIPH_BASE 0x80000000
|
|
#define PICOXCELL_PERIPH_LENGTH SZ_4M
|
|
|
|
#define WDT_CTRL_REG_EN_MASK (1 << 0)
|
|
#define WDT_CTRL_REG_OFFS (0x00)
|
|
#define WDT_TIMEOUT_REG_OFFS (0x04)
|
|
static void __iomem *wdt_regs;
|
|
|
|
/*
|
|
* The machine restart method can be called from an atomic context so we won't
|
|
* be able to ioremap the regs then.
|
|
*/
|
|
static void picoxcell_setup_restart(void)
|
|
{
|
|
struct device_node *np = of_find_compatible_node(NULL, NULL,
|
|
"snps,dw-apb-wdg");
|
|
if (WARN(!np, "unable to setup watchdog restart"))
|
|
return;
|
|
|
|
wdt_regs = of_iomap(np, 0);
|
|
WARN(!wdt_regs, "failed to remap watchdog regs");
|
|
}
|
|
|
|
static struct map_desc io_map __initdata = {
|
|
.virtual = PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
|
|
.pfn = __phys_to_pfn(PICOXCELL_PERIPH_BASE),
|
|
.length = PICOXCELL_PERIPH_LENGTH,
|
|
.type = MT_DEVICE,
|
|
};
|
|
|
|
static void __init picoxcell_map_io(void)
|
|
{
|
|
iotable_init(&io_map, 1);
|
|
}
|
|
|
|
static void __init picoxcell_init_machine(void)
|
|
{
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
picoxcell_setup_restart();
|
|
}
|
|
|
|
static const char *picoxcell_dt_match[] = {
|
|
"picochip,pc3x2",
|
|
"picochip,pc3x3",
|
|
NULL
|
|
};
|
|
|
|
static void picoxcell_wdt_restart(char mode, const char *cmd)
|
|
{
|
|
/*
|
|
* Configure the watchdog to reset with the shortest possible timeout
|
|
* and give it chance to do the reset.
|
|
*/
|
|
if (wdt_regs) {
|
|
writel_relaxed(WDT_CTRL_REG_EN_MASK, wdt_regs + WDT_CTRL_REG_OFFS);
|
|
writel_relaxed(0, wdt_regs + WDT_TIMEOUT_REG_OFFS);
|
|
/* No sleeping, possibly atomic. */
|
|
mdelay(500);
|
|
}
|
|
}
|
|
|
|
DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
|
|
.map_io = picoxcell_map_io,
|
|
.nr_irqs = NR_IRQS_LEGACY,
|
|
.init_irq = irqchip_init,
|
|
.init_time = dw_apb_timer_init,
|
|
.init_machine = picoxcell_init_machine,
|
|
.dt_compat = picoxcell_dt_match,
|
|
.restart = picoxcell_wdt_restart,
|
|
MACHINE_END
|