IRQ handler rewrite by Gabor Juhos, uses C no longer assembly

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7464 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 351 insertions, 354 deletions

diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Makefile b/target/linux/adm5120-2.6/files/arch/mips/adm5120/Makefile
index f3e0e7f98..deb1adf7e 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Makefile
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/Makefile
@@ -2,7 +2,8 @@
 # Makefile for the ADMtek ADM5120 SoC specific parts of the kernel
 #
 
-obj-y  := setup.o prom.o irq.o memory.o int-handler.o adm5120_info.o
-obj-y  += gpio.o
+obj-y	:= setup.o prom.o irq.o memory.o adm5120_info.o
+obj-y	+= gpio.o
+obj-y	+= time.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/int-handler.S b/target/linux/adm5120-2.6/files/arch/mips/adm5120/int-handler.S
deleted file mode 100644
index f118fb402..000000000
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/int-handler.S
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 1999, 2000 MIPS Technologies, Inc.  All rights reserved.
- *
- * ########################################################################
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope 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.
- *
- * ########################################################################
- *
- * Interrupt exception dispatch code.
- *
- */
-#include <linux/autoconf.h>
-
-#include <asm/asm.h>
-#include <asm/mipsregs.h>
-#include <asm/regdef.h>
-#include <asm/stackframe.h>
-
-#define STATUS_IE	0x00000001
-
-/* A lot of complication here is taken away because:
- *
- * 1) We handle one interrupt and return, sitting in a loop and moving across
- *    all the pending IRQ bits in the cause register is _NOT_ the answer, the
- *    common case is one pending IRQ so optimize in that direction.
- *
- * 2) We need not check against bits in the status register IRQ mask, that
- *    would make this routine slow as hell.
- *
- * 3) Linux only thinks in terms of all IRQs on or all IRQs off, nothing in
- *    between like BSD spl() brain-damage.
- *
- * Furthermore, the IRQs on the MIPS board look basically (barring software
- * IRQs which we don't use at all and all external interrupt sources are
- * combined together on hardware interrupt 0 (MIPS IRQ 2)) like:
- *
- *	MIPS IRQ	Source
- *      --------        ------
- *             0	Software (ignored)
- *             1        Software (ignored)
- *             2        Combined hardware interrupt (hw0)
- *             3        Hardware (ignored)
- *             4        Hardware (ignored)
- *             5        Hardware (ignored)
- *             6        Hardware (ignored)
- *             7        R4k timer (what we use)
- *
- * Note: On the SEAD board thing are a little bit different.
- *       Here IRQ 2 (hw0) is wired to the UART0 and IRQ 3 (hw1) is wired
- *       wired to UART1.
- *	
- * We handle the IRQ according to _our_ priority which is:
- *
- * Highest ----     R4k Timer
- * Lowest  ----     Combined hardware interrupt
- *
- * then we just return, if multiple IRQs are pending then we will just take
- * another exception, big deal.
- */
-
-	.text
-	.set	noreorder
-	.set	noat
-	.align	5
-
-NESTED(mipsIRQ, PT_SIZE, sp)
-	SAVE_ALL
-	CLI
-	.set	at
-
-	mfc0	s0, CP0_CAUSE		
-	mfc0	s1, CP0_STATUS
-	and     s0, s0, s1
-	
-	/* First we check for r4k counter/timer IRQ. */
-	andi	a0, s0, CAUSEF_IP7
-	beq		a0, zero, 1f
-	nop
-
-	move	a0, sp
-	jal		mips_timer_interrupt
-	nop
-
-	j		ret_from_irq
-	nop				
-
-1:
-	andi	a0, s0, CAUSEF_IP2
-	beq		a0, zero, 1f	
-	nop
-	
-	move	a0, sp			
-	jal		adm5120_hw0_irqdispatch	 
-	nop
-1:
-	j		ret_from_irq
-	nop							
-
-END(mipsIRQ)
-
-
-LEAF(mips_int_lock)
-	.set noreorder
-	mfc0	v0, CP0_STATUS
-	li		v1, ~STATUS_IE
-	and		v1, v1, v0
-	mtc0	v1, CP0_STATUS
-	j		ra
-	and		v0, v0, STATUS_IE
-	.set reorder
-END(mips_int_lock)
-
-
-LEAF(mips_int_unlock)
-	mfc0	v0, CP0_STATUS
-	and		a0, a0, STATUS_IE
-	or		v0, v0, a0
-	mtc0	v0, CP0_STATUS
-	j		ra
-	nop
-END(mips_int_unlock)
-
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/irq.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/irq.c
index c53272e1e..3e14c92f1 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/irq.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/irq.c
@@ -1,157 +1,203 @@
 /*
- *	Copyright (C) ADMtek Incorporated.
- *		Creator : daniell@admtek.com.tw
- *	Carsten Langgaard, carstenl@mips.com
- *	Copyright (C) 2000, 2001 MIPS Technologies, Inc.
- *	Copyright (C) 2001 Ralf Baechle
- *	Copyright (C) 2005 Jeroen Vreeken (pe1rxq@amsat.org)
+ *  $Id$
+ *
+ *  ADM5120 specific interrupt handlers
+ *
+ *  Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
+ *  Copyright (C) 2007 OpenWrt.org
+ *
+ *  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., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
  */
 
