diff options
Diffstat (limited to 'arch/blackfin')
23 files changed, 2160 insertions, 219 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index d98bafcaca59..385c2626b666 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -71,6 +71,7 @@ config GENERIC_CALIBRATE_DELAY | |||
71 | 71 | ||
72 | config IRQCHIP_DEMUX_GPIO | 72 | config IRQCHIP_DEMUX_GPIO |
73 | bool | 73 | bool |
74 | depends on (BF53x || BF561) | ||
74 | default y | 75 | default y |
75 | 76 | ||
76 | source "init/Kconfig" | 77 | source "init/Kconfig" |
@@ -114,6 +115,26 @@ config BF537 | |||
114 | help | 115 | help |
115 | BF537 Processor Support. | 116 | BF537 Processor Support. |
116 | 117 | ||
118 | config BF542 | ||
119 | bool "BF542" | ||
120 | help | ||
121 | BF542 Processor Support. | ||
122 | |||
123 | config BF544 | ||
124 | bool "BF544" | ||
125 | help | ||
126 | BF544 Processor Support. | ||
127 | |||
128 | config BF548 | ||
129 | bool "BF548" | ||
130 | help | ||
131 | BF548 Processor Support. | ||
132 | |||
133 | config BF549 | ||
134 | bool "BF549" | ||
135 | help | ||
136 | BF549 Processor Support. | ||
137 | |||
117 | config BF561 | 138 | config BF561 |
118 | bool "BF561" | 139 | bool "BF561" |
119 | help | 140 | help |
@@ -125,6 +146,11 @@ choice | |||
125 | prompt "Silicon Rev" | 146 | prompt "Silicon Rev" |
126 | default BF_REV_0_2 if BF537 | 147 | default BF_REV_0_2 if BF537 |
127 | default BF_REV_0_3 if BF533 | 148 | default BF_REV_0_3 if BF533 |
149 | default BF_REV_0_0 if BF549 | ||
150 | |||
151 | config BF_REV_0_0 | ||
152 | bool "0.0" | ||
153 | depends on (BF549) | ||
128 | 154 | ||
129 | config BF_REV_0_2 | 155 | config BF_REV_0_2 |
130 | bool "0.2" | 156 | bool "0.2" |
@@ -150,6 +176,16 @@ config BF_REV_NONE | |||
150 | 176 | ||
151 | endchoice | 177 | endchoice |
152 | 178 | ||
179 | config BF53x | ||
180 | bool | ||
181 | depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537) | ||
182 | default y | ||
183 | |||
184 | config BF54x | ||
185 | bool | ||
186 | depends on (BF542 || BF544 || BF548 || BF549) | ||
187 | default y | ||
188 | |||
153 | config BFIN_DUAL_CORE | 189 | config BFIN_DUAL_CORE |
154 | bool | 190 | bool |
155 | depends on (BF561) | 191 | depends on (BF561) |
@@ -198,6 +234,12 @@ config BFIN537_BLUETECHNIX_CM | |||
198 | help | 234 | help |
199 | CM-BF537 support for EVAL- and DEV-Board. | 235 | CM-BF537 support for EVAL- and DEV-Board. |
200 | 236 | ||
237 | config BFIN548_EZKIT | ||
238 | bool "BF548-EZKIT" | ||
239 | depends on (BF548 || BF549) | ||
240 | help | ||
241 | BFIN548-EZKIT board Support. | ||
242 | |||
201 | config BFIN561_BLUETECHNIX_CM | 243 | config BFIN561_BLUETECHNIX_CM |
202 | bool "Bluetechnix CM-BF561" | 244 | bool "Bluetechnix CM-BF561" |
203 | depends on (BF561) | 245 | depends on (BF561) |
@@ -265,6 +307,7 @@ config BFIN_SHARED_FLASH_ENET | |||
265 | source "arch/blackfin/mach-bf533/Kconfig" | 307 | source "arch/blackfin/mach-bf533/Kconfig" |
266 | source "arch/blackfin/mach-bf561/Kconfig" | 308 | source "arch/blackfin/mach-bf561/Kconfig" |
267 | source "arch/blackfin/mach-bf537/Kconfig" | 309 | source "arch/blackfin/mach-bf537/Kconfig" |
310 | source "arch/blackfin/mach-bf548/Kconfig" | ||
268 | 311 | ||
269 | menu "Board customizations" | 312 | menu "Board customizations" |
270 | 313 | ||
@@ -543,7 +586,7 @@ source "mm/Kconfig" | |||
543 | 586 | ||
544 | config BFIN_DMA_5XX | 587 | config BFIN_DMA_5XX |
545 | bool "Enable DMA Support" | 588 | bool "Enable DMA Support" |
546 | depends on (BF533 || BF532 || BF531 || BF537 || BF536 || BF534 || BF561) | 589 | depends on (BF533 || BF532 || BF531 || BF537 || BF536 || BF534 || BF561 || BF54x) |
547 | default y | 590 | default y |
548 | help | 591 | help |
549 | DMA driver for BF5xx. | 592 | DMA driver for BF5xx. |
@@ -839,7 +882,7 @@ endchoice | |||
839 | 882 | ||
840 | endmenu | 883 | endmenu |
841 | 884 | ||
842 | if (BF537 || BF533) | 885 | if (BF537 || BF533 || BF54x) |
843 | 886 | ||
844 | menu "CPU Frequency scaling" | 887 | menu "CPU Frequency scaling" |
845 | 888 | ||
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 6971a4418dfe..1b75672dfc8f 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile | |||
@@ -24,6 +24,8 @@ machine-$(CONFIG_BF533) := bf533 | |||
24 | machine-$(CONFIG_BF534) := bf537 | 24 | machine-$(CONFIG_BF534) := bf537 |
25 | machine-$(CONFIG_BF536) := bf537 | 25 | machine-$(CONFIG_BF536) := bf537 |
26 | machine-$(CONFIG_BF537) := bf537 | 26 | machine-$(CONFIG_BF537) := bf537 |
27 | machine-$(CONFIG_BF548) := bf548 | ||
28 | machine-$(CONFIG_BF549) := bf548 | ||
27 | machine-$(CONFIG_BF561) := bf561 | 29 | machine-$(CONFIG_BF561) := bf561 |
28 | MACHINE := $(machine-y) | 30 | MACHINE := $(machine-y) |
29 | export MACHINE | 31 | export MACHINE |
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile index f3b7d2f9d49c..93d21406cade 100644 --- a/arch/blackfin/kernel/Makefile +++ b/arch/blackfin/kernel/Makefile | |||
@@ -6,9 +6,10 @@ extra-y := init_task.o vmlinux.lds | |||
6 | 6 | ||
7 | obj-y := \ | 7 | obj-y := \ |
8 | entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \ | 8 | entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \ |
9 | sys_bfin.o time.o traps.o irqchip.o dma-mapping.o bfin_gpio.o \ | 9 | sys_bfin.o time.o traps.o irqchip.o dma-mapping.o flat.o |
10 | flat.o | ||
11 | 10 | ||
11 | obj-$(CONFIG_BF53x) += bfin_gpio.o | ||
12 | obj-$(CONFIG_BF561) += bfin_gpio.o | ||
12 | obj-$(CONFIG_MODULES) += module.o | 13 | obj-$(CONFIG_MODULES) += module.o |
13 | obj-$(CONFIG_BFIN_DMA_5XX) += bfin_dma_5xx.o | 14 | obj-$(CONFIG_BFIN_DMA_5XX) += bfin_dma_5xx.o |
14 | obj-$(CONFIG_DUAL_CORE_TEST_MODULE) += dualcore_test.o | 15 | obj-$(CONFIG_DUAL_CORE_TEST_MODULE) += dualcore_test.o |
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index 069a896a8f26..8a16c2bbec04 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
35 | #include <linux/param.h> | 35 | #include <linux/param.h> |
36 | 36 | ||
37 | #include <asm/blackfin.h> | ||
37 | #include <asm/dma.h> | 38 | #include <asm/dma.h> |
38 | #include <asm/cacheflush.h> | 39 | #include <asm/cacheflush.h> |
39 | 40 | ||
@@ -45,67 +46,6 @@ | |||
45 | ***************************************************************************/ | 46 | ***************************************************************************/ |
46 | 47 | ||
47 | static struct dma_channel dma_ch[MAX_BLACKFIN_DMA_CHANNEL]; | 48 | static struct dma_channel dma_ch[MAX_BLACKFIN_DMA_CHANNEL]; |
48 | #if defined (CONFIG_BF561) | ||
49 | static struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { | ||
50 | (struct dma_register *) DMA1_0_NEXT_DESC_PTR, | ||
51 | (struct dma_register *) DMA1_1_NEXT_DESC_PTR, | ||
52 | (struct dma_register *) DMA1_2_NEXT_DESC_PTR, | ||
53 | (struct dma_register *) DMA1_3_NEXT_DESC_PTR, | ||
54 | (struct dma_register *) DMA1_4_NEXT_DESC_PTR, | ||
55 | (struct dma_register *) DMA1_5_NEXT_DESC_PTR, | ||
56 | (struct dma_register *) DMA1_6_NEXT_DESC_PTR, | ||
57 | (struct dma_register *) DMA1_7_NEXT_DESC_PTR, | ||
58 | (struct dma_register *) DMA1_8_NEXT_DESC_PTR, | ||
59 | (struct dma_register *) DMA1_9_NEXT_DESC_PTR, | ||
60 | (struct dma_register *) DMA1_10_NEXT_DESC_PTR, | ||
61 | (struct dma_register *) DMA1_11_NEXT_DESC_PTR, | ||
62 | (struct dma_register *) DMA2_0_NEXT_DESC_PTR, | ||
63 | (struct dma_register *) DMA2_1_NEXT_DESC_PTR, | ||
64 | (struct dma_register *) DMA2_2_NEXT_DESC_PTR, | ||
65 | (struct dma_register *) DMA2_3_NEXT_DESC_PTR, | ||
66 | (struct dma_register *) DMA2_4_NEXT_DESC_PTR, | ||
67 | (struct dma_register *) DMA2_5_NEXT_DESC_PTR, | ||
68 | (struct dma_register *) DMA2_6_NEXT_DESC_PTR, | ||
69 | (struct dma_register *) DMA2_7_NEXT_DESC_PTR, | ||
70 | (struct dma_register *) DMA2_8_NEXT_DESC_PTR, | ||
71 | (struct dma_register *) DMA2_9_NEXT_DESC_PTR, | ||
72 | (struct dma_register *) DMA2_10_NEXT_DESC_PTR, | ||
73 | (struct dma_register *) DMA2_11_NEXT_DESC_PTR, | ||
74 | (struct dma_register *) MDMA1_D0_NEXT_DESC_PTR, | ||
75 | (struct dma_register *) MDMA1_S0_NEXT_DESC_PTR, | ||
76 | (struct dma_register *) MDMA1_D1_NEXT_DESC_PTR, | ||
77 | (struct dma_register *) MDMA1_S1_NEXT_DESC_PTR, | ||
78 | (struct dma_register *) MDMA2_D0_NEXT_DESC_PTR, | ||
79 | (struct dma_register *) MDMA2_S0_NEXT_DESC_PTR, | ||
80 | (struct dma_register *) MDMA2_D1_NEXT_DESC_PTR, | ||
81 | (struct dma_register *) MDMA2_S1_NEXT_DESC_PTR, | ||
82 | (struct dma_register *) IMDMA_D0_NEXT_DESC_PTR, | ||
83 | (struct dma_register *) IMDMA_S0_NEXT_DESC_PTR, | ||
84 | (struct dma_register *) IMDMA_D1_NEXT_DESC_PTR, | ||
85 | (struct dma_register *) IMDMA_S1_NEXT_DESC_PTR, | ||
86 | }; | ||
87 | #else | ||
88 | static struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { | ||
89 | (struct dma_register *) DMA0_NEXT_DESC_PTR, | ||
90 | (struct dma_register *) DMA1_NEXT_DESC_PTR, | ||
91 | (struct dma_register *) DMA2_NEXT_DESC_PTR, | ||
92 | (struct dma_register *) DMA3_NEXT_DESC_PTR, | ||
93 | (struct dma_register *) DMA4_NEXT_DESC_PTR, | ||
94 | (struct dma_register *) DMA5_NEXT_DESC_PTR, | ||
95 | (struct dma_register *) DMA6_NEXT_DESC_PTR, | ||
96 | (struct dma_register *) DMA7_NEXT_DESC_PTR, | ||
97 | #if (defined(CONFIG_BF537) || defined(CONFIG_BF534) || defined(CONFIG_BF536)) | ||
98 | (struct dma_register *) DMA8_NEXT_DESC_PTR, | ||
99 | (struct dma_register *) DMA9_NEXT_DESC_PTR, | ||
100 | (struct dma_register *) DMA10_NEXT_DESC_PTR, | ||
101 | (struct dma_register *) DMA11_NEXT_DESC_PTR, | ||
102 | #endif | ||
103 | (struct dma_register *) MDMA_D0_NEXT_DESC_PTR, | ||
104 | (struct dma_register *) MDMA_S0_NEXT_DESC_PTR, | ||
105 | (struct dma_register *) MDMA_D1_NEXT_DESC_PTR, | ||
106 | (struct dma_register *) MDMA_S1_NEXT_DESC_PTR, | ||
107 | }; | ||
108 | #endif | ||
109 | 49 | ||
110 | /*------------------------------------------------------------------------------ | 50 | /*------------------------------------------------------------------------------ |
111 | * Set the Buffer Clear bit in the Configuration register of specific DMA | 51 | * Set the Buffer Clear bit in the Configuration register of specific DMA |
@@ -138,149 +78,6 @@ static int __init blackfin_dma_init(void) | |||
138 | 78 | ||
139 | arch_initcall(blackfin_dma_init); | 79 | arch_initcall(blackfin_dma_init); |
140 | 80 | ||
141 | /* | ||
142 | * Form the channel find the irq number for that channel. | ||
143 | */ | ||
144 | #if !defined(CONFIG_BF561) | ||
145 | |||
146 | static int bf533_channel2irq(unsigned int channel) | ||
147 | { | ||
148 | int ret_irq = -1; | ||
149 | |||
150 | switch (channel) { | ||
151 | case CH_PPI: | ||
152 | ret_irq = IRQ_PPI; | ||
153 | break; | ||
154 | |||
155 | #if (defined(CONFIG_BF537) || defined(CONFIG_BF534) || defined(CONFIG_BF536)) | ||
156 | case CH_EMAC_RX: | ||
157 | ret_irq = IRQ_MAC_RX; | ||
158 | break; | ||
159 | |||
160 | case CH_EMAC_TX: | ||
161 | ret_irq = IRQ_MAC_TX; | ||
162 | break; | ||
163 | |||
164 | case CH_UART1_RX: | ||
165 | ret_irq = IRQ_UART1_RX; | ||
166 | break; | ||
167 | |||
168 | case CH_UART1_TX: | ||
169 | ret_irq = IRQ_UART1_TX; | ||
170 | break; | ||
171 | #endif | ||
172 | |||
173 | case CH_SPORT0_RX: | ||
174 | ret_irq = IRQ_SPORT0_RX; | ||
175 | break; | ||
176 | |||
177 | case CH_SPORT0_TX: | ||
178 | ret_irq = IRQ_SPORT0_TX; | ||
179 | break; | ||
180 | |||
181 | case CH_SPORT1_RX: | ||
182 | ret_irq = IRQ_SPORT1_RX; | ||
183 | break; | ||
184 | |||
185 | case CH_SPORT1_TX: | ||
186 | ret_irq = IRQ_SPORT1_TX; | ||
187 | break; | ||
188 | |||
189 | case CH_SPI: | ||
190 | ret_irq = IRQ_SPI; | ||
191 | break; | ||
192 | |||
193 | case CH_UART_RX: | ||
194 | ret_irq = IRQ_UART_RX; | ||
195 | break; | ||
196 | |||
197 | case CH_UART_TX: | ||
198 | ret_irq = IRQ_UART_TX; | ||
199 | break; | ||
200 | |||
201 | case CH_MEM_STREAM0_SRC: | ||
202 | case CH_MEM_STREAM0_DEST: | ||
203 | ret_irq = IRQ_MEM_DMA0; | ||
204 | break; | ||
205 | |||
206 | case CH_MEM_STREAM1_SRC: | ||
207 | case CH_MEM_STREAM1_DEST: | ||
208 | ret_irq = IRQ_MEM_DMA1; | ||
209 | break; | ||
210 | } | ||
211 | return ret_irq; | ||
212 | } | ||
213 | |||
214 | # define channel2irq(channel) bf533_channel2irq(channel) | ||
215 | |||
216 | #else | ||
217 | |||
218 | static int bf561_channel2irq(unsigned int channel) | ||
219 | { | ||
220 | int ret_irq = -1; | ||
221 | |||
222 | switch (channel) { | ||
223 | case CH_PPI0: | ||
224 | ret_irq = IRQ_PPI0; | ||
225 | break; | ||
226 | case CH_PPI1: | ||
227 | ret_irq = IRQ_PPI1; | ||
228 | break; | ||
229 | case CH_SPORT0_RX: | ||
230 | ret_irq = IRQ_SPORT0_RX; | ||
231 | break; | ||
232 | case CH_SPORT0_TX: | ||
233 | ret_irq = IRQ_SPORT0_TX; | ||
234 | break; | ||
235 | case CH_SPORT1_RX: | ||
236 | ret_irq = IRQ_SPORT1_RX; | ||
237 | break; | ||
238 | case CH_SPORT1_TX: | ||
239 | ret_irq = IRQ_SPORT1_TX; | ||
240 | break; | ||
241 | case CH_SPI: | ||
242 | ret_irq = IRQ_SPI; | ||
243 | break; | ||
244 | case CH_UART_RX: | ||
245 | ret_irq = IRQ_UART_RX; | ||
246 | break; | ||
247 | case CH_UART_TX: | ||
248 | ret_irq = IRQ_UART_TX; | ||
249 | break; | ||
250 | |||
251 | case CH_MEM_STREAM0_SRC: | ||
252 | case CH_MEM_STREAM0_DEST: | ||
253 | ret_irq = IRQ_MEM_DMA0; | ||
254 | break; | ||
255 | case CH_MEM_STREAM1_SRC: | ||
256 | case CH_MEM_STREAM1_DEST: | ||
257 | ret_irq = IRQ_MEM_DMA1; | ||
258 | break; | ||
259 | case CH_MEM_STREAM2_SRC: | ||
260 | case CH_MEM_STREAM2_DEST: | ||
261 | ret_irq = IRQ_MEM_DMA2; | ||
262 | break; | ||
263 | case CH_MEM_STREAM3_SRC: | ||
264 | case CH_MEM_STREAM3_DEST: | ||
265 | ret_irq = IRQ_MEM_DMA3; | ||
266 | break; | ||
267 | |||
268 | case CH_IMEM_STREAM0_SRC: | ||
269 | case CH_IMEM_STREAM0_DEST: | ||
270 | ret_irq = IRQ_IMEM_DMA0; | ||
271 | break; | ||
272 | case CH_IMEM_STREAM1_SRC: | ||
273 | case CH_IMEM_STREAM1_DEST: | ||
274 | ret_irq = IRQ_IMEM_DMA1; | ||
275 | break; | ||
276 | } | ||
277 | return ret_irq; | ||
278 | } | ||
279 | |||
280 | # define channel2irq(channel) bf561_channel2irq(channel) | ||
281 | |||
282 | #endif | ||
283 | |||
284 | /*------------------------------------------------------------------------------ | 81 | /*------------------------------------------------------------------------------ |
285 | * Request the specific DMA channel from the system. | 82 | * Request the specific DMA channel from the system. |
286 | *-----------------------------------------------------------------------------*/ | 83 | *-----------------------------------------------------------------------------*/ |
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 83060f98d15d..76bf2cea61d7 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -500,8 +500,9 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i, | |||
500 | cplb_data[i].end, | 500 | cplb_data[i].end, |
501 | SIZE_4M, | 501 | SIZE_4M, |
502 | cplb_data[i].i_conf); | 502 | cplb_data[i].i_conf); |
503 | } else { | 503 | } else |
504 | #endif | 504 | #endif |
505 | { | ||
505 | fill_cplbtab(t, | 506 | fill_cplbtab(t, |
506 | cplb_data[i].start, | 507 | cplb_data[i].start, |
507 | a_start, | 508 | a_start, |
diff --git a/arch/blackfin/mach-bf533/Makefile b/arch/blackfin/mach-bf533/Makefile index 76d2c2b8579a..0322546aea8c 100644 --- a/arch/blackfin/mach-bf533/Makefile +++ b/arch/blackfin/mach-bf533/Makefile | |||
@@ -4,6 +4,6 @@ | |||
4 | 4 | ||
5 | extra-y := head.o | 5 | extra-y := head.o |
6 | 6 | ||
7 | obj-y := ints-priority.o | 7 | obj-y := ints-priority.o dma.o |
8 | 8 | ||
9 | obj-$(CONFIG_CPU_FREQ_BF533) += cpu.o | 9 | obj-$(CONFIG_CPU_FREQ_BF533) += cpu.o |
diff --git a/arch/blackfin/mach-bf533/dma.c b/arch/blackfin/mach-bf533/dma.c new file mode 100644 index 000000000000..c4e405492634 --- /dev/null +++ b/arch/blackfin/mach-bf533/dma.c | |||
@@ -0,0 +1,95 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf533/dma.c | ||
3 | * Based on: | ||
4 | * Author: | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: This file contains the simple DMA Implementation for Blackfin | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2004-2006 Analog Devices Inc. | ||
11 | * | ||
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, see the file COPYING, or write | ||
26 | * to the Free Software Foundation, Inc., | ||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
28 | */ | ||
29 | #include <asm/blackfin.h> | ||
30 | #include <asm/dma.h> | ||
31 | |||
32 | struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { | ||
33 | (struct dma_register *) DMA0_NEXT_DESC_PTR, | ||
34 | (struct dma_register *) DMA1_NEXT_DESC_PTR, | ||
35 | (struct dma_register *) DMA2_NEXT_DESC_PTR, | ||
36 | (struct dma_register *) DMA3_NEXT_DESC_PTR, | ||
37 | (struct dma_register *) DMA4_NEXT_DESC_PTR, | ||
38 | (struct dma_register *) DMA5_NEXT_DESC_PTR, | ||
39 | (struct dma_register *) DMA6_NEXT_DESC_PTR, | ||
40 | (struct dma_register *) DMA7_NEXT_DESC_PTR, | ||
41 | (struct dma_register *) MDMA_D0_NEXT_DESC_PTR, | ||
42 | (struct dma_register *) MDMA_S0_NEXT_DESC_PTR, | ||
43 | (struct dma_register *) MDMA_D1_NEXT_DESC_PTR, | ||
44 | (struct dma_register *) MDMA_S1_NEXT_DESC_PTR, | ||
45 | }; | ||
46 | |||
47 | int bf533_channel2irq(unsigned int channel) | ||
48 | { | ||
49 | int ret_irq = -1; | ||
50 | |||
51 | switch (channel) { | ||
52 | case CH_PPI: | ||
53 | ret_irq = IRQ_PPI; | ||
54 | break; | ||
55 | |||
56 | case CH_SPORT0_RX: | ||
57 | ret_irq = IRQ_SPORT0_RX; | ||
58 | break; | ||
59 | |||
60 | case CH_SPORT0_TX: | ||
61 | ret_irq = IRQ_SPORT0_TX; | ||
62 | break; | ||
63 | |||
64 | case CH_SPORT1_RX: | ||
65 | ret_irq = IRQ_SPORT1_RX; | ||
66 | break; | ||
67 | |||
68 | case CH_SPORT1_TX: | ||
69 | ret_irq = IRQ_SPORT1_TX; | ||
70 | break; | ||
71 | |||
72 | case CH_SPI: | ||
73 | ret_irq = IRQ_SPI; | ||
74 | break; | ||
75 | |||
76 | case CH_UART_RX: | ||
77 | ret_irq = IRQ_UART_RX; | ||
78 | break; | ||
79 | |||
80 | case CH_UART_TX: | ||
81 | ret_irq = IRQ_UART_TX; | ||
82 | break; | ||
83 | |||
84 | case CH_MEM_STREAM0_SRC: | ||
85 | case CH_MEM_STREAM0_DEST: | ||
86 | ret_irq = IRQ_MEM_DMA0; | ||
87 | break; | ||
88 | |||
89 | case CH_MEM_STREAM1_SRC: | ||
90 | case CH_MEM_STREAM1_DEST: | ||
91 | ret_irq = IRQ_MEM_DMA1; | ||
92 | break; | ||
93 | } | ||
94 | return ret_irq; | ||
95 | } | ||
diff --git a/arch/blackfin/mach-bf537/Makefile b/arch/blackfin/mach-bf537/Makefile index f32d44215bb7..7e7c9c8ac5b2 100644 --- a/arch/blackfin/mach-bf537/Makefile +++ b/arch/blackfin/mach-bf537/Makefile | |||
@@ -4,6 +4,6 @@ | |||
4 | 4 | ||
5 | extra-y := head.o | 5 | extra-y := head.o |
6 | 6 | ||
7 | obj-y := ints-priority.o | 7 | obj-y := ints-priority.o dma.o |
8 | 8 | ||
9 | obj-$(CONFIG_CPU_FREQ) += cpu.o | 9 | obj-$(CONFIG_CPU_FREQ) += cpu.o |
diff --git a/arch/blackfin/mach-bf537/dma.c b/arch/blackfin/mach-bf537/dma.c new file mode 100644 index 000000000000..706cb97b0265 --- /dev/null +++ b/arch/blackfin/mach-bf537/dma.c | |||
@@ -0,0 +1,115 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf537/dma.c | ||
3 | * Based on: | ||
4 | * Author: | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: This file contains the simple DMA Implementation for Blackfin | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2004-2007 Analog Devices Inc. | ||
11 | * | ||
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, see the file COPYING, or write | ||
26 | * to the Free Software Foundation, Inc., | ||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
28 | */ | ||
29 | #include <asm/blackfin.h> | ||
30 | #include <asm/dma.h> | ||
31 | |||
32 | struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { | ||
33 | (struct dma_register *) DMA0_NEXT_DESC_PTR, | ||
34 | (struct dma_register *) DMA1_NEXT_DESC_PTR, | ||
35 | (struct dma_register *) DMA2_NEXT_DESC_PTR, | ||
36 | (struct dma_register *) DMA3_NEXT_DESC_PTR, | ||
37 | (struct dma_register *) DMA4_NEXT_DESC_PTR, | ||
38 | (struct dma_register *) DMA5_NEXT_DESC_PTR, | ||
39 | (struct dma_register *) DMA6_NEXT_DESC_PTR, | ||
40 | (struct dma_register *) DMA7_NEXT_DESC_PTR, | ||
41 | (struct dma_register *) DMA8_NEXT_DESC_PTR, | ||
42 | (struct dma_register *) DMA9_NEXT_DESC_PTR, | ||
43 | (struct dma_register *) DMA10_NEXT_DESC_PTR, | ||
44 | (struct dma_register *) DMA11_NEXT_DESC_PTR, | ||
45 | (struct dma_register *) MDMA_D0_NEXT_DESC_PTR, | ||
46 | (struct dma_register *) MDMA_S0_NEXT_DESC_PTR, | ||
47 | (struct dma_register *) MDMA_D1_NEXT_DESC_PTR, | ||
48 | (struct dma_register *) MDMA_S1_NEXT_DESC_PTR, | ||
49 | }; | ||
50 | |||
51 | int channel2irq(unsigned int channel) | ||
52 | { | ||
53 | int ret_irq = -1; | ||
54 | |||
55 | switch (channel) { | ||
56 | case CH_PPI: | ||
57 | ret_irq = IRQ_PPI; | ||
58 | break; | ||
59 | |||
60 | case CH_EMAC_RX: | ||
61 | ret_irq = IRQ_MAC_RX; | ||
62 | break; | ||
63 | |||
64 | case CH_EMAC_TX: | ||
65 | ret_irq = IRQ_MAC_TX; | ||
66 | break; | ||
67 | |||
68 | case CH_UART1_RX: | ||
69 | ret_irq = IRQ_UART1_RX; | ||
70 | break; | ||
71 | |||
72 | case CH_UART1_TX: | ||
73 | ret_irq = IRQ_UART1_TX; | ||
74 | break; | ||
75 | |||
76 | case CH_SPORT0_RX: | ||
77 | ret_irq = IRQ_SPORT0_RX; | ||
78 | break; | ||
79 | |||
80 | case CH_SPORT0_TX: | ||
81 | ret_irq = IRQ_SPORT0_TX; | ||
82 | break; | ||
83 | |||
84 | case CH_SPORT1_RX: | ||
85 | ret_irq = IRQ_SPORT1_RX; | ||
86 | break; | ||
87 | |||
88 | case CH_SPORT1_TX: | ||
89 | ret_irq = IRQ_SPORT1_TX; | ||
90 | break; | ||
91 | |||
92 | case CH_SPI: | ||
93 | ret_irq = IRQ_SPI; | ||
94 | break; | ||
95 | |||
96 | case CH_UART_RX: | ||
97 | ret_irq = IRQ_UART_RX; | ||
98 | break; | ||
99 | |||
100 | case CH_UART_TX: | ||
101 | ret_irq = IRQ_UART_TX; | ||
102 | break; | ||
103 | |||
104 | case CH_MEM_STREAM0_SRC: | ||
105 | case CH_MEM_STREAM0_DEST: | ||
106 | ret_irq = IRQ_MEM_DMA0; | ||
107 | break; | ||
108 | |||
109 | case CH_MEM_STREAM1_SRC: | ||
110 | case CH_MEM_STREAM1_DEST: | ||
111 | ret_irq = IRQ_MEM_DMA1; | ||
112 | break; | ||
113 | } | ||
114 | return ret_irq; | ||
115 | } | ||
diff --git a/arch/blackfin/mach-bf548/Kconfig b/arch/blackfin/mach-bf548/Kconfig new file mode 100644 index 000000000000..b28625e921be --- /dev/null +++ b/arch/blackfin/mach-bf548/Kconfig | |||
@@ -0,0 +1,282 @@ | |||
1 | if (BF54x) | ||
2 | |||
3 | menu "BF548 Specific Configuration" | ||
4 | |||
5 | comment "Interrupt Priority Assignment" | ||
6 | menu "Priority" | ||
7 | |||
8 | config IRQ_PLL_WAKEUP | ||
9 | int "IRQ_PLL_WAKEUP" | ||
10 | default 7 | ||
11 | config IRQ_DMAC0_ERR | ||
12 | int "IRQ_DMAC0_ERR" | ||
13 | default 7 | ||
14 | config IRQ_EPPI0_ERR | ||
15 | int "IRQ_EPPI0_ERR" | ||
16 | default 7 | ||
17 | config IRQ_SPORT0_ERR | ||
18 | int "IRQ_SPORT0_ERR" | ||
19 | default 7 | ||
20 | config IRQ_SPORT1_ERR | ||
21 | int "IRQ_SPORT1_ERR" | ||
22 | default 7 | ||
23 | config IRQ_SPI0_ERR | ||
24 | int "IRQ_SPI0_ERR" | ||
25 | default 7 | ||
26 | config IRQ_UART0_ERR | ||
27 | int "IRQ_UART0_ERR" | ||
28 | default 7 | ||
29 | config IRQ_RTC | ||
30 | int "IRQ_RTC" | ||
31 | default 8 | ||
32 | config IRQ_EPPI0 | ||
33 | int "IRQ_EPPI0" | ||
34 | default 8 | ||
35 | config IRQ_SPORT0_RX | ||
36 | int "IRQ_SPORT0_RX" | ||
37 | default 9 | ||
38 | config IRQ_SPORT0_TX | ||
39 | int "IRQ_SPORT0_TX" | ||
40 | default 9 | ||
41 | config IRQ_SPORT1_RX | ||
42 | int "IRQ_SPORT1_RX" | ||
43 | default 9 | ||
44 | config IRQ_SPORT1_TX | ||
45 | int "IRQ_SPORT1_TX" | ||
46 | default 9 | ||
47 | config IRQ_SPI0 | ||
48 | int "IRQ_SPI0" | ||
49 | default 10 | ||
50 | config IRQ_UART0_RX | ||
51 | int "IRQ_UART0_RX" | ||
52 | default 10 | ||
53 | config IRQ_UART0_TX | ||
54 | int "IRQ_UART0_TX" | ||
55 | default 10 | ||
56 | config IRQ_TIMER8 | ||
57 | int "IRQ_TIMER8" | ||
58 | default 11 | ||
59 | config IRQ_TIMER9 | ||
60 | int "IRQ_TIMER9" | ||
61 | default 11 | ||
62 | config IRQ_TIMER10 | ||
63 | int "IRQ_TIMER10" | ||
64 | default 11 | ||
65 | config IRQ_PINT0 | ||
66 | int "IRQ_PINT0" | ||
67 | default 12 | ||
68 | config IRQ_PINT1 | ||
69 | int "IRQ_PINT0" | ||
70 | default 12 | ||
71 | config IRQ_MDMAS0 | ||
72 | int "IRQ_MDMAS0" | ||
73 | default 13 | ||
74 | config IRQ_MDMAS1 | ||
75 | int "IRQ_DMDMAS1" | ||
76 | default 13 | ||
77 | config IRQ_WATCHDOG | ||
78 | int "IRQ_WATCHDOG" | ||
79 | default 13 | ||
80 | config IRQ_DMAC1_ERR | ||
81 | int "IRQ_DMAC1_ERR" | ||
82 | default 7 | ||
83 | config IRQ_SPORT2_ERR | ||
84 | int "IRQ_SPORT2_ERR" | ||
85 | default 7 | ||
86 | config IRQ_SPORT3_ERR | ||
87 | int "IRQ_SPORT3_ERR" | ||
88 | default 7 | ||
89 | config IRQ_MXVR_DATA | ||
90 | int "IRQ MXVR Data" | ||
91 | default 7 | ||
92 | config IRQ_SPI1_ERR | ||
93 | int "IRQ_SPI1_ERR" | ||
94 | default 7 | ||
95 | config IRQ_SPI2_ERR | ||
96 | int "IRQ_SPI2_ERR" | ||
97 | default 7 | ||
98 | config IRQ_UART1_ERR | ||
99 | int "IRQ_UART1_ERR" | ||
100 | default 7 | ||
101 | config IRQ_UART2_ERR | ||
102 | int "IRQ_UART2_ERR" | ||
103 | default 7 | ||
104 | config IRQ_CAN0_ERR | ||
105 | int "IRQ_CAN0_ERR" | ||
106 | default 7 | ||
107 | config IRQ_SPORT2_RX | ||
108 | int "IRQ_SPORT2_RX" | ||
109 | default 9 | ||
110 | config IRQ_SPORT2_TX | ||
111 | int "IRQ_SPORT2_TX" | ||
112 | default 9 | ||
113 | config IRQ_SPORT3_RX | ||
114 | int "IRQ_SPORT3_RX" | ||
115 | default 9 | ||
116 | config IRQ_SPORT3_TX | ||
117 | int "IRQ_SPORT3_TX" | ||
118 | default 9 | ||
119 | config IRQ_EPPI1 | ||
120 | int "IRQ_EPPI1" | ||
121 | default 9 | ||
122 | config IRQ_EPPI2 | ||
123 | int "IRQ_EPPI2" | ||
124 | default 9 | ||
125 | config IRQ_SPI1 | ||
126 | int "IRQ_SPI1" | ||
127 | default 10 | ||
128 | config IRQ_SPI2 | ||
129 | int "IRQ_SPI2" | ||
130 | default 10 | ||
131 | config IRQ_UART1_RX | ||
132 | int "IRQ_UART1_RX" | ||
133 | default 10 | ||
134 | config IRQ_UART1_TX | ||
135 | int "IRQ_UART1_TX" | ||
136 | default 10 | ||
137 | config IRQ_ATAPI_RX | ||
138 | int "IRQ_ATAPI_RX" | ||
139 | default 10 | ||
140 | config IRQ_ATAPI_TX | ||
141 | int "IRQ_ATAPI_TX" | ||
142 | default 10 | ||
143 | config IRQ_TWI0 | ||
144 | int "IRQ_TWI0" | ||
145 | default 11 | ||
146 | config IRQ_TWI1 | ||
147 | int "IRQ_TWI1" | ||
148 | default 11 | ||
149 | config IRQ_CAN0_RX | ||
150 | int "IRQ_CAN_RX" | ||
151 | default 11 | ||
152 | config IRQ_CAN0_TX | ||
153 | int "IRQ_CAN_TX" | ||
154 | default 11 | ||
155 | config IRQ_MDMAS2 | ||
156 | int "IRQ_MDMAS2" | ||
157 | default 13 | ||
158 | config IRQ_MDMAS3 | ||
159 | int "IRQ_DMMAS3" | ||
160 | default 13 | ||
161 | config IRQ_MXVR_ERR | ||
162 | int "IRQ_MXVR_ERR" | ||
163 | default 11 | ||
164 | config IRQ_MXVR_MSG | ||
165 | int "IRQ_MXVR_MSG" | ||
166 | default 11 | ||
167 | config IRQ_MXVR_PKT | ||
168 | int "IRQ_MXVR_PKT" | ||
169 | default 11 | ||
170 | config IRQ_EPPI1_ERR | ||
171 | int "IRQ_EPPI1_ERR" | ||
172 | default 7 | ||
173 | config IRQ_EPPI2_ERR | ||
174 | int "IRQ_EPPI2_ERR" | ||
175 | default 7 | ||
176 | config IRQ_UART3_ERR | ||
177 | int "IRQ_UART3_ERR" | ||
178 | default 7 | ||
179 | config IRQ_HOST_ERR | ||
180 | int "IRQ_HOST_ERR" | ||
181 | default 7 | ||
182 | config IRQ_PIXC_ERR | ||
183 | int "IRQ_PIXC_ERR" | ||
184 | default 7 | ||
185 | config IRQ_NFC_ERR | ||
186 | int "IRQ_NFC_ERR" | ||
187 | default 7 | ||
188 | config IRQ_ATAPI_ERR | ||
189 | int "IRQ_ATAPI_ERR" | ||
190 | default 7 | ||
191 | config IRQ_CAN1_ERR | ||
192 | int "IRQ_CAN1_ERR" | ||
193 | default 7 | ||
194 | config IRQ_HS_DMA_ERR | ||
195 | int "IRQ Handshake DMA Status" | ||
196 | default 7 | ||
197 | config IRQ_PIXC_IN0 | ||
198 | int "IRQ PIXC IN0" | ||
199 | default 8 | ||
200 | config IRQ_PIXC_IN1 | ||
201 | int "IRQ PIXC IN1" | ||
202 | default 8 | ||
203 | config IRQ_PIXC_OUT | ||
204 | int "IRQ PIXC OUT" | ||
205 | default 8 | ||
206 | config IRQ_SDH | ||
207 | int "IRQ SDH" | ||
208 | default 8 | ||
209 | config IRQ_CNT | ||
210 | int "IRQ CNT" | ||
211 | default 8 | ||
212 | config IRQ_KEY | ||
213 | int "IRQ KEY" | ||
214 | default 8 | ||
215 | config IRQ_CAN1_RX | ||
216 | int "IRQ CAN1 RX" | ||
217 | default 11 | ||
218 | config IRQ_CAN1_TX | ||
219 | int "IRQ_CAN1_TX" | ||
220 | default 11 | ||
221 | config IRQ_SDH_MASK0 | ||
222 | int "IRQ_SDH_MASK0" | ||
223 | default 11 | ||
224 | config IRQ_SDH_MASK1 | ||
225 | int "IRQ_SDH_MASK1" | ||
226 | default 11 | ||
227 | config IRQ_USB_INT0 | ||
228 | int "IRQ USB INT0" | ||
229 | default 11 | ||
230 | config IRQ_USB_INT1 | ||
231 | int "IRQ USB INT1" | ||
232 | default 11 | ||
233 | config IRQ_USB_INT2 | ||
234 | int "IRQ USB INT2" | ||
235 | default 11 | ||
236 | config IRQ_USB_DMA | ||
237 | int "IRQ USB DMA" | ||
238 | default 11 | ||
239 | config IRQ_OTPSEC | ||
240 | int "IRQ OPTSEC" | ||
241 | default 11 | ||
242 | config IRQ_TIMER0 | ||
243 | int "IRQ_TIMER0" | ||
244 | default 11 | ||
245 | config IRQ_TIMER1 | ||
246 | int "IRQ_TIMER1" | ||
247 | default 11 | ||
248 | config IRQ_TIMER2 | ||
249 | int "IRQ_TIMER2" | ||
250 | default 11 | ||
251 | config IRQ_TIMER3 | ||
252 | int "IRQ_TIMER3" | ||
253 | default 11 | ||
254 | config IRQ_TIMER4 | ||
255 | int "IRQ_TIMER4" | ||
256 | default 11 | ||
257 | config IRQ_TIMER5 | ||
258 | int "IRQ_TIMER5" | ||
259 | default 11 | ||
260 | config IRQ_TIMER6 | ||
261 | int "IRQ_TIMER6" | ||
262 | default 11 | ||
263 | config IRQ_TIMER7 | ||
264 | int "IRQ_TIMER7" | ||
265 | default 11 | ||
266 | config IRQ_PINT2 | ||
267 | int "IRQ_PIN2" | ||
268 | default 11 | ||
269 | config IRQ_PINT3 | ||
270 | int "IRQ_PIN3" | ||
271 | default 11 | ||
272 | |||
273 | help | ||
274 | Enter the priority numbers between 7-13 ONLY. Others are Reserved. | ||
275 | This applies to all the above. It is not recommended to assign the | ||
276 | highest priority number 7 to UART or any other device. | ||
277 | |||
278 | endmenu | ||
279 | |||
280 | endmenu | ||
281 | |||
282 | endif | ||
diff --git a/arch/blackfin/mach-bf548/Makefile b/arch/blackfin/mach-bf548/Makefile new file mode 100644 index 000000000000..060ad78ebf1d --- /dev/null +++ b/arch/blackfin/mach-bf548/Makefile | |||
@@ -0,0 +1,9 @@ | |||
1 | # | ||
2 | # arch/blackfin/mach-bf537/Makefile | ||
3 | # | ||
4 | |||
5 | extra-y := head.o | ||
6 | |||
7 | obj-y := ints-priority.o dma.o gpio.o | ||
8 | |||
9 | obj-$(CONFIG_CPU_FREQ) += cpu.o | ||
diff --git a/arch/blackfin/mach-bf548/boards/Makefile b/arch/blackfin/mach-bf548/boards/Makefile new file mode 100644 index 000000000000..486e07c99a51 --- /dev/null +++ b/arch/blackfin/mach-bf548/boards/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | # | ||
2 | # arch/blackfin/mach-bf548/boards/Makefile | ||
3 | # | ||
4 | |||
5 | obj-$(CONFIG_BFIN548_EZKIT) += ezkit.o led.o | ||
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c new file mode 100644 index 000000000000..100379c4b926 --- /dev/null +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -0,0 +1,114 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf548/boards/ezkit.c | ||
3 | * Based on: arch/blackfin/mach-bf537/boards/ezkit.c | ||
4 | * Author: Aidan Williams <aidan@nicta.com.au> | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2005 National ICT Australia (NICTA) | ||
11 | * Copyright 2004-2007 Analog Devices Inc. | ||
12 | * | ||
13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
14 | * | ||
15 | * This program is free software; you can redistribute it and/or modify | ||
16 | * it under the terms of the GNU General Public License as published by | ||
17 | * the Free Software Foundation; either version 2 of the License, or | ||
18 | * (at your option) any later version. | ||
19 | * | ||
20 | * This program is distributed in the hope that it will be useful, | ||
21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
23 | * GNU General Public License for more details. | ||
24 | * | ||
25 | * You should have received a copy of the GNU General Public License | ||
26 | * along with this program; if not, see the file COPYING, or write | ||
27 | * to the Free Software Foundation, Inc., | ||
28 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
29 | */ | ||
30 | |||
31 | #include <linux/device.h> | ||
32 | #include <linux/platform_device.h> | ||
33 | #include <linux/mtd/mtd.h> | ||
34 | #include <linux/mtd/partitions.h> | ||
35 | #include <linux/spi/spi.h> | ||
36 | #include <linux/spi/flash.h> | ||
37 | #include <asm/irq.h> | ||
38 | #include <linux/irq.h> | ||
39 | #include <linux/interrupt.h> | ||
40 | #include <asm/bfin5xx_spi.h> | ||
41 | |||
42 | /* | ||
43 | * Name the Board for the /proc/cpuinfo | ||
44 | */ | ||
45 | char *bfin_board_name = "ADSP-BF548-EZKIT"; | ||
46 | |||
47 | /* | ||
48 | * Driver needs to know address, irq and flag pin. | ||
49 | */ | ||
50 | |||
51 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | ||
52 | static struct platform_device rtc_device = { | ||
53 | .name = "rtc-bfin", | ||
54 | .id = -1, | ||
55 | }; | ||
56 | #endif | ||
57 | |||
58 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | ||
59 | static struct resource bfin_uart_resources[] = { | ||
60 | #ifdef CONFIG_SERIAL_BFIN_UART0 | ||
61 | { | ||
62 | .start = 0xFFC00400, | ||
63 | .end = 0xFFC004FF, | ||
64 | .flags = IORESOURCE_MEM, | ||
65 | }, | ||
66 | #endif | ||
67 | #ifdef CONFIG_SERIAL_BFIN_UART1 | ||
68 | { | ||
69 | .start = 0xFFC02000, | ||
70 | .end = 0xFFC020FF, | ||
71 | .flags = IORESOURCE_MEM, | ||
72 | }, | ||
73 | #endif | ||
74 | #ifdef CONFIG_SERIAL_BFIN_UART2 | ||
75 | { | ||
76 | .start = 0xFFC02100, | ||
77 | .end = 0xFFC021FF, | ||
78 | .flags = IORESOURCE_MEM, | ||
79 | }, | ||
80 | #endif | ||
81 | #ifdef CONFIG_SERIAL_BFIN_UART3 | ||
82 | { | ||
83 | .start = 0xFFC03100, | ||
84 | .end = 0xFFC031FF, | ||
85 | }, | ||
86 | #endif | ||
87 | }; | ||
88 | |||
89 | static struct platform_device bfin_uart_device = { | ||
90 | .name = "bfin-uart", | ||
91 | .id = 1, | ||
92 | .num_resources = ARRAY_SIZE(bfin_uart_resources), | ||
93 | .resource = bfin_uart_resources, | ||
94 | }; | ||
95 | #endif | ||
96 | |||
97 | static struct platform_device *ezkit_devices[] __initdata = { | ||
98 | #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) | ||
99 | &rtc_device, | ||
100 | #endif | ||
101 | |||
102 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | ||
103 | &bfin_uart_device, | ||
104 | #endif | ||
105 | }; | ||
106 | |||
107 | static int __init stamp_init(void) | ||
108 | { | ||
109 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | ||
110 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | ||
111 | return 0; | ||
112 | } | ||
113 | |||
114 | arch_initcall(stamp_init); | ||
diff --git a/arch/blackfin/mach-bf548/boards/led.S b/arch/blackfin/mach-bf548/boards/led.S new file mode 100644 index 000000000000..f47daf3770d0 --- /dev/null +++ b/arch/blackfin/mach-bf548/boards/led.S | |||
@@ -0,0 +1,172 @@ | |||
1 | /**************************************************** | ||
2 | * LED1 ---- PG6 LED2 ---- PG7 * | ||
3 | * LED3 ---- PG8 LED4 ---- PG9 * | ||
4 | * LED5 ---- PG10 LED6 ---- PG11 * | ||
5 | ****************************************************/ | ||
6 | |||
7 | #include <linux/linkage.h> | ||
8 | #include <asm/blackfin.h> | ||
9 | |||
10 | /* All functions in this file save the registers they uses. | ||
11 | So there is no need to save any registers before calling them. */ | ||
12 | |||
13 | .text; | ||
14 | |||
15 | /* Initialize LEDs. */ | ||
16 | |||
17 | ENTRY(_led_init) | ||
18 | LINK 0; | ||
19 | [--SP] = P0; | ||
20 | [--SP] = R0; | ||
21 | [--SP] = R1; | ||
22 | [--SP] = R2; | ||
23 | R1 = (PG6|PG7|PG8|PG9|PG10|PG11)(Z); | ||
24 | R2 = ~R1; | ||
25 | |||
26 | P0.H = hi(PORTG_FER); | ||
27 | P0.L = lo(PORTG_FER); | ||
28 | R0 = W[P0](Z); | ||
29 | SSYNC; | ||
30 | R0 = R0 & R2; | ||
31 | W[P0] = R0.L; | ||
32 | SSYNC; | ||
33 | |||
34 | P0.H = hi(PORTG_DIR_SET); | ||
35 | P0.L = lo(PORTG_DIR_SET); | ||
36 | W[P0] = R1.L; | ||
37 | SSYNC; | ||
38 | |||
39 | P0.H = hi(PORTG_INEN); | ||
40 | P0.L = lo(PORTG_INEN); | ||
41 | R0 = W[P0](Z); | ||
42 | SSYNC; | ||
43 | R0 = R0 & R2; | ||
44 | W[P0] = R0.L; | ||
45 | SSYNC; | ||
46 | |||
47 | R2 = [SP++]; | ||
48 | R1 = [SP++]; | ||
49 | R0 = [SP++]; | ||
50 | P0 = [SP++]; | ||
51 | RTS; | ||
52 | .size _led_init, .-_led_init | ||
53 | |||
54 | /* Set one LED on. Leave other LEDs unchanged. | ||
55 | It expects the LED number passed through R0. */ | ||
56 | |||
57 | ENTRY(_led_on) | ||
58 | LINK 0; | ||
59 | [--SP] = P0; | ||
60 | [--SP] = R1; | ||
61 | CALL _led_init; | ||
62 | R1 = 1; | ||
63 | R0 += 5; | ||
64 | R1 <<= R0; | ||
65 | P0.H = hi(PORTG_SET); | ||
66 | P0.L = lo(PORTG_SET); | ||
67 | W[P0] = R1.L; | ||
68 | SSYNC; | ||
69 | R1 = [SP++]; | ||
70 | P0 = [SP++]; | ||
71 | UNLINK; | ||
72 | RTS; | ||
73 | .size _led_on, .-_led_on | ||
74 | |||
75 | /* Set one LED off. Leave other LEDs unchanged. */ | ||
76 | |||
77 | ENTRY(_led_off) | ||
78 | LINK 0; | ||
79 | [--SP] = P0; | ||
80 | [--SP] = R1; | ||
81 | CALL _led_init; | ||
82 | R1 = 1; | ||
83 | R0 += 5; | ||
84 | R1 <<= R0; | ||
85 | P0.H = hi(PORTG_CLEAR); | ||
86 | P0.L = lo(PORTG_CLEAR); | ||
87 | W[P0] = R1.L; | ||
88 | SSYNC; | ||
89 | R1 = [SP++]; | ||
90 | P0 = [SP++]; | ||
91 | UNLINK; | ||
92 | RTS; | ||
93 | .size _led_off, .-_led_off | ||
94 | |||
95 | /* Toggle one LED. Leave other LEDs unchanged. */ | ||
96 | |||
97 | ENTRY(_led_toggle) | ||
98 | LINK 0; | ||
99 | [--SP] = P0; | ||
100 | [--SP] = R1; | ||
101 | CALL _led_init; | ||
102 | R1 = 1; | ||
103 | R0 += 5; | ||
104 | R1 <<= R0; | ||
105 | P0.H = hi(PORTG); | ||
106 | P0.L = lo(PORTG); | ||
107 | R0 = W[P0](Z); | ||
108 | SSYNC; | ||
109 | R0 = R0 ^ R1; | ||
110 | W[P0] = R0.L; | ||
111 | SSYNC; | ||
112 | R1 = [SP++]; | ||
113 | P0 = [SP++]; | ||
114 | UNLINK; | ||
115 | RTS; | ||
116 | .size _led_toggle, .-_led_toggle | ||
117 | |||
118 | /* Display the number using LEDs in binary format. */ | ||
119 | |||
120 | ENTRY(_led_disp_num) | ||
121 | LINK 0; | ||
122 | [--SP] = P0; | ||
123 | [--SP] = R1; | ||
124 | [--SP] = R2; | ||
125 | CALL _led_init; | ||
126 | R1 = 0x3f(X); | ||
127 | R0 = R0 & R1; | ||
128 | R2 = 6(X); | ||
129 | R0 <<= R2; | ||
130 | R1 <<= R2; | ||
131 | P0.H = hi(PORTG); | ||
132 | P0.L = lo(PORTG); | ||
133 | R2 = W[P0](Z); | ||
134 | SSYNC; | ||
135 | R1 = ~R1; | ||
136 | R2 = R2 & R1; | ||
137 | R2 = R2 | R0; | ||
138 | W[P0] = R2.L; | ||
139 | SSYNC; | ||
140 | R2 = [SP++]; | ||
141 | R1 = [SP++]; | ||
142 | P0 = [SP++]; | ||
143 | UNLINK; | ||
144 | RTS; | ||
145 | .size _led_disp_num, .-_led_disp_num | ||
146 | |||
147 | /* Toggle the number using LEDs in binary format. */ | ||
148 | |||
149 | ENTRY(_led_toggle_num) | ||
150 | LINK 0; | ||
151 | [--SP] = P0; | ||
152 | [--SP] = R1; | ||
153 | [--SP] = R2; | ||
154 | CALL _led_init; | ||
155 | R1 = 0x3f(X); | ||
156 | R0 = R0 & R1; | ||
157 | R1 = 6(X); | ||
158 | R0 <<= R1; | ||
159 | P0.H = hi(PORTG); | ||
160 | P0.L = lo(PORTG); | ||
161 | R1 = W[P0](Z); | ||
162 | SSYNC; | ||
163 | R1 = R1 ^ R0; | ||
164 | W[P0] = R1.L; | ||
165 | SSYNC; | ||
166 | R2 = [SP++]; | ||
167 | R1 = [SP++]; | ||
168 | P0 = [SP++]; | ||
169 | UNLINK; | ||
170 | RTS; | ||
171 | .size _led_toggle_num, .-_led_toggle_num | ||
172 | |||
diff --git a/arch/blackfin/mach-bf548/cpu.c b/arch/blackfin/mach-bf548/cpu.c new file mode 100644 index 000000000000..4298a3ccfbfc --- /dev/null +++ b/arch/blackfin/mach-bf548/cpu.c | |||
@@ -0,0 +1,159 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf548/cpu.c | ||
3 | * Based on: | ||
4 | * Author: | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: clock scaling for the bf54x | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2004-2007 Analog Devices Inc. | ||
11 | * | ||
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, see the file COPYING, or write | ||
26 | * to the Free Software Foundation, Inc., | ||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
28 | */ | ||
29 | |||
30 | #include <linux/kernel.h> | ||
31 | #include <linux/types.h> | ||
32 | #include <linux/init.h> | ||
33 | #include <linux/cpufreq.h> | ||
34 | #include <asm/dpmc.h> | ||
35 | #include <linux/fs.h> | ||
36 | #include <asm/bfin-global.h> | ||
37 | |||
38 | /* CONFIG_CLKIN_HZ=25000000 */ | ||
39 | #define VCO5 (CONFIG_CLKIN_HZ*45) | ||
40 | #define VCO4 (CONFIG_CLKIN_HZ*36) | ||
41 | #define VCO3 (CONFIG_CLKIN_HZ*27) | ||
42 | #define VCO2 (CONFIG_CLKIN_HZ*18) | ||
43 | #define VCO1 (CONFIG_CLKIN_HZ*9) | ||
44 | #define VCO(x) VCO##x | ||
45 | |||
46 | #define MFREQ(x) {VCO(x),VCO(x)/4},{VCO(x),VCO(x)/2},{VCO(x),VCO(x)} | ||
47 | /* frequency */ | ||
48 | static struct cpufreq_frequency_table bf548_freq_table[] = { | ||
49 | MFREQ(1), | ||
50 | MFREQ(3), | ||
51 | {VCO4, VCO4 / 2}, {VCO4, VCO4}, | ||
52 | MFREQ(5), | ||
53 | {0, CPUFREQ_TABLE_END}, | ||
54 | }; | ||
55 | |||
56 | /* | ||
57 | * dpmc_fops->ioctl() | ||
58 | * static int dpmc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) | ||
59 | */ | ||
60 | static int bf548_getfreq(unsigned int cpu) | ||
61 | { | ||
62 | unsigned long cclk_mhz; | ||
63 | |||
64 | /* The driver only support single cpu */ | ||
65 | if (cpu == 0) | ||
66 | dpmc_fops.ioctl(NULL, NULL, IOCTL_GET_CORECLOCK, &cclk_mhz); | ||
67 | else | ||
68 | cclk_mhz = -1; | ||
69 | |||
70 | return cclk_mhz; | ||
71 | } | ||
72 | |||
73 | static int bf548_target(struct cpufreq_policy *policy, | ||
74 | unsigned int target_freq, unsigned int relation) | ||
75 | { | ||
76 | unsigned long cclk_mhz; | ||
77 | unsigned long vco_mhz; | ||
78 | unsigned long flags; | ||
79 | unsigned int index; | ||
80 | struct cpufreq_freqs freqs; | ||
81 | |||
82 | if (cpufreq_frequency_table_target(policy, bf548_freq_table, target_freq, relation, &index)) | ||
83 | return -EINVAL; | ||
84 | |||
85 | cclk_mhz = bf548_freq_table[index].frequency; | ||
86 | vco_mhz = bf548_freq_table[index].index; | ||
87 | |||
88 | dpmc_fops.ioctl(NULL, NULL, IOCTL_CHANGE_FREQUENCY, &vco_mhz); | ||
89 | freqs.old = bf548_getfreq(0); | ||
90 | freqs.new = cclk_mhz; | ||
91 | freqs.cpu = 0; | ||
92 | |||
93 | pr_debug("cclk begin change to cclk %d,vco=%d,index=%d,target=%d,oldfreq=%d\n", | ||
94 | cclk_mhz, vco_mhz, index, target_freq, freqs.old); | ||
95 | |||
96 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); | ||
97 | local_irq_save(flags); | ||
98 | dpmc_fops.ioctl(NULL, NULL, IOCTL_SET_CCLK, &cclk_mhz); | ||
99 | local_irq_restore(flags); | ||
100 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); | ||
101 | |||
102 | vco_mhz = get_vco(); | ||
103 | cclk_mhz = get_cclk(); | ||
104 | return 0; | ||
105 | } | ||
106 | |||
107 | /* make sure that only the "userspace" governor is run -- anything else wouldn't make sense on | ||
108 | * this platform, anyway. | ||
109 | */ | ||
110 | static int bf548_verify_speed(struct cpufreq_policy *policy) | ||
111 | { | ||
112 | return cpufreq_frequency_table_verify(policy, &bf548_freq_table); | ||
113 | } | ||
114 | |||
115 | static int __init __bf548_cpu_init(struct cpufreq_policy *policy) | ||
116 | { | ||
117 | if (policy->cpu != 0) | ||
118 | return -EINVAL; | ||
119 | |||
120 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
121 | |||
122 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | ||
123 | /*Now ,only support one cpu */ | ||
124 | policy->cur = bf548_getfreq(0); | ||
125 | cpufreq_frequency_table_get_attr(bf548_freq_table, policy->cpu); | ||
126 | return cpufreq_frequency_table_cpuinfo(policy, bf548_freq_table); | ||
127 | } | ||
128 | |||
129 | static struct freq_attr *bf548_freq_attr[] = { | ||
130 | &cpufreq_freq_attr_scaling_available_freqs, | ||
131 | NULL, | ||
132 | }; | ||
133 | |||
134 | static struct cpufreq_driver bf548_driver = { | ||
135 | .verify = bf548_verify_speed, | ||
136 | .target = bf548_target, | ||
137 | .get = bf548_getfreq, | ||
138 | .init = __bf548_cpu_init, | ||
139 | .name = "bf548", | ||
140 | .owner = THIS_MODULE, | ||
141 | .attr = bf548_freq_attr, | ||
142 | }; | ||
143 | |||
144 | static int __init bf548_cpu_init(void) | ||
145 | { | ||
146 | return cpufreq_register_driver(&bf548_driver); | ||
147 | } | ||
148 | |||
149 | static void __exit bf548_cpu_exit(void) | ||
150 | { | ||
151 | cpufreq_unregister_driver(&bf548_driver); | ||
152 | } | ||
153 | |||
154 | MODULE_AUTHOR("Mickael Kang"); | ||
155 | MODULE_DESCRIPTION("cpufreq driver for BF548 CPU"); | ||
156 | MODULE_LICENSE("GPL"); | ||
157 | |||
158 | module_init(bf548_cpu_init); | ||
159 | module_exit(bf548_cpu_exit); | ||
diff --git a/arch/blackfin/mach-bf548/dma.c b/arch/blackfin/mach-bf548/dma.c new file mode 100644 index 000000000000..a8184113be48 --- /dev/null +++ b/arch/blackfin/mach-bf548/dma.c | |||
@@ -0,0 +1,156 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf561/dma.c | ||
3 | * Based on: | ||
4 | * Author: | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: This file contains the simple DMA Implementation for Blackfin | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2004-2007 Analog Devices Inc. | ||
11 | * | ||
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, see the file COPYING, or write | ||
26 | * to the Free Software Foundation, Inc., | ||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
28 | */ | ||
29 | |||
30 | #include <asm/blackfin.h> | ||
31 | #include <asm/dma.h> | ||
32 | |||
33 | struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { | ||
34 | (struct dma_register *) DMA0_NEXT_DESC_PTR, | ||
35 | (struct dma_register *) DMA1_NEXT_DESC_PTR, | ||
36 | (struct dma_register *) DMA2_NEXT_DESC_PTR, | ||
37 | (struct dma_register *) DMA3_NEXT_DESC_PTR, | ||
38 | (struct dma_register *) DMA4_NEXT_DESC_PTR, | ||
39 | (struct dma_register *) DMA5_NEXT_DESC_PTR, | ||
40 | (struct dma_register *) DMA6_NEXT_DESC_PTR, | ||
41 | (struct dma_register *) DMA7_NEXT_DESC_PTR, | ||
42 | (struct dma_register *) DMA8_NEXT_DESC_PTR, | ||
43 | (struct dma_register *) DMA9_NEXT_DESC_PTR, | ||
44 | (struct dma_register *) DMA10_NEXT_DESC_PTR, | ||
45 | (struct dma_register *) DMA11_NEXT_DESC_PTR, | ||
46 | (struct dma_register *) DMA12_NEXT_DESC_PTR, | ||
47 | (struct dma_register *) DMA13_NEXT_DESC_PTR, | ||
48 | (struct dma_register *) DMA14_NEXT_DESC_PTR, | ||
49 | (struct dma_register *) DMA15_NEXT_DESC_PTR, | ||
50 | (struct dma_register *) DMA16_NEXT_DESC_PTR, | ||
51 | (struct dma_register *) DMA17_NEXT_DESC_PTR, | ||
52 | (struct dma_register *) DMA18_NEXT_DESC_PTR, | ||
53 | (struct dma_register *) DMA19_NEXT_DESC_PTR, | ||
54 | (struct dma_register *) DMA20_NEXT_DESC_PTR, | ||
55 | (struct dma_register *) DMA21_NEXT_DESC_PTR, | ||
56 | (struct dma_register *) DMA22_NEXT_DESC_PTR, | ||
57 | (struct dma_register *) DMA23_NEXT_DESC_PTR, | ||
58 | (struct dma_register *) MDMA_D0_NEXT_DESC_PTR, | ||
59 | (struct dma_register *) MDMA_S0_NEXT_DESC_PTR, | ||
60 | (struct dma_register *) MDMA_D1_NEXT_DESC_PTR, | ||
61 | (struct dma_register *) MDMA_S1_NEXT_DESC_PTR, | ||
62 | (struct dma_register *) MDMA_D2_NEXT_DESC_PTR, | ||
63 | (struct dma_register *) MDMA_S2_NEXT_DESC_PTR, | ||
64 | (struct dma_register *) MDMA_D3_NEXT_DESC_PTR, | ||
65 | (struct dma_register *) MDMA_S3_NEXT_DESC_PTR, | ||
66 | }; | ||
67 | |||
68 | int channel2irq(unsigned int channel) | ||
69 | { | ||
70 | int ret_irq = -1; | ||
71 | |||
72 | switch (channel) { | ||
73 | case CH_SPORT0_RX: | ||
74 | ret_irq = IRQ_SPORT0_RX; | ||
75 | break; | ||
76 | case CH_SPORT0_TX: | ||
77 | ret_irq = IRQ_SPORT0_TX; | ||
78 | break; | ||
79 | case CH_SPORT1_RX: | ||
80 | ret_irq = IRQ_SPORT1_RX; | ||
81 | break; | ||
82 | case CH_SPORT1_TX: | ||
83 | ret_irq = IRQ_SPORT1_TX; | ||
84 | case CH_SPI0: | ||
85 | ret_irq = IRQ_SPI0; | ||
86 | break; | ||
87 | case CH_SPI1: | ||
88 | ret_irq = IRQ_SPI1; | ||
89 | break; | ||
90 | case CH_UART0_RX: | ||
91 | ret_irq = IRQ_UART_RX; | ||
92 | break; | ||
93 | case CH_UART0_TX: | ||
94 | ret_irq = IRQ_UART_TX; | ||
95 | break; | ||
96 | case CH_UART1_RX: | ||
97 | ret_irq = IRQ_UART_RX; | ||
98 | break; | ||
99 | case CH_UART1_TX: | ||
100 | ret_irq = IRQ_UART_TX; | ||
101 | break; | ||
102 | case CH_EPPI0: | ||
103 | ret_irq = IRQ_EPPI0; | ||
104 | break; | ||
105 | case CH_EPPI1: | ||
106 | ret_irq = IRQ_EPPI1; | ||
107 | break; | ||
108 | case CH_EPPI2: | ||
109 | ret_irq = IRQ_EPPI2; | ||
110 | break; | ||
111 | case CH_PIXC_IMAGE: | ||
112 | ret_irq = IRQ_PIXC_IN0; | ||
113 | break; | ||
114 | case CH_PIXC_OVERLAY: | ||
115 | ret_irq = IRQ_PIXC_IN1; | ||
116 | break; | ||
117 | case CH_PIXC_OUTPUT: | ||
118 | ret_irq = IRQ_PIXC_OUT; | ||
119 | break; | ||
120 | case CH_SPORT2_RX: | ||
121 | ret_irq = IRQ_SPORT2_RX; | ||
122 | break; | ||
123 | case CH_SPORT2_TX: | ||
124 | ret_irq = IRQ_SPORT2_TX; | ||
125 | break; | ||
126 | case CH_SPORT3_RX: | ||
127 | ret_irq = IRQ_SPORT3_RX; | ||
128 | break; | ||
129 | case CH_SPORT3_TX: | ||
130 | ret_irq = IRQ_SPORT3_TX; | ||
131 | break; | ||
132 | case CH_SDH: | ||
133 | ret_irq = IRQ_SDH; | ||
134 | break; | ||
135 | case CH_SPI2: | ||
136 | ret_irq = IRQ_SPI2; | ||
137 | break; | ||
138 | case CH_MEM_STREAM0_SRC: | ||
139 | case CH_MEM_STREAM0_DEST: | ||
140 | ret_irq = IRQ_MDMAS0; | ||
141 | break; | ||
142 | case CH_MEM_STREAM1_SRC: | ||
143 | case CH_MEM_STREAM1_DEST: | ||
144 | ret_irq = IRQ_MDMAS1; | ||
145 | break; | ||
146 | case CH_MEM_STREAM2_SRC: | ||
147 | case CH_MEM_STREAM2_DEST: | ||
148 | ret_irq = IRQ_MDMAS2; | ||
149 | break; | ||
150 | case CH_MEM_STREAM3_SRC: | ||
151 | case CH_MEM_STREAM3_DEST: | ||
152 | ret_irq = IRQ_MDMAS3; | ||
153 | break; | ||
154 | } | ||
155 | return ret_irq; | ||
156 | } | ||
diff --git a/arch/blackfin/mach-bf548/gpio.c b/arch/blackfin/mach-bf548/gpio.c new file mode 100644 index 000000000000..854896d6ceda --- /dev/null +++ b/arch/blackfin/mach-bf548/gpio.c | |||
@@ -0,0 +1,175 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf548/gpio.c | ||
3 | * Based on: | ||
4 | * Author: Michael Hennerich (hennerich@blackfin.uclinux.org) | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: GPIO Abstraction Layer | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2007 Analog Devices Inc. | ||
11 | * | ||
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, see the file COPYING, or write | ||
26 | * to the Free Software Foundation, Inc., | ||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
28 | */ | ||
29 | |||
30 | #include <linux/module.h> | ||
31 | #include <linux/err.h> | ||
32 | #include <asm/blackfin.h> | ||
33 | #include <asm/gpio.h> | ||
34 | #include <linux/irq.h> | ||
35 | |||
36 | static struct gpio_port_t *gpio_array[gpio_bank(MAX_BLACKFIN_GPIOS)] = { | ||
37 | (struct gpio_port_t *) PORTA_FER, | ||
38 | (struct gpio_port_t *) PORTB_FER, | ||
39 | (struct gpio_port_t *) PORTC_FER, | ||
40 | (struct gpio_port_t *) PORTD_FER, | ||
41 | (struct gpio_port_t *) PORTE_FER, | ||
42 | (struct gpio_port_t *) PORTF_FER, | ||
43 | (struct gpio_port_t *) PORTG_FER, | ||
44 | (struct gpio_port_t *) PORTH_FER, | ||
45 | (struct gpio_port_t *) PORTI_FER, | ||
46 | (struct gpio_port_t *) PORTJ_FER, | ||
47 | }; | ||
48 | |||
49 | static unsigned short reserved_map[gpio_bank(MAX_BLACKFIN_GPIOS)]; | ||
50 | |||
51 | inline int check_gpio(unsigned short gpio) | ||
52 | { | ||
53 | if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15 \ | ||
54 | || gpio == GPIO_PH14 || gpio == GPIO_PH15 \ | ||
55 | || gpio > MAX_BLACKFIN_GPIOS) | ||
56 | return -EINVAL; | ||
57 | return 0; | ||
58 | } | ||
59 | |||
60 | static void port_setup(unsigned short gpio, unsigned short usage) | ||
61 | { | ||
62 | if (usage == GPIO_USAGE) { | ||
63 | if (gpio_array[gpio_bank(gpio)]->port_fer & gpio_bit(gpio)) | ||
64 | printk(KERN_WARNING "bfin-gpio: Possible Conflict with Peripheral " | ||
65 | "usage and GPIO %d detected!\n", gpio); | ||
66 | gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio); | ||
67 | } else | ||
68 | gpio_array[gpio_bank(gpio)]->port_fer |= gpio_bit(gpio); | ||
69 | SSYNC(); | ||
70 | } | ||
71 | |||
72 | static int __init bfin_gpio_init(void) | ||
73 | { | ||
74 | int i; | ||
75 | |||
76 | printk(KERN_INFO "Blackfin GPIO Controller\n"); | ||
77 | |||
78 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE) | ||
79 | reserved_map[gpio_bank(i)] = 0; | ||
80 | |||
81 | return 0; | ||
82 | } | ||
83 | |||
84 | arch_initcall(bfin_gpio_init); | ||
85 | |||
86 | |||
87 | /*********************************************************** | ||
88 | * | ||
89 | * FUNCTIONS: Blackfin GPIO Driver | ||
90 | * | ||
91 | * INPUTS/OUTPUTS: | ||
92 | * gpio - GPIO Number between 0 and MAX_BLACKFIN_GPIOS | ||
93 | * | ||
94 | * | ||
95 | * DESCRIPTION: Blackfin GPIO Driver API | ||
96 | * | ||
97 | * CAUTION: | ||
98 | ************************************************************* | ||
99 | * MODIFICATION HISTORY : | ||
100 | **************************************************************/ | ||
101 | |||
102 | int gpio_request(unsigned short gpio, const char *label) | ||
103 | { | ||
104 | unsigned long flags; | ||
105 | |||
106 | if (check_gpio(gpio) < 0) | ||
107 | return -EINVAL; | ||
108 | |||
109 | local_irq_save(flags); | ||
110 | |||
111 | if (unlikely(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio))) { | ||
112 | printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved!\n", gpio); | ||
113 | dump_stack(); | ||
114 | local_irq_restore(flags); | ||
115 | return -EBUSY; | ||
116 | } | ||
117 | reserved_map[gpio_bank(gpio)] |= gpio_bit(gpio); | ||
118 | |||
119 | local_irq_restore(flags); | ||
120 | |||
121 | port_setup(gpio, GPIO_USAGE); | ||
122 | |||
123 | return 0; | ||
124 | } | ||
125 | EXPORT_SYMBOL(gpio_request); | ||
126 | |||
127 | |||
128 | void gpio_free(unsigned short gpio) | ||
129 | { | ||
130 | unsigned long flags; | ||
131 | |||
132 | if (check_gpio(gpio) < 0) | ||
133 | return; | ||
134 | |||
135 | local_irq_save(flags); | ||
136 | |||
137 | if (unlikely(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)))) { | ||
138 | printk(KERN_ERR "bfin-gpio: GPIO %d wasn't reserved!\n", gpio); | ||
139 | dump_stack(); | ||
140 | local_irq_restore(flags); | ||
141 | return; | ||
142 | } | ||
143 | |||
144 | reserved_map[gpio_bank(gpio)] &= ~gpio_bit(gpio); | ||
145 | |||
146 | local_irq_restore(flags); | ||
147 | } | ||
148 | EXPORT_SYMBOL(gpio_free); | ||
149 | |||
150 | |||
151 | void gpio_direction_input(unsigned short gpio) | ||
152 | { | ||
153 | unsigned long flags; | ||
154 | |||
155 | BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio))); | ||
156 | |||
157 | local_irq_save(flags); | ||
158 | gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio); | ||
159 | gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio); | ||
160 | local_irq_restore(flags); | ||
161 | } | ||
162 | EXPORT_SYMBOL(gpio_direction_input); | ||
163 | |||
164 | void gpio_direction_output(unsigned short gpio) | ||
165 | { | ||
166 | unsigned long flags; | ||
167 | |||
168 | BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio))); | ||
169 | |||
170 | local_irq_save(flags); | ||
171 | gpio_array[gpio_bank(gpio)]->port_inen &= ~gpio_bit(gpio); | ||
172 | gpio_array[gpio_bank(gpio)]->port_dir_set = gpio_bit(gpio); | ||
173 | local_irq_restore(flags); | ||
174 | } | ||
175 | EXPORT_SYMBOL(gpio_direction_output); | ||
diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S new file mode 100644 index 000000000000..0e1a25447391 --- /dev/null +++ b/arch/blackfin/mach-bf548/head.S | |||
@@ -0,0 +1,507 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf548/head.S | ||
3 | * Based on: arch/blackfin/mach-bf537/head.S | ||
4 | * Author: Jeff Dionne <jeff@uclinux.org> COPYRIGHT 1998 D. Jeff Dionne | ||
5 | * | ||
6 | * Created: 1998 | ||
7 | * Description: Startup code for Blackfin BF548 | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2004-2007 Analog Devices Inc. | ||
11 | * | ||
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, see the file COPYING, or write | ||
26 | * to the Free Software Foundation, Inc., | ||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
28 | */ | ||
29 | |||
30 | #include <linux/linkage.h> | ||
31 | #include <asm/blackfin.h> | ||
32 | #if CONFIG_BFIN_KERNEL_CLOCK | ||
33 | #include <asm/mach/mem_init.h> | ||
34 | #endif | ||
35 | |||
36 | .global __rambase | ||
37 | .global __ramstart | ||
38 | .global __ramend | ||
39 | .extern ___bss_stop | ||
40 | .extern ___bss_start | ||
41 | .extern _bf53x_relocate_l1_mem | ||
42 | |||
43 | #define INITIAL_STACK 0xFFB01000 | ||
44 | |||
45 | .text | ||
46 | |||
47 | ENTRY(__start) | ||
48 | ENTRY(__stext) | ||
49 | /* R0: argument of command line string, passed from uboot, save it */ | ||
50 | R7 = R0; | ||
51 | /* Set the SYSCFG register */ | ||
52 | R0 = 0x36; | ||
53 | SYSCFG = R0; /*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/ | ||
54 | R0 = 0; | ||
55 | |||
56 | /* Clear Out All the data and pointer Registers*/ | ||
57 | R1 = R0; | ||
58 | R2 = R0; | ||
59 | R3 = R0; | ||
60 | R4 = R0; | ||
61 | R5 = R0; | ||
62 | R6 = R0; | ||
63 | |||
64 | P0 = R0; | ||
65 | P1 = R0; | ||
66 | P2 = R0; | ||
67 | P3 = R0; | ||
68 | P4 = R0; | ||
69 | P5 = R0; | ||
70 | |||
71 | LC0 = r0; | ||
72 | LC1 = r0; | ||
73 | L0 = r0; | ||
74 | L1 = r0; | ||
75 | L2 = r0; | ||
76 | L3 = r0; | ||
77 | |||
78 | /* Clear Out All the DAG Registers*/ | ||
79 | B0 = r0; | ||
80 | B1 = r0; | ||
81 | B2 = r0; | ||
82 | B3 = r0; | ||
83 | |||
84 | I0 = r0; | ||
85 | I1 = r0; | ||
86 | I2 = r0; | ||
87 | I3 = r0; | ||
88 | |||
89 | M0 = r0; | ||
90 | M1 = r0; | ||
91 | M2 = r0; | ||
92 | M3 = r0; | ||
93 | |||
94 | /* Turn off the icache */ | ||
95 | p0.l = (IMEM_CONTROL & 0xFFFF); | ||
96 | p0.h = (IMEM_CONTROL >> 16); | ||
97 | R1 = [p0]; | ||
98 | R0 = ~ENICPLB; | ||
99 | R0 = R0 & R1; | ||
100 | [p0] = R0; | ||
101 | SSYNC; | ||
102 | |||
103 | /* Turn off the dcache */ | ||
104 | p0.l = (DMEM_CONTROL & 0xFFFF); | ||
105 | p0.h = (DMEM_CONTROL >> 16); | ||
106 | R1 = [p0]; | ||
107 | R0 = ~ENDCPLB; | ||
108 | R0 = R0 & R1; | ||
109 | [p0] = R0; | ||
110 | SSYNC; | ||
111 | |||
112 | /* Initialize stack pointer */ | ||
113 | SP.L = LO(INITIAL_STACK); | ||
114 | SP.H = HI(INITIAL_STACK); | ||
115 | FP = SP; | ||
116 | USP = SP; | ||
117 | |||
118 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | ||
119 | call _bf53x_relocate_l1_mem; | ||
120 | #if CONFIG_BFIN_KERNEL_CLOCK | ||
121 | call _start_dma_code; | ||
122 | #endif | ||
123 | /* Code for initializing Async memory banks */ | ||
124 | |||
125 | p2.h = hi(EBIU_AMBCTL1); | ||
126 | p2.l = lo(EBIU_AMBCTL1); | ||
127 | r0.h = hi(AMBCTL1VAL); | ||
128 | r0.l = lo(AMBCTL1VAL); | ||
129 | [p2] = r0; | ||
130 | ssync; | ||
131 | |||
132 | p2.h = hi(EBIU_AMBCTL0); | ||
133 | p2.l = lo(EBIU_AMBCTL0); | ||
134 | r0.h = hi(AMBCTL0VAL); | ||
135 | r0.l = lo(AMBCTL0VAL); | ||
136 | [p2] = r0; | ||
137 | ssync; | ||
138 | |||
139 | p2.h = hi(EBIU_AMGCTL); | ||
140 | p2.l = lo(EBIU_AMGCTL); | ||
141 | r0 = AMGCTLVAL; | ||
142 | w[p2] = r0; | ||
143 | ssync; | ||
144 | |||
145 | /* This section keeps the processor in supervisor mode | ||
146 | * during kernel boot. Switches to user mode at end of boot. | ||
147 | * See page 3-9 of Hardware Reference manual for documentation. | ||
148 | */ | ||
149 | |||
150 | /* EVT15 = _real_start */ | ||
151 | |||
152 | p0.l = lo(EVT15); | ||
153 | p0.h = hi(EVT15); | ||
154 | p1.l = _real_start; | ||
155 | p1.h = _real_start; | ||
156 | [p0] = p1; | ||
157 | csync; | ||
158 | |||
159 | p0.l = lo(IMASK); | ||
160 | p0.h = hi(IMASK); | ||
161 | p1.l = IMASK_IVG15; | ||
162 | p1.h = 0x0; | ||
163 | [p0] = p1; | ||
164 | csync; | ||
165 | |||
166 | raise 15; | ||
167 | p0.l = .LWAIT_HERE; | ||
168 | p0.h = .LWAIT_HERE; | ||
169 | reti = p0; | ||
170 | #if defined (ANOMALY_05000281) | ||
171 | nop; | ||
172 | nop; | ||
173 | nop; | ||
174 | #endif | ||
175 | rti; | ||
176 | |||
177 | .LWAIT_HERE: | ||
178 | jump .LWAIT_HERE; | ||
179 | |||
180 | ENTRY(_real_start) | ||
181 | [ -- sp ] = reti; | ||
182 | p0.l = lo(WDOG_CTL); | ||
183 | p0.h = hi(WDOG_CTL); | ||
184 | r0 = 0xAD6(z); | ||
185 | w[p0] = r0; /* watchdog off for now */ | ||
186 | ssync; | ||
187 | |||
188 | /* Code update for BSS size == 0 | ||
189 | * Zero out the bss region. | ||
190 | */ | ||
191 | |||
192 | p1.l = ___bss_start; | ||
193 | p1.h = ___bss_start; | ||
194 | p2.l = ___bss_stop; | ||
195 | p2.h = ___bss_stop; | ||
196 | r0 = 0; | ||
197 | p2 -= p1; | ||
198 | lsetup (.L_clear_bss, .L_clear_bss ) lc0 = p2; | ||
199 | .L_clear_bss: | ||
200 | B[p1++] = r0; | ||
201 | |||
202 | /* In case there is a NULL pointer reference | ||
203 | * Zero out region before stext | ||
204 | */ | ||
205 | |||
206 | p1.l = 0x0; | ||
207 | p1.h = 0x0; | ||
208 | r0.l = __stext; | ||
209 | r0.h = __stext; | ||
210 | r0 = r0 >> 1; | ||
211 | p2 = r0; | ||
212 | r0 = 0; | ||
213 | lsetup (.L_clear_zero, .L_clear_zero ) lc0 = p2; | ||
214 | .L_clear_zero: | ||
215 | W[p1++] = r0; | ||
216 | |||
217 | /* pass the uboot arguments to the global value command line */ | ||
218 | R0 = R7; | ||
219 | call _cmdline_init; | ||
220 | |||
221 | p1.l = __rambase; | ||
222 | p1.h = __rambase; | ||
223 | r0.l = __sdata; | ||
224 | r0.h = __sdata; | ||
225 | [p1] = r0; | ||
226 | |||
227 | p1.l = __ramstart; | ||
228 | p1.h = __ramstart; | ||
229 | p3.l = ___bss_stop; | ||
230 | p3.h = ___bss_stop; | ||
231 | |||
232 | r1 = p3; | ||
233 | [p1] = r1; | ||
234 | |||
235 | |||
236 | /* | ||
237 | * load the current thread pointer and stack | ||
238 | */ | ||
239 | r1.l = _init_thread_union; | ||
240 | r1.h = _init_thread_union; | ||
241 | |||
242 | r2.l = 0x2000; | ||
243 | r2.h = 0x0000; | ||
244 | r1 = r1 + r2; | ||
245 | sp = r1; | ||
246 | usp = sp; | ||
247 | fp = sp; | ||
248 | call _start_kernel; | ||
249 | .L_exit: | ||
250 | jump.s .L_exit; | ||
251 | |||
252 | .section .l1.text | ||
253 | #if CONFIG_BFIN_KERNEL_CLOCK | ||
254 | ENTRY(_start_dma_code) | ||
255 | |||
256 | /* Enable PHY CLK buffer output */ | ||
257 | p0.h = hi(VR_CTL); | ||
258 | p0.l = lo(VR_CTL); | ||
259 | r0.l = w[p0]; | ||
260 | bitset(r0, 14); | ||
261 | w[p0] = r0.l; | ||
262 | ssync; | ||
263 | |||
264 | p0.h = hi(SIC_IWR); | ||
265 | p0.l = lo(SIC_IWR); | ||
266 | r0.l = 0x1; | ||
267 | r0.h = 0x0; | ||
268 | [p0] = r0; | ||
269 | SSYNC; | ||
270 | |||
271 | /* | ||
272 | * Set PLL_CTL | ||
273 | * - [14:09] = MSEL[5:0] : CLKIN / VCO multiplication factors | ||
274 | * - [8] = BYPASS : BYPASS the PLL, run CLKIN into CCLK/SCLK | ||
275 | * - [7] = output delay (add 200ps of delay to mem signals) | ||
276 | * - [6] = input delay (add 200ps of input delay to mem signals) | ||
277 | * - [5] = PDWN : 1=All Clocks off | ||
278 | * - [3] = STOPCK : 1=Core Clock off | ||
279 | * - [1] = PLL_OFF : 1=Disable Power to PLL | ||
280 | * - [0] = DF : 1=Pass CLKIN/2 to PLL / 0=Pass CLKIN to PLL | ||
281 | * all other bits set to zero | ||
282 | */ | ||
283 | |||
284 | p0.h = hi(PLL_LOCKCNT); | ||
285 | p0.l = lo(PLL_LOCKCNT); | ||
286 | r0 = 0x300(Z); | ||
287 | w[p0] = r0.l; | ||
288 | ssync; | ||
289 | |||
290 | P2.H = hi(EBIU_SDGCTL); | ||
291 | P2.L = lo(EBIU_SDGCTL); | ||
292 | R0 = [P2]; | ||
293 | BITSET (R0, 24); | ||
294 | [P2] = R0; | ||
295 | SSYNC; | ||
296 | |||
297 | r0 = CONFIG_VCO_MULT & 63; /* Load the VCO multiplier */ | ||
298 | r0 = r0 << 9; /* Shift it over, */ | ||
299 | r1 = CLKIN_HALF; /* Do we need to divide CLKIN by 2?*/ | ||
300 | r0 = r1 | r0; | ||
301 | r1 = PLL_BYPASS; /* Bypass the PLL? */ | ||
302 | r1 = r1 << 8; /* Shift it over */ | ||
303 | r0 = r1 | r0; /* add them all together */ | ||
304 | |||
305 | p0.h = hi(PLL_CTL); | ||
306 | p0.l = lo(PLL_CTL); /* Load the address */ | ||
307 | cli r2; /* Disable interrupts */ | ||
308 | ssync; | ||
309 | w[p0] = r0.l; /* Set the value */ | ||
310 | idle; /* Wait for the PLL to stablize */ | ||
311 | sti r2; /* Enable interrupts */ | ||
312 | |||
313 | .Lcheck_again: | ||
314 | p0.h = hi(PLL_STAT); | ||
315 | p0.l = lo(PLL_STAT); | ||
316 | R0 = W[P0](Z); | ||
317 | CC = BITTST(R0,5); | ||
318 | if ! CC jump .Lcheck_again; | ||
319 | |||
320 | /* Configure SCLK & CCLK Dividers */ | ||
321 | r0 = (CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV); | ||
322 | p0.h = hi(PLL_DIV); | ||
323 | p0.l = lo(PLL_DIV); | ||
324 | w[p0] = r0.l; | ||
325 | ssync; | ||
326 | |||
327 | p0.l = lo(EBIU_SDRRC); | ||
328 | p0.h = hi(EBIU_SDRRC); | ||
329 | r0 = mem_SDRRC; | ||
330 | w[p0] = r0.l; | ||
331 | ssync; | ||
332 | |||
333 | p0.l = (EBIU_SDBCTL & 0xFFFF); | ||
334 | p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ | ||
335 | r0 = mem_SDBCTL; | ||
336 | w[p0] = r0.l; | ||
337 | ssync; | ||
338 | |||
339 | P2.H = hi(EBIU_SDGCTL); | ||
340 | P2.L = lo(EBIU_SDGCTL); | ||
341 | R0 = [P2]; | ||
342 | BITCLR (R0, 24); | ||
343 | p0.h = hi(EBIU_SDSTAT); | ||
344 | p0.l = lo(EBIU_SDSTAT); | ||
345 | r2.l = w[p0]; | ||
346 | cc = bittst(r2,3); | ||
347 | if !cc jump .Lskip; | ||
348 | NOP; | ||
349 | BITSET (R0, 23); | ||
350 | .Lskip: | ||
351 | [P2] = R0; | ||
352 | SSYNC; | ||
353 | |||
354 | R0.L = lo(mem_SDGCTL); | ||
355 | R0.H = hi(mem_SDGCTL); | ||
356 | R1 = [p2]; | ||
357 | R1 = R1 | R0; | ||
358 | [P2] = R1; | ||
359 | SSYNC; | ||
360 | |||
361 | p0.h = hi(SIC_IWR); | ||
362 | p0.l = lo(SIC_IWR); | ||
363 | r0.l = lo(IWR_ENABLE_ALL); | ||
364 | r0.h = hi(IWR_ENABLE_ALL); | ||
365 | [p0] = r0; | ||
366 | SSYNC; | ||
367 | |||
368 | RTS; | ||
369 | #endif /* CONFIG_BFIN_KERNEL_CLOCK */ | ||
370 | |||
371 | ENTRY(_bfin_reset) | ||
372 | /* No more interrupts to be handled*/ | ||
373 | CLI R6; | ||
374 | SSYNC; | ||
375 | |||
376 | #if defined(CONFIG_MTD_M25P80) | ||
377 | /* | ||
378 | * The following code fix the SPI flash reboot issue, | ||
379 | * /CS signal of the chip which is using PF10 return to GPIO mode | ||
380 | */ | ||
381 | p0.h = hi(PORTF_FER); | ||
382 | p0.l = lo(PORTF_FER); | ||
383 | r0.l = 0x0000; | ||
384 | w[p0] = r0.l; | ||
385 | SSYNC; | ||
386 | |||
387 | /* /CS return to high */ | ||
388 | p0.h = hi(PORTFIO); | ||
389 | p0.l = lo(PORTFIO); | ||
390 | r0.l = 0xFFFF; | ||
391 | w[p0] = r0.l; | ||
392 | SSYNC; | ||
393 | |||
394 | /* Delay some time, This is necessary */ | ||
395 | r1.h = 0; | ||
396 | r1.l = 0x400; | ||
397 | p1 = r1; | ||
398 | lsetup (_delay_lab1,_delay_lab1_end ) lc1 = p1; | ||
399 | _delay_lab1: | ||
400 | r0.h = 0; | ||
401 | r0.l = 0x8000; | ||
402 | p0 = r0; | ||
403 | lsetup (_delay_lab0,_delay_lab0_end ) lc0 = p0; | ||
404 | _delay_lab0: | ||
405 | nop; | ||
406 | _delay_lab0_end: | ||
407 | nop; | ||
408 | _delay_lab1_end: | ||
409 | nop; | ||
410 | #endif | ||
411 | |||
412 | /* Clear the bits 13-15 in SWRST if they werent cleared */ | ||
413 | p0.h = hi(SWRST); | ||
414 | p0.l = lo(SWRST); | ||
415 | csync; | ||
416 | r0.l = w[p0]; | ||
417 | |||
418 | /* Clear the IMASK register */ | ||
419 | p0.h = hi(IMASK); | ||
420 | p0.l = lo(IMASK); | ||
421 | r0 = 0x0; | ||
422 | [p0] = r0; | ||
423 | |||
424 | /* Clear the ILAT register */ | ||
425 | p0.h = hi(ILAT); | ||
426 | p0.l = lo(ILAT); | ||
427 | r0 = [p0]; | ||
428 | [p0] = r0; | ||
429 | SSYNC; | ||
430 | |||
431 | /* Disable the WDOG TIMER */ | ||
432 | p0.h = hi(WDOG_CTL); | ||
433 | p0.l = lo(WDOG_CTL); | ||
434 | r0.l = 0xAD6; | ||
435 | w[p0] = r0.l; | ||
436 | SSYNC; | ||
437 | |||
438 | /* Clear the sticky bit incase it is already set */ | ||
439 | p0.h = hi(WDOG_CTL); | ||
440 | p0.l = lo(WDOG_CTL); | ||
441 | r0.l = 0x8AD6; | ||
442 | w[p0] = r0.l; | ||
443 | SSYNC; | ||
444 | |||
445 | /* Program the count value */ | ||
446 | R0.l = 0x100; | ||
447 | R0.h = 0x0; | ||
448 | P0.h = hi(WDOG_CNT); | ||
449 | P0.l = lo(WDOG_CNT); | ||
450 | [P0] = R0; | ||
451 | SSYNC; | ||
452 | |||
453 | /* Program WDOG_STAT if necessary */ | ||
454 | P0.h = hi(WDOG_CTL); | ||
455 | P0.l = lo(WDOG_CTL); | ||
456 | R0 = W[P0](Z); | ||
457 | CC = BITTST(R0,1); | ||
458 | if !CC JUMP .LWRITESTAT; | ||
459 | CC = BITTST(R0,2); | ||
460 | if !CC JUMP .LWRITESTAT; | ||
461 | JUMP .LSKIP_WRITE; | ||
462 | |||
463 | .LWRITESTAT: | ||
464 | /* When watch dog timer is enabled, | ||
465 | * a write to STAT will load the contents of CNT to STAT | ||
466 | */ | ||
467 | R0 = 0x0000(z); | ||
468 | P0.h = hi(WDOG_STAT); | ||
469 | P0.l = lo(WDOG_STAT) | ||
470 | [P0] = R0; | ||
471 | SSYNC; | ||
472 | |||
473 | .LSKIP_WRITE: | ||
474 | /* Enable the reset event */ | ||
475 | P0.h = hi(WDOG_CTL); | ||
476 | P0.l = lo(WDOG_CTL); | ||
477 | R0 = W[P0](Z); | ||
478 | BITCLR(R0,1); | ||
479 | BITCLR(R0,2); | ||
480 | W[P0] = R0.L; | ||
481 | SSYNC; | ||
482 | NOP; | ||
483 | |||
484 | /* Enable the wdog counter */ | ||
485 | R0 = W[P0](Z); | ||
486 | BITCLR(R0,4); | ||
487 | W[P0] = R0.L; | ||
488 | SSYNC; | ||
489 | |||
490 | IDLE; | ||
491 | |||
492 | RTS; | ||
493 | |||
494 | .data | ||
495 | |||
496 | /* | ||
497 | * Set up the usable of RAM stuff. Size of RAM is determined then | ||
498 | * an initial stack set up at the end. | ||
499 | */ | ||
500 | |||
501 | .align 4 | ||
502 | __rambase: | ||
503 | .long 0 | ||
504 | __ramstart: | ||
505 | .long 0 | ||
506 | __ramend: | ||
507 | .long 0 | ||
diff --git a/arch/blackfin/mach-bf548/ints-priority.c b/arch/blackfin/mach-bf548/ints-priority.c new file mode 100644 index 000000000000..dde450f119e1 --- /dev/null +++ b/arch/blackfin/mach-bf548/ints-priority.c | |||
@@ -0,0 +1,137 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf537/ints-priority.c | ||
3 | * Based on: arch/blackfin/mach-bf533/ints-priority.c | ||
4 | * Author: Michael Hennerich | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: Set up the interupt priorities | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2004-2006 Analog Devices Inc. | ||
11 | * | ||
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, see the file COPYING, or write | ||
26 | * to the Free Software Foundation, Inc., | ||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
28 | */ | ||
29 | |||
30 | #include <linux/module.h> | ||
31 | #include <asm/blackfin.h> | ||
32 | #include <asm/irq.h> | ||
33 | |||
34 | void program_IAR(void) | ||
35 | { | ||
36 | /* Program the IAR0 Register with the configured priority */ | ||
37 | bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | | ||
38 | ((CONFIG_IRQ_DMAC0_ERR - 7) << IRQ_DMAC0_ERR_POS) | | ||
39 | ((CONFIG_IRQ_EPPI0_ERR - 7) << IRQ_EPPI0_ERR_POS) | | ||
40 | ((CONFIG_IRQ_SPORT0_ERR - 7) << IRQ_SPORT0_ERR_POS) | | ||
41 | ((CONFIG_IRQ_SPORT1_ERR - 7) << IRQ_SPORT1_ERR_POS) | | ||
42 | ((CONFIG_IRQ_SPI0_ERR - 7) << IRQ_SPI0_ERR_POS) | | ||
43 | ((CONFIG_IRQ_UART0_ERR - 7) << IRQ_UART0_ERR_POS) | | ||
44 | ((CONFIG_IRQ_RTC - 7) << IRQ_RTC_POS)); | ||
45 | |||
46 | bfin_write_SIC_IAR1(((CONFIG_IRQ_EPPI0 - 7) << IRQ_EPPI0_POS) | | ||
47 | ((CONFIG_IRQ_SPORT0_RX - 7) << IRQ_SPORT0_RX_POS) | | ||
48 | ((CONFIG_IRQ_SPORT0_TX - 7) << IRQ_SPORT0_TX_POS) | | ||
49 | ((CONFIG_IRQ_SPORT1_RX - 7) << IRQ_SPORT1_RX_POS) | | ||
50 | ((CONFIG_IRQ_SPORT1_TX - 7) << IRQ_SPORT1_TX_POS) | | ||
51 | ((CONFIG_IRQ_SPI0 - 7) << IRQ_SPI0_POS) | | ||
52 | ((CONFIG_IRQ_UART0_RX - 7) << IRQ_UART0_RX_POS) | | ||
53 | ((CONFIG_IRQ_UART0_TX - 7) << IRQ_UART0_TX_POS)); | ||
54 | |||
55 | bfin_write_SIC_IAR2(((CONFIG_IRQ_TIMER8 - 7) << IRQ_TIMER8_POS) | | ||
56 | ((CONFIG_IRQ_TIMER9 - 7) << IRQ_TIMER9_POS) | | ||
57 | ((CONFIG_IRQ_PINT0 - 7) << IRQ_PINT0_POS) | | ||
58 | ((CONFIG_IRQ_PINT1 - 7) << IRQ_PINT1_POS) | | ||
59 | ((CONFIG_IRQ_MDMAS0 - 7) << IRQ_MDMAS0_POS) | | ||
60 | ((CONFIG_IRQ_MDMAS1 - 7) << IRQ_MDMAS1_POS) | | ||
61 | ((CONFIG_IRQ_WATCHDOG - 7) << IRQ_WATCHDOG_POS)); | ||
62 | |||
63 | bfin_write_SIC_IAR3(((CONFIG_IRQ_DMAC1_ERR - 7) << IRQ_DMAC1_ERR_POS) | | ||
64 | ((CONFIG_IRQ_SPORT2_ERR - 7) << IRQ_SPORT2_ERR_POS) | | ||
65 | ((CONFIG_IRQ_SPORT3_ERR - 7) << IRQ_SPORT3_ERR_POS) | | ||
66 | ((CONFIG_IRQ_MXVR_DATA - 7) << IRQ_MXVR_DATA_POS) | | ||
67 | ((CONFIG_IRQ_SPI1_ERR - 7) << IRQ_SPI1_ERR_POS) | | ||
68 | ((CONFIG_IRQ_SPI2_ERR - 7) << IRQ_SPI2_ERR_POS) | | ||
69 | ((CONFIG_IRQ_UART1_ERR - 7) << IRQ_UART1_ERR_POS) | | ||
70 | ((CONFIG_IRQ_UART2_ERR - 7) << IRQ_UART2_ERR_POS)); | ||
71 | |||
72 | bfin_write_SIC_IAR4(((CONFIG_IRQ_CAN0_ERR - 7) << IRQ_CAN0_ERR_POS) | | ||
73 | ((CONFIG_IRQ_SPORT2_RX - 7) << IRQ_SPORT2_RX_POS) | | ||
74 | ((CONFIG_IRQ_SPORT2_TX - 7) << IRQ_SPORT2_TX_POS) | | ||
75 | ((CONFIG_IRQ_SPORT3_RX - 7) << IRQ_SPORT3_RX_POS) | | ||
76 | ((CONFIG_IRQ_SPORT3_TX - 7) << IRQ_SPORT3_TX_POS) | | ||
77 | ((CONFIG_IRQ_EPPI1 - 7) << IRQ_EPPI1_POS) | | ||
78 | ((CONFIG_IRQ_EPPI2 - 7) << IRQ_EPPI2_POS) | | ||
79 | ((CONFIG_IRQ_SPI1 - 7) << IRQ_SPI1_POS)); | ||
80 | |||
81 | bfin_write_SIC_IAR5(((CONFIG_IRQ_SPI2 - 7) << IRQ_SPI2_POS) | | ||
82 | ((CONFIG_IRQ_UART1_RX - 7) << IRQ_UART1_RX_POS) | | ||
83 | ((CONFIG_IRQ_UART1_TX - 7) << IRQ_UART1_TX_POS) | | ||
84 | ((CONFIG_IRQ_ATAPI_RX - 7) << IRQ_ATAPI_RX_POS) | | ||
85 | ((CONFIG_IRQ_ATAPI_TX - 7) << IRQ_ATAPI_TX_POS) | | ||
86 | ((CONFIG_IRQ_TWI0 - 7) << IRQ_TWI0_POS) | | ||
87 | ((CONFIG_IRQ_TWI1 - 7) << IRQ_TWI1_POS) | | ||
88 | ((CONFIG_IRQ_CAN0_RX - 7) << IRQ_CAN0_RX_POS)); | ||
89 | |||
90 | bfin_write_SIC_IAR6(((CONFIG_IRQ_CAN0_TX - 7) << IRQ_CAN0_TX_POS) | | ||
91 | ((CONFIG_IRQ_MDMAS2 - 7) << IRQ_MDMAS2_POS) | | ||
92 | ((CONFIG_IRQ_MDMAS3 - 7) << IRQ_MDMAS3_POS) | | ||
93 | ((CONFIG_IRQ_MXVR_ERR - 7) << IRQ_MXVR_ERR_POS) | | ||
94 | ((CONFIG_IRQ_MXVR_MSG - 7) << IRQ_MXVR_MSG_POS) | | ||
95 | ((CONFIG_IRQ_MXVR_PKT - 7) << IRQ_MXVR_PKT_POS) | | ||
96 | ((CONFIG_IRQ_EPPI1_ERR - 7) << IRQ_EPPI1_ERR_POS) | | ||
97 | ((CONFIG_IRQ_EPPI2_ERR - 7) << IRQ_EPPI2_ERR_POS)); | ||
98 | |||
99 | bfin_write_SIC_IAR7(((CONFIG_IRQ_UART3_ERR - 7) << IRQ_UART3_ERR_POS) | | ||
100 | ((CONFIG_IRQ_HOST_ERR - 7) << IRQ_HOST_ERR_POS) | | ||
101 | ((CONFIG_IRQ_PIXC_ERR - 7) << IRQ_PIXC_ERR_POS) | | ||
102 | ((CONFIG_IRQ_NFC_ERR - 7) << IRQ_NFC_ERR_POS) | | ||
103 | ((CONFIG_IRQ_ATAPI_ERR - 7) << IRQ_ATAPI_ERR_POS) | | ||
104 | ((CONFIG_IRQ_CAN1_ERR - 7) << IRQ_CAN1_ERR_POS) | | ||
105 | ((CONFIG_IRQ_HS_DMA_ERR - 7) << IRQ_HS_DMA_ERR_POS)); | ||
106 | |||
107 | bfin_write_SIC_IAR8(((CONFIG_IRQ_PIXC_IN0 - 7) << IRQ_PIXC_IN1_POS) | | ||
108 | ((CONFIG_IRQ_PIXC_IN1 - 7) << IRQ_PIXC_IN1_POS) | | ||
109 | ((CONFIG_IRQ_PIXC_OUT - 7) << IRQ_PIXC_OUT_POS) | | ||
110 | ((CONFIG_IRQ_SDH - 7) << IRQ_SDH_POS) | | ||
111 | ((CONFIG_IRQ_CNT - 7) << IRQ_CNT_POS) | | ||
112 | ((CONFIG_IRQ_KEY - 7) << IRQ_KEY_POS) | | ||
113 | ((CONFIG_IRQ_CAN1_RX - 7) << IRQ_CAN1_RX_POS) | | ||
114 | ((CONFIG_IRQ_CAN1_TX - 7) << IRQ_CAN1_TX_POS)); | ||
115 | |||
116 | bfin_write_SIC_IAR9(((CONFIG_IRQ_SDH_MASK0 - 7) << IRQ_SDH_MASK0_POS) | | ||
117 | ((CONFIG_IRQ_SDH_MASK1 - 7) << IRQ_SDH_MASK1_POS) | | ||
118 | ((CONFIG_IRQ_USB_INT0 - 7) << IRQ_USB_INT0_POS) | | ||
119 | ((CONFIG_IRQ_USB_INT1 - 7) << IRQ_USB_INT1_POS) | | ||
120 | ((CONFIG_IRQ_USB_INT2 - 7) << IRQ_USB_INT2_POS) | | ||
121 | ((CONFIG_IRQ_USB_DMA - 7) << IRQ_USB_DMA_POS) | | ||
122 | ((CONFIG_IRQ_OTPSEC - 7) << IRQ_OTPSEC_POS)); | ||
123 | |||
124 | bfin_write_SIC_IAR10(((CONFIG_IRQ_TIMER0 - 7) << IRQ_TIMER0_POS) | | ||
125 | ((CONFIG_IRQ_TIMER1 - 7) << IRQ_TIMER1_POS)); | ||
126 | |||
127 | bfin_write_SIC_IAR11(((CONFIG_IRQ_TIMER2 - 7) << IRQ_TIMER2_POS) | | ||
128 | ((CONFIG_IRQ_TIMER3 - 7) << IRQ_TIMER3_POS) | | ||
129 | ((CONFIG_IRQ_TIMER4 - 7) << IRQ_TIMER4_POS) | | ||
130 | ((CONFIG_IRQ_TIMER5 - 7) << IRQ_TIMER5_POS) | | ||
131 | ((CONFIG_IRQ_TIMER6 - 7) << IRQ_TIMER6_POS) | | ||
132 | ((CONFIG_IRQ_TIMER7 - 7) << IRQ_TIMER7_POS) | | ||
133 | ((CONFIG_IRQ_PINT2 - 7) << IRQ_PINT2_POS) | | ||
134 | ((CONFIG_IRQ_PINT3 - 7) << IRQ_PINT3_POS)); | ||
135 | |||
136 | SSYNC(); | ||
137 | } | ||
diff --git a/arch/blackfin/mach-bf561/Makefile b/arch/blackfin/mach-bf561/Makefile index 57f475a55161..f39235a55783 100644 --- a/arch/blackfin/mach-bf561/Makefile +++ b/arch/blackfin/mach-bf561/Makefile | |||
@@ -4,6 +4,6 @@ | |||
4 | 4 | ||
5 | extra-y := head.o | 5 | extra-y := head.o |
6 | 6 | ||
7 | obj-y := ints-priority.o | 7 | obj-y := ints-priority.o dma.o |
8 | 8 | ||
9 | obj-$(CONFIG_BF561_COREB) += coreb.o | 9 | obj-$(CONFIG_BF561_COREB) += coreb.o |
diff --git a/arch/blackfin/mach-bf561/dma.c b/arch/blackfin/mach-bf561/dma.c new file mode 100644 index 000000000000..89c65bb0bed3 --- /dev/null +++ b/arch/blackfin/mach-bf561/dma.c | |||
@@ -0,0 +1,131 @@ | |||
1 | /* | ||
2 | * File: arch/blackfin/mach-bf561/dma.c | ||
3 | * Based on: | ||
4 | * Author: | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: This file contains the simple DMA Implementation for Blackfin | ||
8 | * | ||
9 | * Modified: | ||
10 | * Copyright 2004-2007 Analog Devices Inc. | ||
11 | * | ||
12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License as published by | ||
16 | * the Free Software Foundation; either version 2 of the License, or | ||
17 | * (at your option) any later version. | ||
18 | * | ||
19 | * This program is distributed in the hope that it will be useful, | ||
20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
22 | * GNU General Public License for more details. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License | ||
25 | * along with this program; if not, see the file COPYING, or write | ||
26 | * to the Free Software Foundation, Inc., | ||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
28 | */ | ||
29 | #include <asm/blackfin.h> | ||
30 | #include <asm/dma.h> | ||
31 | |||
32 | struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL] = { | ||
33 | (struct dma_register *) DMA1_0_NEXT_DESC_PTR, | ||
34 | (struct dma_register *) DMA1_1_NEXT_DESC_PTR, | ||
35 | (struct dma_register *) DMA1_2_NEXT_DESC_PTR, | ||
36 | (struct dma_register *) DMA1_3_NEXT_DESC_PTR, | ||
37 | (struct dma_register *) DMA1_4_NEXT_DESC_PTR, | ||
38 | (struct dma_register *) DMA1_5_NEXT_DESC_PTR, | ||
39 | (struct dma_register *) DMA1_6_NEXT_DESC_PTR, | ||
40 | (struct dma_register *) DMA1_7_NEXT_DESC_PTR, | ||
41 | (struct dma_register *) DMA1_8_NEXT_DESC_PTR, | ||
42 | (struct dma_register *) DMA1_9_NEXT_DESC_PTR, | ||
43 | (struct dma_register *) DMA1_10_NEXT_DESC_PTR, | ||
44 | (struct dma_register *) DMA1_11_NEXT_DESC_PTR, | ||
45 | (struct dma_register *) DMA2_0_NEXT_DESC_PTR, | ||
46 | (struct dma_register *) DMA2_1_NEXT_DESC_PTR, | ||
47 | (struct dma_register *) DMA2_2_NEXT_DESC_PTR, | ||
48 | (struct dma_register *) DMA2_3_NEXT_DESC_PTR, | ||
49 | (struct dma_register *) DMA2_4_NEXT_DESC_PTR, | ||
50 | (struct dma_register *) DMA2_5_NEXT_DESC_PTR, | ||
51 | (struct dma_register *) DMA2_6_NEXT_DESC_PTR, | ||
52 | (struct dma_register *) DMA2_7_NEXT_DESC_PTR, | ||
53 | (struct dma_register *) DMA2_8_NEXT_DESC_PTR, | ||
54 | (struct dma_register *) DMA2_9_NEXT_DESC_PTR, | ||
55 | (struct dma_register *) DMA2_10_NEXT_DESC_PTR, | ||
56 | (struct dma_register *) DMA2_11_NEXT_DESC_PTR, | ||
57 | (struct dma_register *) MDMA1_D0_NEXT_DESC_PTR, | ||
58 | (struct dma_register *) MDMA1_S0_NEXT_DESC_PTR, | ||
59 | (struct dma_register *) MDMA1_D1_NEXT_DESC_PTR, | ||
60 | (struct dma_register *) MDMA1_S1_NEXT_DESC_PTR, | ||
61 | (struct dma_register *) MDMA2_D0_NEXT_DESC_PTR, | ||
62 | (struct dma_register *) MDMA2_S0_NEXT_DESC_PTR, | ||
63 | (struct dma_register *) MDMA2_D1_NEXT_DESC_PTR, | ||
64 | (struct dma_register *) MDMA2_S1_NEXT_DESC_PTR, | ||
65 | (struct dma_register *) IMDMA_D0_NEXT_DESC_PTR, | ||
66 | (struct dma_register *) IMDMA_S0_NEXT_DESC_PTR, | ||
67 | (struct dma_register *) IMDMA_D1_NEXT_DESC_PTR, | ||
68 | (struct dma_register *) IMDMA_S1_NEXT_DESC_PTR, | ||
69 | }; | ||
70 | |||
71 | int channel2irq(unsigned int channel) | ||
72 | { | ||
73 | int ret_irq = -1; | ||
74 | |||
75 | switch (channel) { | ||
76 | case CH_PPI0: | ||
77 | ret_irq = IRQ_PPI0; | ||
78 | break; | ||
79 | case CH_PPI1: | ||
80 | ret_irq = IRQ_PPI1; | ||
81 | break; | ||
82 | case CH_SPORT0_RX: | ||
83 | ret_irq = IRQ_SPORT0_RX; | ||
84 | break; | ||
85 | case CH_SPORT0_TX: | ||
86 | ret_irq = IRQ_SPORT0_TX; | ||
87 | break; | ||
88 | case CH_SPORT1_RX: | ||
89 | ret_irq = IRQ_SPORT1_RX; | ||
90 | break; | ||
91 | case CH_SPORT1_TX: | ||
92 | ret_irq = IRQ_SPORT1_TX; | ||
93 | break; | ||
94 | case CH_SPI: | ||
95 | ret_irq = IRQ_SPI; | ||
96 | break; | ||
97 | case CH_UART_RX: | ||
98 | ret_irq = IRQ_UART_RX; | ||
99 | break; | ||
100 | case CH_UART_TX: | ||
101 | ret_irq = IRQ_UART_TX; | ||
102 | break; | ||
103 | |||
104 | case CH_MEM_STREAM0_SRC: | ||
105 | case CH_MEM_STREAM0_DEST: | ||
106 | ret_irq = IRQ_MEM_DMA0; | ||
107 | break; | ||
108 | case CH_MEM_STREAM1_SRC: | ||
109 | case CH_MEM_STREAM1_DEST: | ||
110 | ret_irq = IRQ_MEM_DMA1; | ||
111 | break; | ||
112 | case CH_MEM_STREAM2_SRC: | ||
113 | case CH_MEM_STREAM2_DEST: | ||
114 | ret_irq = IRQ_MEM_DMA2; | ||
115 | break; | ||
116 | case CH_MEM_STREAM3_SRC: | ||
117 | case CH_MEM_STREAM3_DEST: | ||
118 | ret_irq = IRQ_MEM_DMA3; | ||
119 | break; | ||
120 | |||
121 | case CH_IMEM_STREAM0_SRC: | ||
122 | case CH_IMEM_STREAM0_DEST: | ||
123 | ret_irq = IRQ_IMEM_DMA0; | ||
124 | break; | ||
125 | case CH_IMEM_STREAM1_SRC: | ||
126 | case CH_IMEM_STREAM1_DEST: | ||
127 | ret_irq = IRQ_IMEM_DMA1; | ||
128 | break; | ||
129 | } | ||
130 | return ret_irq; | ||
131 | } | ||
diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile index d3a49073d196..0279ede70392 100644 --- a/arch/blackfin/mach-common/Makefile +++ b/arch/blackfin/mach-common/Makefile | |||
@@ -4,9 +4,9 @@ | |||
4 | 4 | ||
5 | obj-y := \ | 5 | obj-y := \ |
6 | cache.o cacheinit.o cplbhdlr.o cplbmgr.o entry.o \ | 6 | cache.o cacheinit.o cplbhdlr.o cplbmgr.o entry.o \ |
7 | interrupt.o lock.o dpmc.o irqpanic.o | 7 | interrupt.o lock.o irqpanic.o |
8 | 8 | ||
9 | obj-$(CONFIG_CPLB_INFO) += cplbinfo.o | 9 | obj-$(CONFIG_CPLB_INFO) += cplbinfo.o |
10 | obj-$(CONFIG_BFIN_SINGLE_CORE) += ints-priority-sc.o | 10 | obj-$(CONFIG_BFIN_SINGLE_CORE) += ints-priority-sc.o |
11 | obj-$(CONFIG_BFIN_DUAL_CORE) += ints-priority-dc.o | 11 | obj-$(CONFIG_BFIN_DUAL_CORE) += ints-priority-dc.o |
12 | obj-$(CONFIG_PM) += pm.o | 12 | obj-$(CONFIG_PM) += pm.o dpmc.o |
diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c index 2cfc7d5aec5c..cec0f841fb5a 100644 --- a/arch/blackfin/mach-common/ints-priority-sc.c +++ b/arch/blackfin/mach-common/ints-priority-sc.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * 2002 Arcturus Networks Inc. MaTed <mated@sympatico.ca> | 13 | * 2002 Arcturus Networks Inc. MaTed <mated@sympatico.ca> |
14 | * 2003 Metrowerks/Motorola | 14 | * 2003 Metrowerks/Motorola |
15 | * 2003 Bas Vermeulen <bas@buyways.nl> | 15 | * 2003 Bas Vermeulen <bas@buyways.nl> |
16 | * Copyright 2004-2006 Analog Devices Inc. | 16 | * Copyright 2004-2007 Analog Devices Inc. |
17 | * | 17 | * |
18 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 18 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
19 | * | 19 | * |
@@ -65,9 +65,9 @@ atomic_t num_spurious; | |||
65 | 65 | ||
66 | struct ivgx { | 66 | struct ivgx { |
67 | /* irq number for request_irq, available in mach-bf533/irq.h */ | 67 | /* irq number for request_irq, available in mach-bf533/irq.h */ |
68 | int irqno; | 68 | unsigned int irqno; |
69 | /* corresponding bit in the SIC_ISR register */ | 69 | /* corresponding bit in the SIC_ISR register */ |
70 | int isrflag; | 70 | unsigned int isrflag; |
71 | } ivg_table[NR_PERI_INTS]; | 71 | } ivg_table[NR_PERI_INTS]; |
72 | 72 | ||
73 | struct ivg_slice { | 73 | struct ivg_slice { |
@@ -98,7 +98,7 @@ static void __init search_IAR(void) | |||
98 | bfin_read32((unsigned long *) SIC_IAR0 + | 98 | bfin_read32((unsigned long *) SIC_IAR0 + |
99 | (irqn >> 3)) >> iar_shift)) { | 99 | (irqn >> 3)) >> iar_shift)) { |
100 | ivg_table[irq_pos].irqno = IVG7 + irqn; | 100 | ivg_table[irq_pos].irqno = IVG7 + irqn; |
101 | ivg_table[irq_pos].isrflag = 1 << irqn; | 101 | ivg_table[irq_pos].isrflag = 1 << (irqn % 32); |
102 | ivg7_13[ivg].istop++; | 102 | ivg7_13[ivg].istop++; |
103 | irq_pos++; | 103 | irq_pos++; |
104 | } | 104 | } |
@@ -141,15 +141,31 @@ static void bfin_core_unmask_irq(unsigned int irq) | |||
141 | 141 | ||
142 | static void bfin_internal_mask_irq(unsigned int irq) | 142 | static void bfin_internal_mask_irq(unsigned int irq) |
143 | { | 143 | { |
144 | #ifndef CONFIG_BF54x | ||
144 | bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() & | 145 | bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() & |
145 | ~(1 << (irq - (IRQ_CORETMR + 1)))); | 146 | ~(1 << (irq - (IRQ_CORETMR + 1)))); |
147 | #else | ||
148 | unsigned mask_bank, mask_bit; | ||
149 | mask_bank = (irq - (IRQ_CORETMR +1))/32; | ||
150 | mask_bit = (irq - (IRQ_CORETMR + 1))%32; | ||
151 | bfin_write_SIC_IMASK( mask_bank, bfin_read_SIC_IMASK(mask_bank) & \ | ||
152 | ~(1 << mask_bit)); | ||
153 | #endif | ||
146 | SSYNC(); | 154 | SSYNC(); |
147 | } | 155 | } |
148 | 156 | ||
149 | static void bfin_internal_unmask_irq(unsigned int irq) | 157 | static void bfin_internal_unmask_irq(unsigned int irq) |
150 | { | 158 | { |
159 | #ifndef CONFIG_BF54x | ||
151 | bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() | | 160 | bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() | |
152 | (1 << (irq - (IRQ_CORETMR + 1)))); | 161 | (1 << (irq - (IRQ_CORETMR + 1)))); |
162 | #else | ||
163 | unsigned mask_bank, mask_bit; | ||
164 | mask_bank = (irq - (IRQ_CORETMR +1))/32; | ||
165 | mask_bit = (irq - (IRQ_CORETMR + 1))%32; | ||
166 | bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) | \ | ||
167 | ( 1 << mask_bit)); | ||
168 | #endif | ||
153 | SSYNC(); | 169 | SSYNC(); |
154 | } | 170 | } |
155 | 171 | ||
@@ -452,7 +468,14 @@ int __init init_arch_irq(void) | |||
452 | int irq; | 468 | int irq; |
453 | unsigned long ilat = 0; | 469 | unsigned long ilat = 0; |
454 | /* Disable all the peripheral intrs - page 4-29 HW Ref manual */ | 470 | /* Disable all the peripheral intrs - page 4-29 HW Ref manual */ |
471 | #ifdef CONFIG_BF54x | ||
472 | bfin_write_SIC_IMASK0(SIC_UNMASK_ALL); | ||
473 | bfin_write_SIC_IMASK1(SIC_UNMASK_ALL); | ||
474 | bfin_write_SIC_IMASK2(SIC_UNMASK_ALL); | ||
475 | #else | ||
455 | bfin_write_SIC_IMASK(SIC_UNMASK_ALL); | 476 | bfin_write_SIC_IMASK(SIC_UNMASK_ALL); |
477 | #endif | ||
478 | |||
456 | SSYNC(); | 479 | SSYNC(); |
457 | 480 | ||
458 | local_irq_disable(); | 481 | local_irq_disable(); |
@@ -555,9 +578,25 @@ void do_irq(int vec, struct pt_regs *fp) | |||
555 | } else { | 578 | } else { |
556 | struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst; | 579 | struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst; |
557 | struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop; | 580 | struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop; |
558 | unsigned long sic_status; | 581 | #ifdef CONFIG_BF54x |
582 | unsigned long sic_status[3]; | ||
559 | 583 | ||
560 | SSYNC(); | 584 | SSYNC(); |
585 | sic_status[0] = bfin_read_SIC_ISR(0) & bfin_read_SIC_IMASK(0); | ||
586 | sic_status[1] = bfin_read_SIC_ISR(1) & bfin_read_SIC_IMASK(1); | ||
587 | sic_status[2] = bfin_read_SIC_ISR(2) & bfin_read_SIC_IMASK(2); | ||
588 | SSYNC(); | ||
589 | for(;; ivg++) { | ||
590 | if (ivg >= ivg_stop) { | ||
591 | atomic_inc(&num_spurious); | ||
592 | return; | ||
593 | } | ||
594 | if (sic_status[(ivg->irqno - IVG7)/32] & ivg->isrflag) | ||
595 | break; | ||
596 | } | ||
597 | #else | ||
598 | unsigned long sic_status; | ||
599 | SSYNC(); | ||
561 | sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR(); | 600 | sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR(); |
562 | 601 | ||
563 | for (;; ivg++) { | 602 | for (;; ivg++) { |
@@ -567,6 +606,7 @@ void do_irq(int vec, struct pt_regs *fp) | |||
567 | } else if (sic_status & ivg->isrflag) | 606 | } else if (sic_status & ivg->isrflag) |
568 | break; | 607 | break; |
569 | } | 608 | } |
609 | #endif | ||
570 | vec = ivg->irqno; | 610 | vec = ivg->irqno; |
571 | } | 611 | } |
572 | asm_do_IRQ(vec, fp); | 612 | asm_do_IRQ(vec, fp); |