diff options
Diffstat (limited to 'arch/arm/mach-at91/include/mach')
-rw-r--r-- | arch/arm/mach-at91/include/mach/at_hdmac.h | 61 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/atmel-mci.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/board.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/hardware.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/uncompress.h | 6 |
5 files changed, 6 insertions, 68 deletions
diff --git a/arch/arm/mach-at91/include/mach/at_hdmac.h b/arch/arm/mach-at91/include/mach/at_hdmac.h deleted file mode 100644 index cab0997be3d..00000000000 --- a/arch/arm/mach-at91/include/mach/at_hdmac.h +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | /* | ||
2 | * Header file for the Atmel AHB DMA Controller driver | ||
3 | * | ||
4 | * Copyright (C) 2008 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | */ | ||
11 | #ifndef AT_HDMAC_H | ||
12 | #define AT_HDMAC_H | ||
13 | |||
14 | #include <linux/dmaengine.h> | ||
15 | |||
16 | /** | ||
17 | * struct at_dma_platform_data - Controller configuration parameters | ||
18 | * @nr_channels: Number of channels supported by hardware (max 8) | ||
19 | * @cap_mask: dma_capability flags supported by the platform | ||
20 | */ | ||
21 | struct at_dma_platform_data { | ||
22 | unsigned int nr_channels; | ||
23 | dma_cap_mask_t cap_mask; | ||
24 | }; | ||
25 | |||
26 | /** | ||
27 | * struct at_dma_slave - Controller-specific information about a slave | ||
28 | * @dma_dev: required DMA master device | ||
29 | * @cfg: Platform-specific initializer for the CFG register | ||
30 | */ | ||
31 | struct at_dma_slave { | ||
32 | struct device *dma_dev; | ||
33 | u32 cfg; | ||
34 | }; | ||
35 | |||
36 | |||
37 | /* Platform-configurable bits in CFG */ | ||
38 | #define ATC_SRC_PER(h) (0xFU & (h)) /* Channel src rq associated with periph handshaking ifc h */ | ||
39 | #define ATC_DST_PER(h) ((0xFU & (h)) << 4) /* Channel dst rq associated with periph handshaking ifc h */ | ||
40 | #define ATC_SRC_REP (0x1 << 8) /* Source Replay Mod */ | ||
41 | #define ATC_SRC_H2SEL (0x1 << 9) /* Source Handshaking Mod */ | ||
42 | #define ATC_SRC_H2SEL_SW (0x0 << 9) | ||
43 | #define ATC_SRC_H2SEL_HW (0x1 << 9) | ||
44 | #define ATC_DST_REP (0x1 << 12) /* Destination Replay Mod */ | ||
45 | #define ATC_DST_H2SEL (0x1 << 13) /* Destination Handshaking Mod */ | ||
46 | #define ATC_DST_H2SEL_SW (0x0 << 13) | ||
47 | #define ATC_DST_H2SEL_HW (0x1 << 13) | ||
48 | #define ATC_SOD (0x1 << 16) /* Stop On Done */ | ||
49 | #define ATC_LOCK_IF (0x1 << 20) /* Interface Lock */ | ||
50 | #define ATC_LOCK_B (0x1 << 21) /* AHB Bus Lock */ | ||
51 | #define ATC_LOCK_IF_L (0x1 << 22) /* Master Interface Arbiter Lock */ | ||
52 | #define ATC_LOCK_IF_L_CHUNK (0x0 << 22) | ||
53 | #define ATC_LOCK_IF_L_BUFFER (0x1 << 22) | ||
54 | #define ATC_AHB_PROT_MASK (0x7 << 24) /* AHB Protection */ | ||
55 | #define ATC_FIFOCFG_MASK (0x3 << 28) /* FIFO Request Configuration */ | ||
56 | #define ATC_FIFOCFG_LARGESTBURST (0x0 << 28) | ||
57 | #define ATC_FIFOCFG_HALFFIFO (0x1 << 28) | ||
58 | #define ATC_FIFOCFG_ENOUGHSPACE (0x2 << 28) | ||
59 | |||
60 | |||
61 | #endif /* AT_HDMAC_H */ | ||
diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h index 998cb0c0713..cd580a12e90 100644 --- a/arch/arm/mach-at91/include/mach/atmel-mci.h +++ b/arch/arm/mach-at91/include/mach/atmel-mci.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __MACH_ATMEL_MCI_H | 1 | #ifndef __MACH_ATMEL_MCI_H |
2 | #define __MACH_ATMEL_MCI_H | 2 | #define __MACH_ATMEL_MCI_H |
3 | 3 | ||
4 | #include <mach/at_hdmac.h> | 4 | #include <linux/platform_data/dma-atmel.h> |
5 | 5 | ||
6 | /** | 6 | /** |
7 | * struct mci_dma_data - DMA data for MCI interface | 7 | * struct mci_dma_data - DMA data for MCI interface |
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h index 369afc2ffc5..c55a4364ffb 100644 --- a/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h | |||
@@ -187,7 +187,6 @@ struct at91_can_data { | |||
187 | extern void __init at91_add_device_can(struct at91_can_data *data); | 187 | extern void __init at91_add_device_can(struct at91_can_data *data); |
188 | 188 | ||
189 | /* LEDs */ | 189 | /* LEDs */ |
190 | extern void __init at91_init_leds(u8 cpu_led, u8 timer_led); | ||
191 | extern void __init at91_gpio_leds(struct gpio_led *leds, int nr); | 190 | extern void __init at91_gpio_leds(struct gpio_led *leds, int nr); |
192 | extern void __init at91_pwm_leds(struct gpio_led *leds, int nr); | 191 | extern void __init at91_pwm_leds(struct gpio_led *leds, int nr); |
193 | 192 | ||
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index 09242b67d27..711a7892d33 100644 --- a/arch/arm/mach-at91/include/mach/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h | |||
@@ -67,13 +67,13 @@ | |||
67 | * to 0xFEF78000 .. 0xFF000000. (544Kb) | 67 | * to 0xFEF78000 .. 0xFF000000. (544Kb) |
68 | */ | 68 | */ |
69 | #define AT91_IO_PHYS_BASE 0xFFF78000 | 69 | #define AT91_IO_PHYS_BASE 0xFFF78000 |
70 | #define AT91_IO_VIRT_BASE (0xFF000000 - AT91_IO_SIZE) | 70 | #define AT91_IO_VIRT_BASE IOMEM(0xFF000000 - AT91_IO_SIZE) |
71 | #else | 71 | #else |
72 | /* | 72 | /* |
73 | * Identity mapping for the non MMU case. | 73 | * Identity mapping for the non MMU case. |
74 | */ | 74 | */ |
75 | #define AT91_IO_PHYS_BASE AT91_BASE_SYS | 75 | #define AT91_IO_PHYS_BASE AT91_BASE_SYS |
76 | #define AT91_IO_VIRT_BASE AT91_IO_PHYS_BASE | 76 | #define AT91_IO_VIRT_BASE IOMEM(AT91_IO_PHYS_BASE) |
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | #define AT91_IO_SIZE (0xFFFFFFFF - AT91_IO_PHYS_BASE + 1) | 79 | #define AT91_IO_SIZE (0xFFFFFFFF - AT91_IO_PHYS_BASE + 1) |
diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h index 6f6118d1576..97ad68a826f 100644 --- a/arch/arm/mach-at91/include/mach/uncompress.h +++ b/arch/arm/mach-at91/include/mach/uncompress.h | |||
@@ -94,7 +94,7 @@ static const u32 uarts_sam9x5[] = { | |||
94 | 0, | 94 | 0, |
95 | }; | 95 | }; |
96 | 96 | ||
97 | static inline const u32* decomp_soc_detect(u32 dbgu_base) | 97 | static inline const u32* decomp_soc_detect(void __iomem *dbgu_base) |
98 | { | 98 | { |
99 | u32 cidr, socid; | 99 | u32 cidr, socid; |
100 | 100 | ||
@@ -142,10 +142,10 @@ static inline void arch_decomp_setup(void) | |||
142 | int i = 0; | 142 | int i = 0; |
143 | const u32* usarts; | 143 | const u32* usarts; |
144 | 144 | ||
145 | usarts = decomp_soc_detect(AT91_BASE_DBGU0); | 145 | usarts = decomp_soc_detect((void __iomem *)AT91_BASE_DBGU0); |
146 | 146 | ||
147 | if (!usarts) | 147 | if (!usarts) |
148 | usarts = decomp_soc_detect(AT91_BASE_DBGU1); | 148 | usarts = decomp_soc_detect((void __iomem *)AT91_BASE_DBGU1); |
149 | if (!usarts) { | 149 | if (!usarts) { |
150 | at91_uart = NULL; | 150 | at91_uart = NULL; |
151 | return; | 151 | return; |