66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
62 lines
1.5 KiB
C
62 lines
1.5 KiB
C
/*
|
|
* intc2.c -- support for the 2nd INTC controller of the 5249
|
|
*
|
|
* (C) Copyright 2009, Greg Ungerer <gerg@snapgear.com>
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/io.h>
|
|
#include <asm/coldfire.h>
|
|
#include <asm/mcfsim.h>
|
|
|
|
static void intc2_irq_gpio_mask(struct irq_data *d)
|
|
{
|
|
u32 imr;
|
|
imr = readl(MCF_MBAR2 + MCFSIM2_GPIOINTENABLE);
|
|
imr &= ~(0x1 << (d->irq - MCFINTC2_GPIOIRQ0));
|
|
writel(imr, MCF_MBAR2 + MCFSIM2_GPIOINTENABLE);
|
|
}
|
|
|
|
static void intc2_irq_gpio_unmask(struct irq_data *d)
|
|
{
|
|
u32 imr;
|
|
imr = readl(MCF_MBAR2 + MCFSIM2_GPIOINTENABLE);
|
|
imr |= (0x1 << (d->irq - MCFINTC2_GPIOIRQ0));
|
|
writel(imr, MCF_MBAR2 + MCFSIM2_GPIOINTENABLE);
|
|
}
|
|
|
|
static void intc2_irq_gpio_ack(struct irq_data *d)
|
|
{
|
|
writel(0x1 << (d->irq - MCFINTC2_GPIOIRQ0), MCF_MBAR2 + MCFSIM2_GPIOINTCLEAR);
|
|
}
|
|
|
|
static struct irq_chip intc2_irq_gpio_chip = {
|
|
.name = "CF-INTC2",
|
|
.irq_mask = intc2_irq_gpio_mask,
|
|
.irq_unmask = intc2_irq_gpio_unmask,
|
|
.irq_ack = intc2_irq_gpio_ack,
|
|
};
|
|
|
|
static int __init mcf_intc2_init(void)
|
|
{
|
|
int irq;
|
|
|
|
/* GPIO interrupt sources */
|
|
for (irq = MCFINTC2_GPIOIRQ0; (irq <= MCFINTC2_GPIOIRQ7); irq++) {
|
|
set_irq_chip(irq, &intc2_irq_gpio_chip);
|
|
set_irq_handler(irq, handle_edge_irq);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
arch_initcall(mcf_intc2_init);
|