forked from luck/tmp_suning_uos_patched
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
129 lines
3.5 KiB
C
129 lines
3.5 KiB
C
/*
|
|
* linux/arch/arm/mach-ep93xx/micro9.c
|
|
*
|
|
* Copyright (C) 2006 Contec Steuerungstechnik & Automation GmbH
|
|
* Manfred Gruber <m.gruber@tirol.com>
|
|
* Copyright (C) 2009 Contec Steuerungstechnik & Automation GmbH
|
|
* Hubert Feurstein <hubert.feurstein@contec.at>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <mach/hardware.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include "soc.h"
|
|
|
|
/*************************************************************************
|
|
* Micro9 NOR Flash
|
|
*
|
|
* Micro9-High has up to 64MB of 32-bit flash on CS1
|
|
* Micro9-Mid has up to 64MB of either 32-bit or 16-bit flash on CS1
|
|
* Micro9-Lite uses a separate MTD map driver for flash support
|
|
* Micro9-Slim has up to 64MB of either 32-bit or 16-bit flash on CS1
|
|
*************************************************************************/
|
|
static unsigned int __init micro9_detect_bootwidth(void)
|
|
{
|
|
u32 v;
|
|
|
|
/* Detect the bus width of the external flash memory */
|
|
v = __raw_readl(EP93XX_SYSCON_SYSCFG);
|
|
if (v & EP93XX_SYSCON_SYSCFG_LCSN7)
|
|
return 4; /* 32-bit */
|
|
else
|
|
return 2; /* 16-bit */
|
|
}
|
|
|
|
static void __init micro9_register_flash(void)
|
|
{
|
|
unsigned int width;
|
|
|
|
if (machine_is_micro9())
|
|
width = 4;
|
|
else if (machine_is_micro9m() || machine_is_micro9s())
|
|
width = micro9_detect_bootwidth();
|
|
else
|
|
width = 0;
|
|
|
|
if (width)
|
|
ep93xx_register_flash(width, EP93XX_CS1_PHYS_BASE, SZ_64M);
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
* Micro9 Ethernet
|
|
*************************************************************************/
|
|
static struct ep93xx_eth_data __initdata micro9_eth_data = {
|
|
.phy_id = 0x1f,
|
|
};
|
|
|
|
|
|
static void __init micro9_init_machine(void)
|
|
{
|
|
ep93xx_init_devices();
|
|
ep93xx_register_eth(µ9_eth_data, 1);
|
|
micro9_register_flash();
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_MACH_MICRO9H
|
|
MACHINE_START(MICRO9, "Contec Micro9-High")
|
|
/* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */
|
|
.atag_offset = 0x100,
|
|
.map_io = ep93xx_map_io,
|
|
.init_irq = ep93xx_init_irq,
|
|
.init_time = ep93xx_timer_init,
|
|
.init_machine = micro9_init_machine,
|
|
.init_late = ep93xx_init_late,
|
|
.restart = ep93xx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_MICRO9M
|
|
MACHINE_START(MICRO9M, "Contec Micro9-Mid")
|
|
/* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */
|
|
.atag_offset = 0x100,
|
|
.map_io = ep93xx_map_io,
|
|
.init_irq = ep93xx_init_irq,
|
|
.init_time = ep93xx_timer_init,
|
|
.init_machine = micro9_init_machine,
|
|
.init_late = ep93xx_init_late,
|
|
.restart = ep93xx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_MICRO9L
|
|
MACHINE_START(MICRO9L, "Contec Micro9-Lite")
|
|
/* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */
|
|
.atag_offset = 0x100,
|
|
.map_io = ep93xx_map_io,
|
|
.init_irq = ep93xx_init_irq,
|
|
.init_time = ep93xx_timer_init,
|
|
.init_machine = micro9_init_machine,
|
|
.init_late = ep93xx_init_late,
|
|
.restart = ep93xx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_MICRO9S
|
|
MACHINE_START(MICRO9S, "Contec Micro9-Slim")
|
|
/* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */
|
|
.atag_offset = 0x100,
|
|
.map_io = ep93xx_map_io,
|
|
.init_irq = ep93xx_init_irq,
|
|
.init_time = ep93xx_timer_init,
|
|
.init_machine = micro9_init_machine,
|
|
.init_late = ep93xx_init_late,
|
|
.restart = ep93xx_restart,
|
|
MACHINE_END
|
|
#endif
|