[s3c24xx] bump to 2.6.30-rc6
[openwrt.git] / target / linux / s3c24xx / patches-2.6.30 / 015-mach-gta02.patch
1 Index: linux-2.6.30-rc6/arch/arm/mach-s3c2442/Kconfig
2 ===================================================================
3 --- linux-2.6.30-rc6.orig/arch/arm/mach-s3c2442/Kconfig 2009-05-18 19:08:29.000000000 +0200
4 +++ linux-2.6.30-rc6/arch/arm/mach-s3c2442/Kconfig      2009-05-18 19:08:31.000000000 +0200
5 @@ -25,6 +25,20 @@
6         depends on ARCH_S3C2440
7         select CPU_S3C2442
8  
9 +config MACH_NEO1973_GTA02
10 +       bool "Openmoko Freerunner GSM Phone (GTA02 Hardware)"
11 +       select CPU_S3C2442
12 +       select MFD_PCF50633
13 +       select PCF50633_GPIO
14 +       select I2C
15 +       select POWER_SUPPLY
16 +       select MACH_NEO1973
17 +       select S3C_PWM
18 +       select FIQ
19 +       select S3C_DEV_USB_HOST
20 +       help
21 +          Say Y here if you are using the Openmoko Freerunner GSM Phone
22 +
23  
24  endmenu
25  
26 Index: linux-2.6.30-rc6/arch/arm/mach-s3c2442/Makefile
27 ===================================================================
28 --- linux-2.6.30-rc6.orig/arch/arm/mach-s3c2442/Makefile        2009-05-18 19:08:31.000000000 +0200
29 +++ linux-2.6.30-rc6/arch/arm/mach-s3c2442/Makefile     2009-05-18 19:08:31.000000000 +0200
30 @@ -9,8 +9,11 @@
31  obj-n                          :=
32  obj-                           :=
33  
34 +obj-$(CONFIG_S3C2440_C_FIQ)    += fiq_c_isr.o
35 +
36  obj-$(CONFIG_CPU_S3C2442)      += s3c2442.o
37  obj-$(CONFIG_CPU_S3C2442)      += clock.o
38 +obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
39  
40  # Machine support
41  
42 Index: linux-2.6.30-rc6/arch/arm/mach-s3c2410/include/mach/irqs.h
43 ===================================================================
44 --- linux-2.6.30-rc6.orig/arch/arm/mach-s3c2410/include/mach/irqs.h     2009-05-16 06:12:57.000000000 +0200
45 +++ linux-2.6.30-rc6/arch/arm/mach-s3c2410/include/mach/irqs.h  2009-05-18 19:08:31.000000000 +0200
46 @@ -153,9 +153,9 @@
47  #define IRQ_S3C2443_AC97       S3C2410_IRQSUB(28)
48  
49  #ifdef CONFIG_CPU_S3C2443
50 -#define NR_IRQS (IRQ_S3C2443_AC97+1)
51 +#define _NR_IRQS (IRQ_S3C2443_AC97+1)
52  #else
53 -#define NR_IRQS (IRQ_S3C2440_AC97+1)
54 +#define _NR_IRQS (IRQ_S3C2440_AC97+1)
55  #endif
56  
57  /* compatibility define. */
58 @@ -167,4 +167,33 @@
59  /* Our FIQs are routable from IRQ_EINT0 to IRQ_ADCPARENT */
60  #define FIQ_START              IRQ_EINT0
61  
62 +
63 +/*
64 + * The next 16 interrupts are for board specific purposes.  Since
65 + * the kernel can only run on one machine at a time, we can re-use
66 + * these.  If you need more, increase IRQ_BOARD_END, but keep it
67 + * within sensible limits.
68 + */
69 +#define IRQ_BOARD_START         _NR_IRQS
70 +#define IRQ_BOARD_END           (_NR_IRQS + 10)
71 +
72 +#if defined(CONFIG_MACH_NEO1973_GTA02)
73 +#define NR_IRQS                 (IRQ_BOARD_END)
74 +#else
75 +#define NR_IRQS                 (IRQ_BOARD_START)
76 +#endif
77 +
78 +/* Neo1973 GTA02 interrupts */
79 +#define NEO1973_GTA02_IRQ(x)    (IRQ_BOARD_START + (x))
80 +#define IRQ_GLAMO(x)            NEO1973_GTA02_IRQ(x)
81 +#define IRQ_GLAMO_HOSTBUS       IRQ_GLAMO(0)
82 +#define IRQ_GLAMO_JPEG          IRQ_GLAMO(1)
83 +#define IRQ_GLAMO_MPEG          IRQ_GLAMO(2)
84 +#define IRQ_GLAMO_MPROC1        IRQ_GLAMO(3)
85 +#define IRQ_GLAMO_MPROC0        IRQ_GLAMO(4)
86 +#define IRQ_GLAMO_CMDQUEUE      IRQ_GLAMO(5)
87 +#define IRQ_GLAMO_2D            IRQ_GLAMO(6)
88 +#define IRQ_GLAMO_MMC           IRQ_GLAMO(7)
89 +#define IRQ_GLAMO_RISC          IRQ_GLAMO(8)
90 +
91  #endif /* __ASM_ARCH_IRQ_H */