-#include <linux/autoconf.h>
 #include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/version.h>
 #include <linux/interrupt.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/pm.h>
+#include <linux/ioport.h>
 
 #include <asm/irq.h>
-#include <asm/time.h>
-#include <asm/mipsregs.h>
-#include <asm/gdb-stub.h>
 #include <asm/irq_cpu.h>
+#include <asm/mipsregs.h>
+#include <asm/bitops.h>
+
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_irq.h>
+
+#define INTC_REG(r) (*(volatile u32 *)(KSEG1ADDR(ADM5120_INTC_BASE) + r))
+
+static void adm5120_intc_irq_unmask(unsigned int irq);
+static void adm5120_intc_irq_mask(unsigned int irq);
+static int  adm5120_intc_irq_set_type(unsigned int irq, unsigned int flow_type);
+
+static struct irq_chip adm5120_intc_irq_chip = {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+	.name 		= "INTC",
+#else
+	.typename 	= "INTC",
+#endif
+	.unmask 	= adm5120_intc_irq_unmask,
+	.mask 		= adm5120_intc_irq_mask,
+	.mask_ack	= adm5120_intc_irq_mask,
+	.set_type	= adm5120_intc_irq_set_type
+};
 
-#define MIPS_CPU_TIMER_IRQ 7
-
-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
-extern irq_desc_t irq_desc[];
-extern asmlinkage void mipsIRQ(void);
-
-int mips_int_lock(void);
-void mips_int_unlock(int);
-
-unsigned int mips_counter_frequency;
-
-#define ADM5120_INTC_REG(reg)	(*(volatile u32 *)(KSEG1ADDR(0x12200000+(reg))))
-#define ADM5120_INTC_STATUS	ADM5120_INTC_REG(0x00)
-#define ADM5120_INTC_ENABLE	ADM5120_INTC_REG(0x08)
-#define ADM5120_INTC_DISABLE	ADM5120_INTC_REG(0x0c)
-#define ADM5120_IRQ_MAX		9
-#define ADM5120_IRQ_MASK	0x3ff
+static struct irqaction adm5120_intc_irq_action = {
+	.handler 	= no_action,
+	.name 		= "cascade [INTC]"
+};
 
-void adm5120_hw0_irqdispatch(struct pt_regs *regs)
+static void adm5120_intc_irq_unmask(unsigned int irq)
 {
-	unsigned long intsrc;
-	int i;
-
-	intsrc = ADM5120_INTC_STATUS & ADM5120_IRQ_MASK;
-
-	if (intsrc) {
-		for (i = 0; intsrc; intsrc >>= 1, i++)
-			if (intsrc & 0x1)
-				do_IRQ(i);
-	} else
-		spurious_interrupt();
-}
+	unsigned long flags;
 
