diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-realview/entry-macro.S | 11 | ||||
-rw-r--r-- | include/asm-arm/arch-realview/irqs.h | 3 | ||||
-rw-r--r-- | include/asm-arm/arch-realview/platform.h | 5 | ||||
-rw-r--r-- | include/asm-arm/assembler.h | 9 | ||||
-rw-r--r-- | include/asm-arm/mach/flash.h | 3 |
5 files changed, 25 insertions, 6 deletions
diff --git a/include/asm-arm/arch-realview/entry-macro.S b/include/asm-arm/arch-realview/entry-macro.S index 4df469bf42e2..6288fad0dc41 100644 --- a/include/asm-arm/arch-realview/entry-macro.S +++ b/include/asm-arm/arch-realview/entry-macro.S | |||
@@ -61,3 +61,14 @@ | |||
61 | strcc \irqstat, [\base, #GIC_CPU_EOI] | 61 | strcc \irqstat, [\base, #GIC_CPU_EOI] |
62 | cmpcs \irqnr, \irqnr | 62 | cmpcs \irqnr, \irqnr |
63 | .endm | 63 | .endm |
64 | |||
65 | /* As above, this assumes that irqstat and base are preserved.. */ | ||
66 | |||
67 | .macro test_for_ltirq, irqnr, irqstat, base, tmp | ||
68 | bic \irqnr, \irqstat, #0x1c00 | ||
69 | mov \tmp, #0 | ||
70 | cmp \irqnr, #29 | ||
71 | moveq \tmp, #1 | ||
72 | streq \irqstat, [\base, #GIC_CPU_EOI] | ||
73 | cmp \tmp, #0 | ||
74 | .endm | ||
diff --git a/include/asm-arm/arch-realview/irqs.h b/include/asm-arm/arch-realview/irqs.h index ff376494e5b1..c16223c9588d 100644 --- a/include/asm-arm/arch-realview/irqs.h +++ b/include/asm-arm/arch-realview/irqs.h | |||
@@ -21,6 +21,9 @@ | |||
21 | 21 | ||
22 | #include <asm/arch/platform.h> | 22 | #include <asm/arch/platform.h> |
23 | 23 | ||
24 | #define IRQ_LOCALTIMER 29 | ||
25 | #define IRQ_LOCALWDOG 30 | ||
26 | |||
24 | /* | 27 | /* |
25 | * IRQ interrupts definitions are the same the INT definitions | 28 | * IRQ interrupts definitions are the same the INT definitions |
26 | * held within platform.h | 29 | * held within platform.h |
diff --git a/include/asm-arm/arch-realview/platform.h b/include/asm-arm/arch-realview/platform.h index aef9b36b3c37..18d7c18b738c 100644 --- a/include/asm-arm/arch-realview/platform.h +++ b/include/asm-arm/arch-realview/platform.h | |||
@@ -209,6 +209,8 @@ | |||
209 | #else | 209 | #else |
210 | #define REALVIEW_MPCORE_SCU_BASE 0x10100000 /* SCU registers */ | 210 | #define REALVIEW_MPCORE_SCU_BASE 0x10100000 /* SCU registers */ |
211 | #define REALVIEW_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */ | 211 | #define REALVIEW_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */ |
212 | #define REALVIEW_TWD_BASE 0x10100700 | ||
213 | #define REALVIEW_TWD_SIZE 0x00000100 | ||
212 | #define REALVIEW_GIC_DIST_BASE 0x10101000 /* Generic interrupt controller distributor */ | 214 | #define REALVIEW_GIC_DIST_BASE 0x10101000 /* Generic interrupt controller distributor */ |
213 | #endif | 215 | #endif |
214 | #define REALVIEW_SMC_BASE 0x10080000 /* SMC */ | 216 | #define REALVIEW_SMC_BASE 0x10080000 /* SMC */ |
@@ -305,9 +307,6 @@ | |||
305 | #define INT_TSPENINT 30 /* Touchscreen pen */ | 307 | #define INT_TSPENINT 30 /* Touchscreen pen */ |
306 | #define INT_TSKPADINT 31 /* Touchscreen keypad */ | 308 | #define INT_TSKPADINT 31 /* Touchscreen keypad */ |
307 | #else | 309 | #else |
308 | #define INT_LOCALTIMER 29 | ||
309 | #define INT_LOCALWDOG 30 | ||
310 | |||
311 | #define INT_AACI 0 | 310 | #define INT_AACI 0 |
312 | #define INT_TIMERINT0_1 1 | 311 | #define INT_TIMERINT0_1 1 |
313 | #define INT_TIMERINT2_3 2 | 312 | #define INT_TIMERINT2_3 2 |
diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h index 69a28f96bee2..f31ac92b6c7f 100644 --- a/include/asm-arm/assembler.h +++ b/include/asm-arm/assembler.h | |||
@@ -83,10 +83,13 @@ | |||
83 | * Save the current IRQ state and disable IRQs. Note that this macro | 83 | * Save the current IRQ state and disable IRQs. Note that this macro |
84 | * assumes FIQs are enabled, and that the processor is in SVC mode. | 84 | * assumes FIQs are enabled, and that the processor is in SVC mode. |
85 | */ | 85 | */ |
86 | .macro save_and_disable_irqs, oldcpsr, temp | 86 | .macro save_and_disable_irqs, oldcpsr |
87 | mrs \oldcpsr, cpsr | 87 | mrs \oldcpsr, cpsr |
88 | mov \temp, #PSR_I_BIT | MODE_SVC | 88 | #if __LINUX_ARM_ARCH__ >= 6 |
89 | msr cpsr_c, \temp | 89 | cpsid i |
90 | #else | ||
91 | msr cpsr_c, #PSR_I_BIT | MODE_SVC | ||
92 | #endif | ||
90 | .endm | 93 | .endm |
91 | 94 | ||
92 | /* | 95 | /* |
diff --git a/include/asm-arm/mach/flash.h b/include/asm-arm/mach/flash.h index cd57436d9874..05b029ef6371 100644 --- a/include/asm-arm/mach/flash.h +++ b/include/asm-arm/mach/flash.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #define ASMARM_MACH_FLASH_H | 11 | #define ASMARM_MACH_FLASH_H |
12 | 12 | ||
13 | struct mtd_partition; | 13 | struct mtd_partition; |
14 | struct mtd_info; | ||
14 | 15 | ||
15 | /* | 16 | /* |
16 | * map_name: the map probe function name | 17 | * map_name: the map probe function name |
@@ -19,6 +20,7 @@ struct mtd_partition; | |||
19 | * init: method called at driver/device initialisation | 20 | * init: method called at driver/device initialisation |
20 | * exit: method called at driver/device removal | 21 | * exit: method called at driver/device removal |
21 | * set_vpp: method called to enable or disable VPP | 22 | * set_vpp: method called to enable or disable VPP |
23 | * mmcontrol: method called to enable or disable Sync. Burst Read in OneNAND | ||
22 | * parts: optional array of mtd_partitions for static partitioning | 24 | * parts: optional array of mtd_partitions for static partitioning |
23 | * nr_parts: number of mtd_partitions for static partitoning | 25 | * nr_parts: number of mtd_partitions for static partitoning |
24 | */ | 26 | */ |
@@ -29,6 +31,7 @@ struct flash_platform_data { | |||
29 | int (*init)(void); | 31 | int (*init)(void); |
30 | void (*exit)(void); | 32 | void (*exit)(void); |
31 | void (*set_vpp)(int on); | 33 | void (*set_vpp)(int on); |
34 | void (*mmcontrol)(struct mtd_info *mtd, int sync_read); | ||
32 | struct mtd_partition *parts; | 35 | struct mtd_partition *parts; |
33 | unsigned int nr_parts; | 36 | unsigned int nr_parts; |
34 | }; | 37 | }; |