tracking-2.6.27-rc2-include-path-changes.patch
authorAndy Green <andy@openmoko.com>
Wed, 19 Nov 2008 17:10:49 +0000 (17:10 +0000)
committerAndy Green <andy@openmoko.com>
Wed, 19 Nov 2008 17:10:49 +0000 (17:10 +0000)
Signed-off-by: Andy Green <andy@openmoko.com>
39 files changed:
arch/arm/mach-s3c2410/include/mach/irqs.h
arch/arm/mach-s3c2410/mach-gta01.c
arch/arm/mach-s3c2410/pwm.c
arch/arm/mach-s3c2440/fiq_c_isr.c
arch/arm/mach-s3c2440/fiq_c_isr.h
arch/arm/mach-s3c2440/mach-gta02.c
arch/arm/plat-s3c24xx/gpio.c
arch/arm/plat-s3c24xx/include/plat/pm.h
arch/arm/plat-s3c24xx/neo1973_memconfig.c
arch/arm/plat-s3c24xx/neo1973_pm_bt.c
arch/arm/plat-s3c24xx/neo1973_pm_gps.c
arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
arch/arm/plat-s3c24xx/neo1973_pm_host.c
arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
arch/arm/plat-s3c24xx/neo1973_shadow.c
arch/arm/plat-s3c24xx/neo1973_version.c
drivers/gpio/gpiolib.c
drivers/input/keyboard/gpio_keys.c
drivers/input/keyboard/neo1973kbd.c
drivers/input/keyboard/qt2410kbd.c
drivers/input/touchscreen/s3c2410_ts.c
drivers/leds/leds-neo1973-gta02.c
drivers/leds/leds-neo1973-vibrator.c
drivers/mfd/glamo/glamo-core.c
drivers/mfd/glamo/glamo-core.h
drivers/mfd/glamo/glamo-lcm-spi.c
drivers/mfd/glamo/glamo-spi-gpio.c
drivers/power/gta02_hdq.c
drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
drivers/spi/spi_s3c24xx_gpio.c
drivers/usb/host/ohci-s3c2410.c
drivers/video/backlight/gta01_bl.c
include/asm-arm/arch-s3c2410/gpio.h
include/asm-arm/arch-s3c2410/gta01.h
include/asm-arm/arch-s3c2410/gta02.h
include/asm-arm/arch-s3c2410/irqs.h
include/asm-arm/arch-s3c2410/pwm.h
sound/soc/s3c24xx/neo1973_gta02_wm8753.c
sound/soc/s3c24xx/neo1973_wm8753.c

index 9565903..78f6097 100644 (file)
 #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. */
 /* 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 */
index 97f3d97..567737a 100644 (file)
 #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>
 
index 86a4faa..5f3f419 100644 (file)
 #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;
index 38692fc..6f90d23 100644 (file)
@@ -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>
index 0c45eb7..3facf50 100644 (file)
@@ -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;
index fbfb9cb..6ab8fdd 100644 (file)
 #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>
 
index 82e71d8..d121952 100644 (file)
@@ -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)
 {
index cc62366..c384d02 100644 (file)
@@ -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
index 55d85fc..99e1133 100644 (file)
@@ -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)
index dfc9ae8..c833a74 100644 (file)
@@ -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>
 
index a21b763..111779e 100644 (file)
@@ -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>
 
index cb064ac..2f4c872 100644 (file)
 #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;
index 8aee609..4dc0ca9 100644 (file)
@@ -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
index 145556b..90bbc71 100644 (file)
@@ -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
index 09667da..0ff3b83 100644 (file)
@@ -28,6 +28,7 @@
 #include <linux/irq.h>
 
 #include <asm/gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c24xx/neo1973.h>
 
 /**
index ab4805b..09b1bf1 100644 (file)
@@ -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
index faa1cc6..753a50c 100644 (file)
@@ -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.
  *
index 05f3f43..b78d6d8 100644 (file)
@@ -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;
index 70d8bc0..62ee53a 100644 (file)
@@ -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 {
index 95392cc..b14135c 100644 (file)
@@ -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 {
index 5bc347f..0933a33 100644 (file)
@@ -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>
index 8fe817b..4b8687d 100644 (file)
@@ -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>
index 647e860..2b50504 100644 (file)
@@ -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>
index c2a0d25..7123080 100644 (file)
@@ -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
index dd6f67c..57214de 100644 (file)
@@ -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 */
index 874fb0e..c8ff8a7 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <linux/glamofb.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #include "glamo-core.h"
 #include "glamo-regs.h"
index ece5750..2bf4e38 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <linux/glamofb.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #include "glamo-core.h"
 #include "glamo-regs.h"
index 5a79fd6..159daa9 100644 (file)
@@ -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>
index 09d81ee..4f26155 100644 (file)
@@ -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>
 
index b41de42..6963703 100644 (file)
@@ -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 {
index afe8894..717b695 100644 (file)
@@ -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)
 
index a7170df..cc2caee 100644 (file)
@@ -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>
 
index 9c1a7eb..15da41c 100644 (file)
@@ -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);
index 989aa55..0a90f9c 100644 (file)
@@ -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 */
index 791ea4f..b007ce7 100644 (file)
@@ -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 */
index ea945ea..caef9f9 100644 (file)
@@ -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
 #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)
 #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 */
index a797ec3..b77a40e 100644 (file)
@@ -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>
index a68f23d..13c48ba 100644 (file)
 #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"
index 2e5c31b..5cbbe98 100644 (file)
@@ -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"