-void mips_timer_interrupt(struct pt_regs *regs)
-{
-        write_c0_compare(read_c0_count()+ mips_counter_frequency/HZ);
-        ll_timer_interrupt(MIPS_CPU_TIMER_IRQ);
+	irq -= ADM5120_INTC_IRQ_BASE;
+	local_irq_save(flags);
+	INTC_REG(INTC_REG_IRQ_ENABLE) = (1 << irq);
+	local_irq_restore(flags);
 }
 
-/* Main interrupt dispatcher */
-asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+static void adm5120_intc_irq_mask(unsigned int irq)
 {
-        unsigned int cp0_cause = read_c0_cause() & read_c0_status();
+	unsigned long flags;
 
-        if (cp0_cause & CAUSEF_IP7) {
-                mips_timer_interrupt( regs);
-        } else if (cp0_cause & CAUSEF_IP2) {
-                adm5120_hw0_irqdispatch( regs);
-        }
+	irq -= ADM5120_INTC_IRQ_BASE;
+	local_irq_save(flags);
+	INTC_REG(INTC_REG_IRQ_DISABLE) = (1 << irq);
+	local_irq_restore(flags);
 }
 
-void enable_adm5120_irq(unsigned int irq)
+static int adm5120_intc_irq_set_type(unsigned int irq, unsigned int flow_type)
 {
-	int s;
-
-	/* Disable all interrupts (FIQ/IRQ) */
-	s = mips_int_lock();
-
-	if ((irq < 0) || (irq > ADM5120_IRQ_MAX)) 
-		goto err_exit;
-
-	ADM5120_INTC_ENABLE = (1<<irq);
-
-err_exit:
-
-	/* Restore the interrupts states */
-	mips_int_unlock(s);
+	/* TODO: not yet tested */
+#if 1
+	unsigned int sense;
+	unsigned long mode;
+	int err;
+
+	err = 0;
+	sense = flow_type & (IRQ_TYPE_SENSE_MASK);
+	switch (sense) {
+	case IRQ_TYPE_NONE:
+	case IRQ_TYPE_LEVEL_HIGH:
+		break;
+	case IRQ_TYPE_LEVEL_LOW:
+		switch (irq) {
+		case ADM5120_IRQ_GPIO2:
+		case ADM5120_IRQ_GPIO4:
+			break;
+		default:
+			err = -EINVAL;
+			break;
+		}
+		break;
+	default:
+		err = -EINVAL;
+		break;
+	}
+	
+	if (err)
+		return err;
+	
+	switch (irq) {
+	case ADM5120_IRQ_GPIO2:
+	case ADM5120_IRQ_GPIO4:
+		mode = INTC_REG(INTC_REG_INT_MODE);
+		if (sense == IRQ_TYPE_LEVEL_LOW)
+			mode |= (1 << (irq-ADM5120_INTC_IRQ_BASE));
+		else
+			mode &= (1 << (irq-ADM5120_INTC_IRQ_BASE));
+			
+		INTC_REG(INTC_REG_INT_MODE) = mode;
+		/* fallthrogh */
+	default:
+		irq_desc[irq].status &= ~IRQ_TYPE_SENSE_MASK;
+		irq_desc[irq].status |= sense;
+		break;
+	}
+#endif
+	return 0;
 }
 
