Use irq_set_chip_and_handler() instead. Converted with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
		
			
				
	
	
		
			143 lines
		
	
	
	
		
			3.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			143 lines
		
	
	
	
		
			3.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  linux/arch/arm/mach-clps711x/irq.c
 | 
						|
 *
 | 
						|
 *  Copyright (C) 2000 Deep Blue Solutions Ltd.
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2 of the License, or
 | 
						|
 * (at your option) any later version.
 | 
						|
 *
 | 
						|
 * 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.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
						|
 */
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/list.h>
 | 
						|
#include <linux/io.h>
 | 
						|
 | 
						|
#include <asm/mach/irq.h>
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <asm/irq.h>
 | 
						|
 | 
						|
#include <asm/hardware/clps7111.h>
 | 
						|
 | 
						|
static void int1_mask(struct irq_data *d)
 | 
						|
{
 | 
						|
	u32 intmr1;
 | 
						|
 | 
						|
	intmr1 = clps_readl(INTMR1);
 | 
						|
	intmr1 &= ~(1 << d->irq);
 | 
						|
	clps_writel(intmr1, INTMR1);
 | 
						|
}
 | 
						|
 | 
						|
static void int1_ack(struct irq_data *d)
 | 
						|
{
 | 
						|
	u32 intmr1;
 | 
						|
 | 
						|
	intmr1 = clps_readl(INTMR1);
 | 
						|
	intmr1 &= ~(1 << d->irq);
 | 
						|
	clps_writel(intmr1, INTMR1);
 | 
						|
 | 
						|
	switch (d->irq) {
 | 
						|
	case IRQ_CSINT:  clps_writel(0, COEOI);  break;
 | 
						|
	case IRQ_TC1OI:  clps_writel(0, TC1EOI); break;
 | 
						|
	case IRQ_TC2OI:  clps_writel(0, TC2EOI); break;
 | 
						|
	case IRQ_RTCMI:  clps_writel(0, RTCEOI); break;
 | 
						|
	case IRQ_TINT:   clps_writel(0, TEOI);   break;
 | 
						|
	case IRQ_UMSINT: clps_writel(0, UMSEOI); break;
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static void int1_unmask(struct irq_data *d)
 | 
						|
{
 | 
						|
	u32 intmr1;
 | 
						|
 | 
						|
	intmr1 = clps_readl(INTMR1);
 | 
						|
	intmr1 |= 1 << d->irq;
 | 
						|
	clps_writel(intmr1, INTMR1);
 | 
						|
}
 | 
						|
 | 
						|
static struct irq_chip int1_chip = {
 | 
						|
	.irq_ack	= int1_ack,
 | 
						|
	.irq_mask	= int1_mask,
 | 
						|
	.irq_unmask	= int1_unmask,
 | 
						|
};
 | 
						|
 | 
						|
static void int2_mask(struct irq_data *d)
 | 
						|
{
 | 
						|
	u32 intmr2;
 | 
						|
 | 
						|
	intmr2 = clps_readl(INTMR2);
 | 
						|
	intmr2 &= ~(1 << (d->irq - 16));
 | 
						|
	clps_writel(intmr2, INTMR2);
 | 
						|
}
 | 
						|
 | 
						|
static void int2_ack(struct irq_data *d)
 | 
						|
{
 | 
						|
	u32 intmr2;
 | 
						|
 | 
						|
	intmr2 = clps_readl(INTMR2);
 | 
						|
	intmr2 &= ~(1 << (d->irq - 16));
 | 
						|
	clps_writel(intmr2, INTMR2);
 | 
						|
 | 
						|
	switch (d->irq) {
 | 
						|
	case IRQ_KBDINT: clps_writel(0, KBDEOI); break;
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static void int2_unmask(struct irq_data *d)
 | 
						|
{
 | 
						|
	u32 intmr2;
 | 
						|
 | 
						|
	intmr2 = clps_readl(INTMR2);
 | 
						|
	intmr2 |= 1 << (d->irq - 16);
 | 
						|
	clps_writel(intmr2, INTMR2);
 | 
						|
}
 | 
						|
 | 
						|
static struct irq_chip int2_chip = {
 | 
						|
	.irq_ack	= int2_ack,
 | 
						|
	.irq_mask	= int2_mask,
 | 
						|
	.irq_unmask	= int2_unmask,
 | 
						|
};
 | 
						|
 | 
						|
void __init clps711x_init_irq(void)
 | 
						|
{
 | 
						|
	unsigned int i;
 | 
						|
 | 
						|
	for (i = 0; i < NR_IRQS; i++) {
 | 
						|
	        if (INT1_IRQS & (1 << i)) {
 | 
						|
	        	irq_set_chip_and_handler(i, &int1_chip,
 | 
						|
						 handle_level_irq);
 | 
						|
	        	set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
 | 
						|
		}
 | 
						|
		if (INT2_IRQS & (1 << i)) {
 | 
						|
			irq_set_chip_and_handler(i, &int2_chip,
 | 
						|
						 handle_level_irq);
 | 
						|
			set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
 | 
						|
		}			
 | 
						|
	}
 | 
						|
 | 
						|
	/*
 | 
						|
	 * Disable interrupts
 | 
						|
	 */
 | 
						|
	clps_writel(0, INTMR1);
 | 
						|
	clps_writel(0, INTMR2);
 | 
						|
 | 
						|
	/*
 | 
						|
	 * Clear down any pending interrupts
 | 
						|
	 */
 | 
						|
	clps_writel(0, COEOI);
 | 
						|
	clps_writel(0, TC1EOI);
 | 
						|
	clps_writel(0, TC2EOI);
 | 
						|
	clps_writel(0, RTCEOI);
 | 
						|
	clps_writel(0, TEOI);
 | 
						|
	clps_writel(0, UMSEOI);
 | 
						|
	clps_writel(0, SYNCIO);
 | 
						|
	clps_writel(0, KBDEOI);
 | 
						|
}
 |