diff options
Diffstat (limited to 'arch/arm/mach-iop32x/include/mach')
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/io.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/system.h | 21 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/vmalloc.h | 5 |
3 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/io.h b/arch/arm/mach-iop32x/include/mach/io.h index 059c783ce0b..2d88264b986 100644 --- a/arch/arm/mach-iop32x/include/mach/io.h +++ b/arch/arm/mach-iop32x/include/mach/io.h | |||
@@ -13,15 +13,8 @@ | |||
13 | 13 | ||
14 | #include <asm/hardware/iop3xx.h> | 14 | #include <asm/hardware/iop3xx.h> |
15 | 15 | ||
16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, | ||
17 | unsigned int mtype); | ||
18 | extern void __iop3xx_iounmap(void __iomem *addr); | ||
19 | |||
20 | #define IO_SPACE_LIMIT 0xffffffff | 16 | #define IO_SPACE_LIMIT 0xffffffff |
21 | #define __io(p) ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p)) | 17 | #define __io(p) ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p)) |
22 | #define __mem_pci(a) (a) | 18 | #define __mem_pci(a) (a) |
23 | 19 | ||
24 | #define __arch_ioremap __iop3xx_ioremap | ||
25 | #define __arch_iounmap __iop3xx_iounmap | ||
26 | |||
27 | #endif | 20 | #endif |
diff --git a/arch/arm/mach-iop32x/include/mach/system.h b/arch/arm/mach-iop32x/include/mach/system.h index a4b808fe0d8..4a88727bca9 100644 --- a/arch/arm/mach-iop32x/include/mach/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h | |||
@@ -7,28 +7,7 @@ | |||
7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | #include <asm/mach-types.h> | ||
11 | #include <asm/hardware/iop3xx.h> | ||
12 | #include <mach/n2100.h> | ||
13 | |||
14 | static inline void arch_idle(void) | 10 | static inline void arch_idle(void) |
15 | { | 11 | { |
16 | cpu_do_idle(); | 12 | cpu_do_idle(); |
17 | } | 13 | } |
18 | |||
19 | static inline void arch_reset(char mode, const char *cmd) | ||
20 | { | ||
21 | local_irq_disable(); | ||
22 | |||
23 | if (machine_is_n2100()) { | ||
24 | gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW); | ||
25 | gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT); | ||
26 | while (1) | ||
27 | ; | ||
28 | } | ||
29 | |||
30 | *IOP3XX_PCSR = 0x30; | ||
31 | |||
32 | /* Jump into ROM at address 0 */ | ||
33 | cpu_reset(0); | ||
34 | } | ||
diff --git a/arch/arm/mach-iop32x/include/mach/vmalloc.h b/arch/arm/mach-iop32x/include/mach/vmalloc.h deleted file mode 100644 index c4862d48e58..00000000000 --- a/arch/arm/mach-iop32x/include/mach/vmalloc.h +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-iop32x/include/mach/vmalloc.h | ||
3 | */ | ||
4 | |||
5 | #define VMALLOC_END 0xfe000000UL | ||