-
-void disable_adm5120_irq(unsigned int irq)
+static void adm5120_intc_irq_dispatch(void)
 {
-	int s;
-
-	/* Disable all interrupts (FIQ/IRQ) */
-	s = mips_int_lock();
+	unsigned long status;
+	int irq;
 
-	if ((irq < 0) || (irq > ADM5120_IRQ_MAX)) 
-		goto err_exit;
+#if 1
+	/* dispatch only one IRQ at a time */
+	status = INTC_REG(INTC_REG_IRQ_STATUS) & INTC_INT_ALL;
 
-	ADM5120_INTC_DISABLE = (1<<irq);
-
-err_exit:
-	/* Restore the interrupts states */
-	mips_int_unlock(s);
+	if (status) {
+		irq = ADM5120_INTC_IRQ_BASE+fls(status)-1;
+		do_IRQ(irq);
+	} else
+		spurious_interrupt();
+#else
+	status = INTC_REG(INTC_REG_IRQ_STATUS) & INTC_INT_ALL;
+	if (status) {
+		for (irq=ADM5120_INTC_IRQ_BASE; irq <= ADM5120_INTC_IRQ_BASE +
+			INTC_IRQ_LAST;	irq++, status >>=1) {
+			if ((status & 1) == 1)
+				do_IRQ(irq);
+		}
+	} else
+		spurious_interrupt();
+#endif
 }
 
-unsigned int startup_adm5120_irq(unsigned int irq)
+asmlinkage void plat_irq_dispatch(void)
 {
-	enable_adm5120_irq(irq);
-	return 0;
-}
+	unsigned long pending;
 
-void shutdown_adm5120_irq(unsigned int irq)
-{
-	disable_adm5120_irq(irq);
-}
+	pending = read_c0_status() & read_c0_cause();
 
-static inline void ack_adm5120_irq(unsigned int irq_nr)
-{
-	ADM5120_INTC_DISABLE = (1 << irq_nr);
+	if (pending & STATUSF_IP7)
+		do_IRQ(ADM5120_IRQ_COUNTER);
+	else if (pending & STATUSF_IP2)
+		adm5120_intc_irq_dispatch();
+	else
+		spurious_interrupt();
 }
 
-
-static void end_adm5120_irq(unsigned int irq_nr)
+#define INTC_IRQ_STATUS (IRQ_LEVEL | IRQ_TYPE_LEVEL_HIGH | IRQ_DISABLED)
+static void __init adm5120_intc_irq_init(int base)
 {
-	ADM5120_INTC_ENABLE = (1 << irq_nr);
-}
+	int i;
 
-static hw_irq_controller adm5120_irq_type = {
-	.typename 	= "MIPS",
-	.startup	= startup_adm5120_irq,
-	.shutdown	= shutdown_adm5120_irq,
-	.enable		= enable_adm5120_irq,
-	.disable	= disable_adm5120_irq,
-	.ack 		= ack_adm5120_irq,
-	.end		= end_adm5120_irq,
-	.set_affinity	= NULL,
-};
+	/* disable all interrupts */
+	INTC_REG(INTC_REG_IRQ_DISABLE) = INTC_INT_ALL;
+	/* setup all interrupts to generate IRQ instead of FIQ */
+	INTC_REG(INTC_REG_INT_MODE) = 0;
+	/* set active level for all external interrupts to HIGH */
+	INTC_REG(INTC_REG_INT_LEVEL) = 0;
+	/* disable usage of the TEST_SOURCE register */
+	INTC_REG(INTC_REG_IRQ_SOURCE_SELECT) = 0;
+
+	for(i=ADM5120_INTC_IRQ_BASE; i <= ADM5120_INTC_IRQ_BASE+INTC_IRQ_LAST;
+		i++) {
+		irq_desc[i].status = INTC_IRQ_STATUS;
+		set_irq_chip_and_handler(i, &adm5120_intc_irq_chip, 
+			handle_level_irq);
+	}
 
+	setup_irq(ADM5120_IRQ_INTC, &adm5120_intc_irq_action);
+}
 
