diff options
author | Andy Green <andy@openmoko.com> | 2008-11-19 17:10:49 +0000 |
---|---|---|
committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:10:49 +0000 |
commit | 6bc8405c6db41ff1647a500ce1ffea74ce8f3767 (patch) | |
tree | b536e230c9f957854618290b531b5b960c4ea1ad /arch/arm | |
parent | f5ac2d63a94e8df8237d5f112cc8fa3a91f49d32 (diff) |
tracking-2.6.27-rc2-include-path-changes.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/irqs.h | 33 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/pwm.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/fiq_c_isr.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/fiq_c_isr.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 18 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/gpio.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/pm.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_memconfig.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_bt.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gps.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 9 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_host.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_shadow.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_version.c | 2 |
16 files changed, 69 insertions, 31 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h index 9565903d490..78f6097e799 100644 --- a/arch/arm/mach-s3c2410/include/mach/irqs.h +++ b/arch/arm/mach-s3c2410/include/mach/irqs.h @@ -157,9 +157,9 @@ #define IRQ_S3C2443_AC97 S3C2410_IRQSUB(28) #ifdef CONFIG_CPU_S3C2443 -#define NR_IRQS (IRQ_S3C2443_AC97+1) +#define _NR_IRQS (IRQ_S3C2443_AC97+1) #else -#define NR_IRQS (IRQ_S3C2440_AC97+1) +#define _NR_IRQS (IRQ_S3C2440_AC97+1) #endif /* compatibility define. */ @@ -171,4 +171,33 @@ /* Our FIQs are routable from IRQ_EINT0 to IRQ_ADCPARENT */ #define FIQ_START IRQ_EINT0 + +/* + * The next 16 interrupts are for board specific purposes. Since + * the kernel can only run on one machine at a time, we can re-use + * these. If you need more, increase IRQ_BOARD_END, but keep it + * within sensible limits. + */ +#define IRQ_BOARD_START _NR_IRQS +#define IRQ_BOARD_END (_NR_IRQS + 10) + +#if defined(CONFIG_MACH_NEO1973_GTA02) +#define NR_IRQS (IRQ_BOARD_END) +#else +#define NR_IRQS (IRQ_BOARD_START) +#endif + +/* Neo1973 GTA02 interrupts */ +#define NEO1973_GTA02_IRQ(x) (IRQ_BOARD_START + (x)) +#define IRQ_GLAMO(x) NEO1973_GTA02_IRQ(x) +#define IRQ_GLAMO_HOSTBUS IRQ_GLAMO(0) +#define IRQ_GLAMO_JPEG IRQ_GLAMO(1) +#define IRQ_GLAMO_MPEG IRQ_GLAMO(2) +#define IRQ_GLAMO_MPROC1 IRQ_GLAMO(3) +#define IRQ_GLAMO_MPROC0 IRQ_GLAMO(4) +#define IRQ_GLAMO_CMDQUEUE IRQ_GLAMO(5) +#define IRQ_GLAMO_2D IRQ_GLAMO(6) +#define IRQ_GLAMO_MMC IRQ_GLAMO(7) +#define IRQ_GLAMO_RISC IRQ_GLAMO(8) + #endif /* __ASM_ARCH_IRQ_H */ diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index 97f3d97ed4d..567737a5bb6 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -52,17 +52,17 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <asm/hardware.h> -#include <asm/io.h> +#include <mach/hardware.h> +#include <mach/io.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/fb.h> +#include <mach/regs-gpio.h> +#include <mach/fb.h> #include <asm/arch/mci.h> -#include <asm/arch/spi.h> +#include <mach/spi.h> #include <asm/arch/spi-gpio.h> -#include <asm/arch/usb-control.h> +#include <mach/usb-control.h> #include <asm/arch/gta01.h> diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c index 86a4faa3007..5f3f4190ffd 100644 --- a/arch/arm/mach-s3c2410/pwm.c +++ b/arch/arm/mach-s3c2410/pwm.c @@ -21,9 +21,10 @@ #include <linux/init.h> #include <linux/clk.h> #include <linux/device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/plat-s3c/regs-timer.h> #include <asm/arch/pwm.h> +#include <asm/io.h> #ifdef CONFIG_PM static unsigned long standby_reg_tcon; diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c index 38692fcebf2..6f90d234299 100644 --- a/arch/arm/mach-s3c2440/fiq_c_isr.c +++ b/arch/arm/mach-s3c2440/fiq_c_isr.c @@ -6,7 +6,7 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/fiq.h> #include "fiq_c_isr.h" #include <linux/sysfs.h> diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.h b/arch/arm/mach-s3c2440/fiq_c_isr.h index 0c45eb780ed..3facf50ce2f 100644 --- a/arch/arm/mach-s3c2440/fiq_c_isr.h +++ b/arch/arm/mach-s3c2440/fiq_c_isr.h @@ -1,7 +1,7 @@ #ifndef _LINUX_FIQ_C_ISR_H #define _LINUX_FIQ_C_ISR_H -#include <asm/arch-s3c2410/regs-irq.h> +#include <mach/regs-irq.h> extern unsigned long _fiq_count_fiqs; extern u32 _fiq_ack_mask; diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index fbfb9cb6641..6ab8fddcb15 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -52,21 +52,21 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <asm/hardware.h> -#include <asm/io.h> +#include <mach/hardware.h> +#include <mach/io.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <asm/arch-s3c2410/regs-irq.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-gpioj.h> -#include <asm/arch/fb.h> +#include <mach/regs-irq.h> +#include <mach/regs-gpio.h> +#include <mach/regs-gpioj.h> +#include <mach/fb.h> #include <asm/arch/mci.h> #include <asm/arch/ts.h> -#include <asm/arch/spi.h> +#include <mach/spi.h> #include <asm/arch/spi-gpio.h> -#include <asm/arch/usb-control.h> -#include <asm/arch/regs-mem.h> +#include <mach/usb-control.h> +#include <mach/regs-mem.h> #include <asm/arch/gta02.h> diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c index 82e71d8c5b6..d1219527c98 100644 --- a/arch/arm/plat-s3c24xx/gpio.c +++ b/arch/arm/plat-s3c24xx/gpio.c @@ -31,8 +31,8 @@ #include <mach/hardware.h> #include <asm/irq.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-gpioj.h> +#include <mach/regs-gpio.h> +#include <mach/regs-gpioj.h> void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function) { diff --git a/arch/arm/plat-s3c24xx/include/plat/pm.h b/arch/arm/plat-s3c24xx/include/plat/pm.h index cc623667e48..c384d02d4cf 100644 --- a/arch/arm/plat-s3c24xx/include/plat/pm.h +++ b/arch/arm/plat-s3c24xx/include/plat/pm.h @@ -8,6 +8,8 @@ * published by the Free Software Foundation. */ +#include <linux/sysdev.h> + /* s3c2410_pm_init * * called from board at initialisation time to setup the power diff --git a/arch/arm/plat-s3c24xx/neo1973_memconfig.c b/arch/arm/plat-s3c24xx/neo1973_memconfig.c index 55d85fc7a1e..99e11333c17 100644 --- a/arch/arm/plat-s3c24xx/neo1973_memconfig.c +++ b/arch/arm/plat-s3c24xx/neo1973_memconfig.c @@ -16,9 +16,9 @@ #include <linux/kernel.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> -#include <asm/arch/regs-mem.h> +#include <mach/regs-mem.h> static ssize_t neo1973_memconfig_read(struct device *dev, struct device_attribute *attr, char *buf) diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c index dfc9ae8e9f4..c833a74425d 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c @@ -16,7 +16,7 @@ #include <linux/kernel.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/plat-s3c24xx/neo1973.h> diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c index a21b7639b17..111779e3985 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c @@ -17,7 +17,7 @@ #include <linux/delay.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index cb064acf6de..2f4c872d1a9 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -19,21 +19,26 @@ #include <linux/errno.h> #include <linux/interrupt.h> -#include <asm/gpio.h> +#include <asm/arch/gpio.h> #include <asm/mach-types.h> #include <asm/arch/gta01.h> #include <asm/plat-s3c24xx/neo1973.h> #include <asm/arch/s3c24xx-serial.h> +#include <mach/hardware.h> + #ifdef CONFIG_MACH_NEO1973_GTA02 #include <asm/arch/gta02.h> #include <linux/pcf50633.h> -#include <asm/arch/regs-gpioj.h> +#include <mach/regs-gpio.h> +#include <mach/regs-gpioj.h> #endif int gta_gsm_interrupts; EXPORT_SYMBOL(gta_gsm_interrupts); +extern void s3c24xx_serial_console_set_silence(int); + struct gta01pm_priv { int gpio_ngsm_en; int gpio_ndl_gsm; diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c index 8aee6096649..4dc0ca9ff01 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c @@ -16,7 +16,7 @@ #include <linux/kernel.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #ifdef CONFIG_MACH_NEO1973_GTA02 diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c index 145556b5f50..90bbc711ea6 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c @@ -17,7 +17,7 @@ #include <linux/platform_device.h> #include <linux/io.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #ifdef CONFIG_MACH_NEO1973_GTA02 diff --git a/arch/arm/plat-s3c24xx/neo1973_shadow.c b/arch/arm/plat-s3c24xx/neo1973_shadow.c index 09667da312b..0ff3b831e71 100644 --- a/arch/arm/plat-s3c24xx/neo1973_shadow.c +++ b/arch/arm/plat-s3c24xx/neo1973_shadow.c @@ -28,6 +28,7 @@ #include <linux/irq.h> #include <asm/gpio.h> +#include <mach/regs-gpio.h> #include <asm/plat-s3c24xx/neo1973.h> /** diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c index ab4805b741d..09b1bf1d755 100644 --- a/arch/arm/plat-s3c24xx/neo1973_version.c +++ b/arch/arm/plat-s3c24xx/neo1973_version.c @@ -16,7 +16,7 @@ #include <linux/kernel.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #ifdef CONFIG_MACH_NEO1973_GTA02 |