diff options
39 files changed, 105 insertions, 66 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 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index faa1cc66e9c..753a50c1ece 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -6,8 +6,7 @@ #include <linux/err.h> #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <linux/gpio.h> - +#include <asm/arch/gpio.h> /* Optional implementation infrastructure for GPIO interfaces. * diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 05f3f43582c..b78d6d876e6 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -23,7 +23,7 @@ #include <linux/input.h> #include <linux/gpio_keys.h> -#include <asm/gpio.h> +#include <asm/arch/gpio.h> struct gpio_button_data { struct gpio_keys_button *button; diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c index 70d8bc051df..62ee53a1e1b 100644 --- a/drivers/input/keyboard/neo1973kbd.c +++ b/drivers/input/keyboard/neo1973kbd.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/workqueue.h> -#include <asm/gpio.h> +#include <asm/arch/gpio.h> #include <asm/mach-types.h> struct neo1973kbd { diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c index 95392cc9029..b14135cd21e 100644 --- a/drivers/input/keyboard/qt2410kbd.c +++ b/drivers/input/keyboard/qt2410kbd.c @@ -20,7 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/arch/gta01.h> struct gta01kbd { diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 5bc347f3a8f..0933a33bc9a 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -54,7 +54,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/arch/regs-gpio.h> +#include <mach/regs-gpio.h> #include <asm/arch/ts.h> #include <asm/plat-s3c/regs-adc.h> diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c index 8fe817b7fd4..4b8687d0427 100644 --- a/drivers/leds/leds-neo1973-gta02.c +++ b/drivers/leds/leds-neo1973-gta02.c @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/leds.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/arch/pwm.h> #include <asm/arch/gta02.h> diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c index 647e8603430..2b50504af6c 100644 --- a/drivers/leds/leds-neo1973-vibrator.c +++ b/drivers/leds/leds-neo1973-vibrator.c @@ -17,7 +17,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/leds.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/arch/pwm.h> #include <asm/arch/gta01.h> diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index c2a0d254560..7123080e050 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -45,6 +45,8 @@ #include <asm/uaccess.h> #include <asm/div64.h> +//#include <mach/regs-irq.h> + #ifdef CONFIG_PM #include <linux/pm.h> #endif diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h index dd6f67c3386..57214de9e00 100644 --- a/drivers/mfd/glamo/glamo-core.h +++ b/drivers/mfd/glamo/glamo-core.h @@ -17,7 +17,6 @@ #define GLAMO_MMC_BUFFER_SIZE (64 * 1024) #define GLAMO_FB_SIZE (GLAMO_INTERNAL_RAM_SIZE - GLAMO_MMC_BUFFER_SIZE) - struct glamo_core { int irq; int irq_works; /* 0 means PCB does not support Glamo IRQ */ diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c index 874fb0e8c13..c8ff8a77e95 100644 --- a/drivers/mfd/glamo/glamo-lcm-spi.c +++ b/drivers/mfd/glamo/glamo-lcm-spi.c @@ -30,7 +30,7 @@ #include <linux/glamofb.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include "glamo-core.h" #include "glamo-regs.h" diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c index ece575022c9..2bf4e38ca8e 100644 --- a/drivers/mfd/glamo/glamo-spi-gpio.c +++ b/drivers/mfd/glamo/glamo-spi-gpio.c @@ -30,7 +30,7 @@ #include <linux/glamofb.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include "glamo-core.h" #include "glamo-regs.h" diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c index 5a79fd6ac95..159daa99c3c 100644 --- a/drivers/power/gta02_hdq.c +++ b/drivers/power/gta02_hdq.c @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/arch/gta02.h> #include <asm/arch/fiq_ipc_gta02.h> diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c index 09d81ee2087..4f261556a2e 100644 --- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c +++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c @@ -47,7 +47,7 @@ #include <asm/dma-mapping.h> #include <asm/arch/regs-sdi.h> -#include <asm/arch/regs-gpio.h> +#include <mach/regs-gpio.h> #include <asm/arch/mci.h> #include <asm/arch/gta02.h> diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index b41de422cb4..69637036056 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c @@ -22,7 +22,7 @@ #include <linux/spi/spi_bitbang.h> #include <mach/regs-gpio.h> -#include <mach/spi-gpio.h> +#include <asm/arch/spi-gpio.h> #include <mach/hardware.h> struct s3c2410_spigpio { diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index afe88940b55..717b6951fda 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c @@ -22,9 +22,9 @@ #include <linux/platform_device.h> #include <linux/clk.h> -#include <asm/hardware.h> -#include <asm/arch/usb-control.h> -#include <asm/arch/regs-gpio.h> +#include <mach/hardware.h> +#include <mach/usb-control.h> +#include <mach/regs-gpio.h> #define valid_port(idx) ((idx) == 1 || (idx) == 2) diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c index a7170dffc7b..cc2caee549d 100644 --- a/drivers/video/backlight/gta01_bl.c +++ b/drivers/video/backlight/gta01_bl.c @@ -35,7 +35,7 @@ #include <linux/backlight.h> #include <linux/clk.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/arch/gta01.h> #include <asm/arch/pwm.h> diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/include/asm-arm/arch-s3c2410/gpio.h index 9c1a7ebf080..15da41c9f84 100644 --- a/include/asm-arm/arch-s3c2410/gpio.h +++ b/include/asm-arm/arch-s3c2410/gpio.h @@ -21,8 +21,8 @@ #define __ASM_ARCH_S3C2410_GPIO_H #include <asm/irq.h> -#include <asm/hardware.h> -#include <asm/arch/regs-gpio.h> +#include <mach/hardware.h> +#include <mach/regs-gpio.h> int gpio_request(unsigned gpio, const char *label); void gpio_free(unsigned gpio); diff --git a/include/asm-arm/arch-s3c2410/gta01.h b/include/asm-arm/arch-s3c2410/gta01.h index 989aa5510a6..0a90f9ce218 100644 --- a/include/asm-arm/arch-s3c2410/gta01.h +++ b/include/asm-arm/arch-s3c2410/gta01.h @@ -1,7 +1,7 @@ #ifndef _GTA01_H #define _GTA01_H -#include <asm/arch/regs-gpio.h> +#include <mach/regs-gpio.h> #include <asm/arch/irqs.h> /* Different hardware revisions, passed in ATAG_REVISION by u-boot */ diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h index 791ea4fc4c3..b007ce7e7d5 100644 --- a/include/asm-arm/arch-s3c2410/gta02.h +++ b/include/asm-arm/arch-s3c2410/gta02.h @@ -1,7 +1,7 @@ #ifndef _GTA02_H #define _GTA02_H -#include <asm/arch/regs-gpio.h> +#include <mach/regs-gpio.h> #include <asm/arch/irqs.h> /* Different hardware revisions, passed in ATAG_REVISION by u-boot */ diff --git a/include/asm-arm/arch-s3c2410/irqs.h b/include/asm-arm/arch-s3c2410/irqs.h index ea945ea0899..caef9f97570 100644 --- a/include/asm-arm/arch-s3c2410/irqs.h +++ b/include/asm-arm/arch-s3c2410/irqs.h @@ -12,9 +12,9 @@ #ifndef __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H __FILE__ -#ifndef __ASM_ARM_IRQ_H -#error "Do not include this directly, instead #include <asm/irq.h>" -#endif +//#ifndef __ASM_ARM_IRQ_H +//#error "Do not include this directly, instead #include <asm/irq.h>" +//#endif /* we keep the first set of CPU IRQs out of the range of * the ISA space, so that the PC104 has them to itself @@ -178,6 +178,7 @@ #define NR_IRQS (IRQ_BOARD_START) #endif +#if 0 /* Neo1973 GTA02 interrupts */ #define NEO1973_GTA02_IRQ(x) (IRQ_BOARD_START + (x)) #define IRQ_GLAMO(x) NEO1973_GTA02_IRQ(x) @@ -190,5 +191,5 @@ #define IRQ_GLAMO_2D IRQ_GLAMO(6) #define IRQ_GLAMO_MMC IRQ_GLAMO(7) #define IRQ_GLAMO_RISC IRQ_GLAMO(8) - +#endif #endif /* __ASM_ARCH_IRQ_H */ diff --git a/include/asm-arm/arch-s3c2410/pwm.h b/include/asm-arm/arch-s3c2410/pwm.h index a797ec359e2..b77a40e7106 100644 --- a/include/asm-arm/arch-s3c2410/pwm.h +++ b/include/asm-arm/arch-s3c2410/pwm.h @@ -5,8 +5,8 @@ #include <linux/platform_device.h> #include <linux/clk.h> -#include <asm-arm/io.h> -#include <asm/arch/hardware.h> +#include <mach/io.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/plat-s3c/regs-timer.h> #include <asm/arch/gta01.h> diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index a68f23d7382..13c48ba0580 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -32,13 +32,13 @@ #include <asm/mach-types.h> #include <asm/hardware/scoop.h> #include <asm/plat-s3c24xx/regs-iis.h> -#include <asm/arch/regs-clock.h> -#include <asm/arch/regs-gpio.h> -#include <asm/hardware.h> -#include <asm/arch/audio.h> +#include <mach/regs-clock.h> +#include <mach/regs-gpio.h> +#include <mach/hardware.h> +#include <mach/audio.h> #include <asm/io.h> -#include <asm/arch/spi-gpio.h> -#include <asm/arch/regs-gpioj.h> +#include <mach/spi-gpio.h> +#include <mach/regs-gpioj.h> #include <asm/arch/gta02.h> #include "../codecs/wm8753.h" #include "s3c24xx-pcm.h" diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 2e5c31b4943..5cbbe988e1f 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -32,7 +32,7 @@ #include <mach/audio.h> #include <linux/io.h> #include <mach/spi-gpio.h> - +#include <asm/mach-types.h> #include <asm/plat-s3c24xx/regs-iis.h> #include "../codecs/wm8753.h" |