-void __init arch_init_irq(void)
-{
-	int i;
-	
-	for (i = 0; i <= ADM5120_IRQ_MAX; i++) {
-		irq_desc[i].status = IRQ_DISABLED;
-		irq_desc[i].action = 0;
-		irq_desc[i].depth = 1;
-		irq_desc[i].chip = &adm5120_irq_type;
-	}
+void __init arch_init_irq(void) {
+	mips_cpu_irq_init();
+	adm5120_intc_irq_init(ADM5120_INTC_IRQ_BASE);
 }
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c
index 5767df8b2..aa30dc5c8 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c
@@ -15,15 +15,13 @@
 #include <asm/io.h>
 #include <asm/time.h>
 
-#include <adm5120_info.h>
+#include <asm/mach-adm5120/adm5120_info.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_irq.h>
 
-#define ADM5120_SOFTRESET	0x12000004
-#define STATUS_IE		0x00000001
-#define ALLINTS (IE_IRQ0 | IE_IRQ5 | STATUS_IE)
-
-void  mips_time_init(void);
+extern void adm5120_time_init(void) __init;
 
-extern unsigned int mips_counter_frequency;
+#define ADM5120_SOFTRESET	0x12000004
 
 void adm5120_restart(char *command)
 {
@@ -43,25 +41,11 @@ void adm5120_power_off(void)
         adm5120_halt();
 }
 
-void __init adm5120_time_init(void)
-{
-	mips_counter_frequency = adm5120_speed >> 1;
-}
-
-void __init plat_timer_setup(struct irqaction *irq)
-{
-	/* to generate the first timer interrupt */
-	write_c0_compare(read_c0_count()+ mips_counter_frequency/HZ);
-	clear_c0_status(ST0_BEV);
-	set_c0_status(ALLINTS);
-}
-
 void __init plat_mem_setup(void)
 {
 	printk(KERN_INFO "ADM5120 board setup\n");
 
 	board_time_init = adm5120_time_init;
-	//board_timer_setup = mips_timer_setup;
 
 	_machine_restart = adm5120_restart;
 	_machine_halt = adm5120_halt;
@@ -75,16 +59,15 @@ const char *get_system_type(void)
 	return adm5120_board_name();
 }
 
-#ifdef CONFIG_USB
 static struct resource adm5120_hcd_resources[] = {
 	[0] = {
-		.start	= 0x11200000,
-		.end	= 0x11200084,
+		.start	= ADM5120_USBC_BASE,
+		.end	= ADM5120_USBC_BASE+ADM5120_USBC_SIZE-1,
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
-		.start	= 0x3,
-		.end	= 0x3,
+		.start	= ADM5120_IRQ_USBC,
+		.end	= ADM5120_IRQ_USBC,
 		.flags	= IORESOURCE_IRQ,
 	},
 };
@@ -105,5 +88,4 @@ static int __init adm5120_init(void)
 	return platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
-arch_initcall(adm5120_init);
-#endif
+subsys_initcall(adm5120_init);
diff --git a/target/linux/adm5120-2.6/files/arch/mips/pci/fixup-adm5120.c b/target/linux/adm5120-2.6/files/arch/mips/pci/fixup-adm5120.c
new file mode 100644
index 000000000..9f65e350a
--- /dev/null
+++ b/target/linux/adm5120-2.6/files/arch/mips/pci/fixup-adm5120.c
@@ -0,0 +1,99 @@
+/*
+ *  $Id$
+ *
+ *  ADM5120 specific PCI fixups
+ *
+ *  Copyright (C) ADMtek Incorporated.
+ *  Copyright (C) 2005 Jeroen Vreeken (pe1rxq@amsat.org)
+ *  Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
+ *  Copyright (C) 2007 OpenWrt.org
+ *
+ *  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., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include <linux/autoconf.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/pci_regs.h>
+
+#include <asm/delay.h>
+#include <asm/bootinfo.h>
+
+#include <asm/mach-adm5120/adm5120_info.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_irq.h>
+
+static void adm5120_pci_fixup(struct pci_dev *dev)
+{
+	if (dev->devfn !=0)
+		return;
+
+	/* setup COMMAND register */
+	pci_write_config_word(dev, PCI_COMMAND, 
+		(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER));
+
+	/* setup CACHE_LINE_SIZE register */
+	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, 4);
+
+	/* setting up BARS */
+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, 0);
+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_1, 0);
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ADMTEK, PCI_DEVICE_ID_ADMTEK_ADM5120, 
+	adm5120_pci_fixup);
+
+
+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+	int irq;
+	
+	irq = -1;
+#if 1
+	/* FIXME: this code should be working on all boards? */
+	if (slot > 0 && slot < 4)
+		irq = ADM5120_IRQ_PCI0+slot-1;
+#else	
+	switch (mips_machtype) {
+	case MACH_ADM5120_RB_111:
+	case MACH_ADM5120_RB_112:
+	case MACH_ADM5120_RB_133:
+	case MACH_ADM5120_RB_133C:
+	case MACH_ADM5120_RB_153:
+		if (slot > 0 && slot < 4)
+			irq = ADM5120_IRQ_PCI0+slot-1;
+		break;
+	default:
+		if (slot > 1 && slot < 5)
+			irq = ADM5120_IRQ_PCI0+slot-2;
+		break;
+	}
+#endif
+	printk(KERN_INFO "PCI: mapping irq for device %s, slot:%u, pin:%u, "
+		"irq:%d\n", pci_name(dev), slot, pin, irq);
+		
+	return irq;
+}
+
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+	return 0;
+}
+
diff --git a/target/linux/adm5120-2.6/files/arch/mips/pci/ops-adm5120.c b/target/linux/adm5120-2.6/files/arch/mips/pci/ops-adm5120.c
index 91dae8999..ff768033e 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/pci/ops-adm5120.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/pci/ops-adm5120.c
@@ -1,17 +1,36 @@
 /*
- *	Copyright (C) ADMtek Incorporated.
- *	Copyright (C) 2005 Jeroen Vreeken (pe1rxq@amsat.org)
- *	Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
- *	Copyright (C) 2007 OpenWrt.org
+ *  $Id$
+ *
+ *  ADM5120 specific PCI operations
+ *
+ *  Copyright (C) ADMtek Incorporated.
+ *  Copyright (C) 2005 Jeroen Vreeken (pe1rxq@amsat.org)
+ *  Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
+ *  Copyright (C) 2007 OpenWrt.org
+ *
+ *  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., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
  */
 
