From 145c533ec297ba0ceab36202fb7cb892828640e4 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 21 Nov 2009 03:14:20 +0100 Subject: [PATCH] Fix issues form previous commit... --- .../arch/mips/include/asm/jzsoc.h | 26 ------------------- .../include/asm/mach-jz4740/board-qi_lb60.h | 2 +- .../arch/mips/include/asm/mach-jz4740/irq.h | 13 ++-------- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 target/linux/xburst/files-2.6.31/arch/mips/include/asm/jzsoc.h diff --git a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/jzsoc.h b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/jzsoc.h deleted file mode 100644 index acac226fc..000000000 --- a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/jzsoc.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * linux/include/asm-mips/jzsoc.h - * - * Ingenic's JZXXXX SoC common include. - * - * Copyright (C) 2006 - 2008 Ingenic Semiconductor Inc. - * - * Author: - * - * 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. - */ - -#ifndef __ASM_JZSOC_H__ -#define __ASM_JZSOC_H__ - -/* - * SoC include - */ - -#ifdef CONFIG_SOC_JZ4740 -#include -#endif - -#endif /* __ASM_JZSOC_H__ */ diff --git a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h index aa461bdd8..98318f3d4 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h +++ b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h @@ -59,7 +59,7 @@ */ #define MSC_WP_PIN GPIO_SD_WP #define MSC_HOTPLUG_PIN GPIO_SD_CD_N -#define MSC_HOTPLUG_IRQ (IRQ_GPIO_0 + GPIO_SD_CD_N) +#define MSC_HOTPLUG_IRQ (JZ_IRQ_GPIO(GPIO_SD_CD_N)) #define __msc_init_io() \ do { \ diff --git a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/irq.h b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/irq.h index 1b4c0778d..79604665e 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/irq.h +++ b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/irq.h @@ -1,15 +1,7 @@ #ifndef __JZ4740_IRQ_H__ #define __JZ4740_IRQ_H__ -/* - * JZ4740 irqs. - * - * Copyright (C) 2009, Lars-Peter Clausen - * - * 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. - */ +#define MIPS_CPU_IRQ_BASE 0 #define JZ_IRQ_BASE 8 // 1st-level interrupts @@ -39,10 +31,9 @@ /* 2nd-level interrupts */ #define JZ_IRQ_DMA(x) ((x) + JZ_IRQ(32)) /* 32 to 37 for DMAC channel 0 to 5 */ -#define JZ_IRQ_GPIO_0 JZ_IRQ(48) /* 48 to 175 for GPIO pin 0 to 127 */ #define JZ_IRQ_INTC_GPIO(x) (JZ_IRQ_GPIO0 - (x)) -#define JZ_IRQ_GPIO(x) ((x) + JZ_IRQ(48) +#define JZ_IRQ_GPIO(x) (JZ_IRQ(48) + (x)) #define NR_IRQS (JZ_IRQ_GPIO(127) + 1)