diff options
Diffstat (limited to 'arch/arm/mach-vexpress')
-rw-r--r-- | arch/arm/mach-vexpress/core.h | 17 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/ct-ca9x4.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/include/mach/entry-macro.S | 5 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/include/mach/system.h | 33 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 20 |
6 files changed, 15 insertions, 70 deletions
diff --git a/arch/arm/mach-vexpress/core.h b/arch/arm/mach-vexpress/core.h index 3508f6ef78ea..33c5a825aba1 100644 --- a/arch/arm/mach-vexpress/core.h +++ b/arch/arm/mach-vexpress/core.h | |||
@@ -1,20 +1,3 @@ | |||
1 | #define AMBA_DEVICE(name,busid,base,plat) \ | ||
2 | struct amba_device name##_device = { \ | ||
3 | .dev = { \ | ||
4 | .coherent_dma_mask = ~0UL, \ | ||
5 | .init_name = busid, \ | ||
6 | .platform_data = plat, \ | ||
7 | }, \ | ||
8 | .res = { \ | ||
9 | .start = base, \ | ||
10 | .end = base + SZ_4K - 1, \ | ||
11 | .flags = IORESOURCE_MEM, \ | ||
12 | }, \ | ||
13 | .dma_mask = ~0UL, \ | ||
14 | .irq = IRQ_##base, \ | ||
15 | /* .dma = DMA_##base,*/ \ | ||
16 | } | ||
17 | |||
18 | /* 2MB large area for motherboard's peripherals static mapping */ | 1 | /* 2MB large area for motherboard's peripherals static mapping */ |
19 | #define V2M_PERIPH 0xf8000000 | 2 | #define V2M_PERIPH 0xf8000000 |
20 | 3 | ||
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index e5abe85fefa0..c65cc3b462a5 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c | |||
@@ -92,10 +92,10 @@ static struct clcd_board ct_ca9x4_clcd_data = { | |||
92 | .remove = versatile_clcd_remove_dma, | 92 | .remove = versatile_clcd_remove_dma, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | static AMBA_DEVICE(clcd, "ct:clcd", CT_CA9X4_CLCDC, &ct_ca9x4_clcd_data); | 95 | static AMBA_AHB_DEVICE(clcd, "ct:clcd", 0, CT_CA9X4_CLCDC, IRQ_CT_CA9X4_CLCDC, &ct_ca9x4_clcd_data); |
96 | static AMBA_DEVICE(dmc, "ct:dmc", CT_CA9X4_DMC, NULL); | 96 | static AMBA_APB_DEVICE(dmc, "ct:dmc", 0, CT_CA9X4_DMC, IRQ_CT_CA9X4_DMC, NULL); |
97 | static AMBA_DEVICE(smc, "ct:smc", CT_CA9X4_SMC, NULL); | 97 | static AMBA_APB_DEVICE(smc, "ct:smc", 0, CT_CA9X4_SMC, IRQ_CT_CA9X4_SMC, NULL); |
98 | static AMBA_DEVICE(gpio, "ct:gpio", CT_CA9X4_GPIO, NULL); | 98 | static AMBA_APB_DEVICE(gpio, "ct:gpio", 0, CT_CA9X4_GPIO, IRQ_CT_CA9X4_GPIO, NULL); |
99 | 99 | ||
100 | static struct amba_device *ct_ca9x4_amba_devs[] __initdata = { | 100 | static struct amba_device *ct_ca9x4_amba_devs[] __initdata = { |
101 | &clcd_device, | 101 | &clcd_device, |
diff --git a/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h b/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h index 2260fde86614..84acf8439d4b 100644 --- a/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h +++ b/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | |||
@@ -32,7 +32,7 @@ | |||
32 | * Interrupts. Those in {} are for AMBA devices | 32 | * Interrupts. Those in {} are for AMBA devices |
33 | */ | 33 | */ |
34 | #define IRQ_CT_CA9X4_CLCDC { 76 } | 34 | #define IRQ_CT_CA9X4_CLCDC { 76 } |
35 | #define IRQ_CT_CA9X4_DMC { -1 } | 35 | #define IRQ_CT_CA9X4_DMC { 0 } |
36 | #define IRQ_CT_CA9X4_SMC { 77, 78 } | 36 | #define IRQ_CT_CA9X4_SMC { 77, 78 } |
37 | #define IRQ_CT_CA9X4_TIMER0 80 | 37 | #define IRQ_CT_CA9X4_TIMER0 80 |
38 | #define IRQ_CT_CA9X4_TIMER1 81 | 38 | #define IRQ_CT_CA9X4_TIMER1 81 |
diff --git a/arch/arm/mach-vexpress/include/mach/entry-macro.S b/arch/arm/mach-vexpress/include/mach/entry-macro.S deleted file mode 100644 index a14f9e62ca92..000000000000 --- a/arch/arm/mach-vexpress/include/mach/entry-macro.S +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | .macro disable_fiq | ||
2 | .endm | ||
3 | |||
4 | .macro arch_ret_to_user, tmp1, tmp2 | ||
5 | .endm | ||
diff --git a/arch/arm/mach-vexpress/include/mach/system.h b/arch/arm/mach-vexpress/include/mach/system.h deleted file mode 100644 index f653a8e265bd..000000000000 --- a/arch/arm/mach-vexpress/include/mach/system.h +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-vexpress/include/mach/system.h | ||
3 | * | ||
4 | * Copyright (C) 2003 ARM Limited | ||
5 | * Copyright (C) 2000 Deep Blue Solutions Ltd | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | #ifndef __ASM_ARCH_SYSTEM_H | ||
22 | #define __ASM_ARCH_SYSTEM_H | ||
23 | |||
24 | static inline void arch_idle(void) | ||
25 | { | ||
26 | /* | ||
27 | * This should do all the clock switching | ||
28 | * and wait for interrupt tricks | ||
29 | */ | ||
30 | cpu_do_idle(); | ||
31 | } | ||
32 | |||
33 | #endif | ||
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index c76f9144898a..663a98831920 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c | |||
@@ -288,16 +288,16 @@ static struct mmci_platform_data v2m_mmci_data = { | |||
288 | .status = v2m_mmci_status, | 288 | .status = v2m_mmci_status, |
289 | }; | 289 | }; |
290 | 290 | ||
291 | static AMBA_DEVICE(aaci, "mb:aaci", V2M_AACI, NULL); | 291 | static AMBA_APB_DEVICE(aaci, "mb:aaci", 0, V2M_AACI, IRQ_V2M_AACI, NULL); |
292 | static AMBA_DEVICE(mmci, "mb:mmci", V2M_MMCI, &v2m_mmci_data); | 292 | static AMBA_APB_DEVICE(mmci, "mb:mmci", 0, V2M_MMCI, IRQ_V2M_MMCI, &v2m_mmci_data); |
293 | static AMBA_DEVICE(kmi0, "mb:kmi0", V2M_KMI0, NULL); | 293 | static AMBA_APB_DEVICE(kmi0, "mb:kmi0", 0, V2M_KMI0, IRQ_V2M_KMI0, NULL); |
294 | static AMBA_DEVICE(kmi1, "mb:kmi1", V2M_KMI1, NULL); | 294 | static AMBA_APB_DEVICE(kmi1, "mb:kmi1", 0, V2M_KMI1, IRQ_V2M_KMI1, NULL); |
295 | static AMBA_DEVICE(uart0, "mb:uart0", V2M_UART0, NULL); | 295 | static AMBA_APB_DEVICE(uart0, "mb:uart0", 0, V2M_UART0, IRQ_V2M_UART0, NULL); |
296 | static AMBA_DEVICE(uart1, "mb:uart1", V2M_UART1, NULL); | 296 | static AMBA_APB_DEVICE(uart1, "mb:uart1", 0, V2M_UART1, IRQ_V2M_UART1, NULL); |
297 | static AMBA_DEVICE(uart2, "mb:uart2", V2M_UART2, NULL); | 297 | static AMBA_APB_DEVICE(uart2, "mb:uart2", 0, V2M_UART2, IRQ_V2M_UART2, NULL); |
298 | static AMBA_DEVICE(uart3, "mb:uart3", V2M_UART3, NULL); | 298 | static AMBA_APB_DEVICE(uart3, "mb:uart3", 0, V2M_UART3, IRQ_V2M_UART3, NULL); |
299 | static AMBA_DEVICE(wdt, "mb:wdt", V2M_WDT, NULL); | 299 | static AMBA_APB_DEVICE(wdt, "mb:wdt", 0, V2M_WDT, IRQ_V2M_WDT, NULL); |
300 | static AMBA_DEVICE(rtc, "mb:rtc", V2M_RTC, NULL); | 300 | static AMBA_APB_DEVICE(rtc, "mb:rtc", 0, V2M_RTC, IRQ_V2M_RTC, NULL); |
301 | 301 | ||
302 | static struct amba_device *v2m_amba_devs[] __initdata = { | 302 | static struct amba_device *v2m_amba_devs[] __initdata = { |
303 | &aaci_device, | 303 | &aaci_device, |