-#include <linux/autoconf.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
 
 volatile u32* pci_config_address_reg = (volatile u32*)KSEG1ADDR(ADM5120_PCICFG_ADDR);
 volatile u32* pci_config_data_reg = (volatile u32*)KSEG1ADDR(ADM5120_PCICFG_DATA);
@@ -24,14 +43,15 @@ static int pci_config_read(struct pci_bus *bus, unsigned int devfn, int where,
 	*pci_config_address_reg = ((bus->number & 0xff) << 0x10) |
 	    ((devfn & 0xff) << 0x08) | (where & 0xfc) | PCI_ENABLE;
 	switch (size) {
-		case 1:
-			*val = ((*pci_config_data_reg)>>((where&3)<<3))&0xff;
-			break;
-		case 2:
-			*val = ((*pci_config_data_reg)>>((where&3)<<3))&0xffff;
-			break;
-		default:
-			*val = (*pci_config_data_reg);
+	case 1:
+		*val = ((*pci_config_data_reg)>>((where&3)<<3))&0xff;
+		break;
+	case 2:
+		*val = ((*pci_config_data_reg)>>((where&3)<<3))&0xffff;
+		break;
+	default:
+		*val = (*pci_config_data_reg);
+		break;
 	}
 	return PCIBIOS_SUCCESSFUL;
 }
