dd630aa770e3d636e81696290e233faffc4e594b
[openwrt/staging/florian.git] / target / linux / s3c24xx / patches-2.6.31 / 011-mach-gta02.patch
1 From 0b75f16634c05f17151bc4409be3a816630bf9f1 Mon Sep 17 00:00:00 2001
2 From: Lars-Peter Clausen <lars@metafoo.de>
3 Date: Tue, 21 Jul 2009 12:42:47 +0200
4 Subject: [PATCH] 015-mach-gta02.patch
5
6 ---
7 arch/arm/mach-s3c2410/include/mach/irqs.h | 33 +++++++++++++++++++++++++++-
8 arch/arm/mach-s3c2442/Kconfig | 3 +-
9 arch/arm/mach-s3c2442/Makefile | 3 ++
10 3 files changed, 36 insertions(+), 3 deletions(-)
11
12 diff --git a/arch/arm/mach-s3c2410/include/mach/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h
13 index 2a2384f..8c65c51 100644
14 --- a/arch/arm/mach-s3c2410/include/mach/irqs.h
15 +++ b/arch/arm/mach-s3c2410/include/mach/irqs.h
16 @@ -153,9 +153,9 @@
17 #define IRQ_S3C2443_AC97 S3C2410_IRQSUB(28)
18
19 #ifdef CONFIG_CPU_S3C2443
20 -#define NR_IRQS (IRQ_S3C2443_AC97+1)
21 +#define _NR_IRQS (IRQ_S3C2443_AC97+1)
22 #else
23 -#define NR_IRQS (IRQ_S3C2440_AC97+1)
24 +#define _NR_IRQS (IRQ_S3C2440_AC97+1)
25 #endif
26
27 /* compatibility define. */
28 @@ -167,4 +167,33 @@
29 /* Our FIQs are routable from IRQ_EINT0 to IRQ_ADCPARENT */
30 #define FIQ_START IRQ_EINT0
31
32 +
33 +/*
34 + * The next 16 interrupts are for board specific purposes. Since
35 + * the kernel can only run on one machine at a time, we can re-use
36 + * these. If you need more, increase IRQ_BOARD_END, but keep it
37 + * within sensible limits.
38 + */
39 +#define IRQ_BOARD_START _NR_IRQS
40 +#define IRQ_BOARD_END (_NR_IRQS + 10)
41 +
42 +#if defined(CONFIG_MACH_NEO1973_GTA02)
43 +#define NR_IRQS (IRQ_BOARD_END)
44 +#else
45 +#define NR_IRQS (IRQ_BOARD_START)
46 +#endif
47 +
48 +/* Neo1973 GTA02 interrupts */
49 +#define NEO1973_GTA02_IRQ(x) (IRQ_BOARD_START + (x))
50 +#define IRQ_GLAMO(x) NEO1973_GTA02_IRQ(x)
51 +#define IRQ_GLAMO_HOSTBUS IRQ_GLAMO(0)
52 +#define IRQ_GLAMO_JPEG IRQ_GLAMO(1)
53 +#define IRQ_GLAMO_MPEG IRQ_GLAMO(2)
54 +#define IRQ_GLAMO_MPROC1 IRQ_GLAMO(3)
55 +#define IRQ_GLAMO_MPROC0 IRQ_GLAMO(4)
56 +#define IRQ_GLAMO_CMDQUEUE IRQ_GLAMO(5)
57 +#define IRQ_GLAMO_2D IRQ_GLAMO(6)
58 +#define IRQ_GLAMO_MMC IRQ_GLAMO(7)
59 +#define IRQ_GLAMO_RISC IRQ_GLAMO(8)
60 +
61 #endif /* __ASM_ARCH_IRQ_H */
62 diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
63 index 570cb81..ef8a6d3 100644
64 --- a/arch/arm/mach-s3c2442/Kconfig
65 +++ b/arch/arm/mach-s3c2442/Kconfig
66 @@ -34,6 +34,10 @@ config MACH_NEO1973_GTA02
67 select POWER_SUPPLY
68 select MACH_NEO1973
69 select S3C2410_PWM
70 + select FIQ
71 + select S3C_PWM
72 + select S3C_DEV_USB_HOST
73 + select S3C24XX_GPIO_EXTRA64
74 help
75 Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
76
77 diff --git a/arch/arm/mach-s3c2442/Makefile b/arch/arm/mach-s3c2442/Makefile
78 index 1350103..d76be29 100644
79 --- a/arch/arm/mach-s3c2442/Makefile
80 +++ b/arch/arm/mach-s3c2442/Makefile
81 @@ -9,6 +9,8 @@ obj-m :=
82 obj-n :=
83 obj- :=
84
85 +obj-$(CONFIG_S3C2440_C_FIQ) += fiq_c_isr.o
86 +
87 obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
88 obj-$(CONFIG_CPU_S3C2442) += clock.o
89
90 --
91 1.5.6.5
92