@@ -42,16 +62,16 @@ static int pci_config_write(struct pci_bus *bus, unsigned int devfn, int where,
 	*pci_config_address_reg = ((bus->number & 0xff) << 0x10) |
 	    ((devfn & 0xff) << 0x08) | (where & 0xfc) | PCI_ENABLE;
 	switch (size) {
-		case 1:
-			*(volatile u8 *)(((int)pci_config_data_reg) +
+	case 1:
+		*(volatile u8 *)(((int)pci_config_data_reg) +
 			    (where & 3)) = val;
-			break;
-		case 2:
-			*(volatile u16 *)(((int)pci_config_data_reg) +
+		break;
+	case 2:
+		*(volatile u16 *)(((int)pci_config_data_reg) +
 			    (where & 2)) = (val);
-			break;
-		default:
-			*pci_config_data_reg = (val);
+		break;
+	default:
+		*pci_config_data_reg = (val);
 	}
 
 	return PCIBIOS_SUCCESSFUL;
diff --git a/target/linux/adm5120-2.6/files/arch/mips/pci/pci-adm5120.c b/target/linux/adm5120-2.6/files/arch/mips/pci/pci-adm5120.c
index 0fa3986e1..f10422104 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/pci/pci-adm5120.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/pci/pci-adm5120.c
@@ -1,38 +1,48 @@
 /*
- *	Copyright (C) ADMtek Incorporated.
- *	Copyright (C) 2005 Jeroen Vreeken (pe1rxq@amsat.org)
- *	Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
- *	Copyright (C) 2007 OpenWrt.org
+ *  $Id$
+ *
+ *  ADM5120 PCI Host Controller driver
+ *
+ *  Copyright (C) ADMtek Incorporated.
+ *  Copyright (C) 2005 Jeroen Vreeken (pe1rxq@amsat.org)
+ *  Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
+ *  Copyright (C) 2007 OpenWrt.org
+ *
+ *  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., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
  */
-
-#include <linux/autoconf.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <adm5120_info.h>
-#include <adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_info.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_irq.h>
 
 extern struct pci_ops adm5120_pci_ops;
 
-#define PCI_CMM_IOACC_EN	0x1
-#define PCI_CMM_MEMACC_EN	0x2
-#define PCI_CMM_MASTER_EN	0x4
-#define PCI_CMM_DEF \
-		(PCI_CMM_IOACC_EN | PCI_CMM_MEMACC_EN | PCI_CMM_MASTER_EN)
-
-#define PCI_DEF_CACHE_LINE_SZ	4
-
-
-struct resource pci_io_resource = {
+static struct resource pci_io_resource = {
 	.name = "ADM5120 PCI I/O",
 	.start = ADM5120_PCIIO_BASE,
 	.end = ADM5120_PCICFG_ADDR-1,
 	.flags = IORESOURCE_IO
 };
 
-struct resource pci_mem_resource = {
+static struct resource pci_mem_resource = {
 	.name = "ADM5120 PCI MEM",
 	.start = ADM5120_PCIMEM_BASE,
 	.end = ADM5120_PCIIO_BASE-1,
@@ -45,32 +55,6 @@ static struct pci_controller adm5120_controller = {
 	.mem_resource	= &pci_mem_resource,
 };
 
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-	if (slot < 2 || slot > 4)
-		return -1;
-	return slot + 4;
-}
-
-static void adm5120_pci_fixup(struct pci_dev *dev)
-{
-	if (dev->devfn == 0) {
-		pci_write_config_word(dev, PCI_COMMAND, PCI_CMM_DEF);
-		pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
-		    PCI_DEF_CACHE_LINE_SZ);
-		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, 0);
-		pci_write_config_dword(dev, PCI_BASE_ADDRESS_1, 0);
-	}
-}
-
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, adm5120_pci_fixup);
-
-
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-	return 0;
-}
-
 static int __init adm5120_pci_setup(void)
 {
 	int pci_bios;
@@ -79,7 +63,7 @@ static int __init adm5120_pci_setup(void)
 
 	printk("adm5120: system has %sPCI BIOS\n", pci_bios ? "" : "no ");
 	if (pci_bios == 0)
-		return 1;
+		return -1;
 
 	/* Avoid ISA compat ranges.  */
 	PCIBIOS_MIN_IO = 0x00000000;