diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
commit | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch) | |
tree | 8b8cc6a027353a0f242f61362b35b0942da61b83 /arch/blackfin/mach-bf561 | |
parent | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff) | |
parent | 5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/blackfin/mach-bf561')
-rw-r--r-- | arch/blackfin/mach-bf561/atomic.S | 21 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 45 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/ezkit.c | 44 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/tepla.c | 14 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/dma.c | 28 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/bf561.h | 27 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h | 29 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/blackfin.h | 28 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 28 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/defBF561.h | 29 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/gpio.h | 3 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/irq.h | 29 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/portmux.h | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/smp.h | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/ints-priority.c | 27 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/secondary.S | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/smp.c | 21 |
17 files changed, 57 insertions, 352 deletions
diff --git a/arch/blackfin/mach-bf561/atomic.S b/arch/blackfin/mach-bf561/atomic.S index 9439bc6bd01..0261a5e751b 100644 --- a/arch/blackfin/mach-bf561/atomic.S +++ b/arch/blackfin/mach-bf561/atomic.S | |||
@@ -1,23 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf561/atomic.S | 2 | * Copyright 2007-2008 Analog Devices Inc. |
3 | * Author: Philippe Gerum <rpm@xenomai.org> | 3 | * Philippe Gerum <rpm@xenomai.org> |
4 | * | 4 | * |
5 | * Copyright 2007 Analog Devices Inc. | 5 | * Licensed under the GPL-2 or later. |
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, see the file COPYING, or write | ||
19 | * to the Free Software Foundation, Inc., | ||
20 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
21 | */ | 6 | */ |
22 | 7 | ||
23 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index 6577ecfcf11..dfc8d5b7798 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
@@ -1,30 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf533/boards/cm_bf561.c | 2 | * Copyright 2004-2009 Analog Devices Inc. |
3 | * Based on: arch/blackfin/mach-bf533/boards/ezkit.c | 3 | * 2008-2009 Bluetechnix |
4 | * Author: Aidan Williams <aidan@nicta.com.au> Copyright 2005 | 4 | * 2005 National ICT Australia (NICTA) |
5 | * Aidan Williams <aidan@nicta.com.au> | ||
5 | * | 6 | * |
6 | * Created: 2006 | 7 | * Licensed under the GPL-2 or later. |
7 | * Description: Board description file | ||
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 | */ | 8 | */ |
29 | 9 | ||
30 | #include <linux/device.h> | 10 | #include <linux/device.h> |
@@ -285,19 +265,6 @@ static struct platform_device net2272_bfin_device = { | |||
285 | }; | 265 | }; |
286 | #endif | 266 | #endif |
287 | 267 | ||
288 | static struct resource bfin_gpios_resources = { | ||
289 | .start = 0, | ||
290 | .end = MAX_BLACKFIN_GPIOS - 1, | ||
291 | .flags = IORESOURCE_IRQ, | ||
292 | }; | ||
293 | |||
294 | static struct platform_device bfin_gpios_device = { | ||
295 | .name = "simple-gpio", | ||
296 | .id = -1, | ||
297 | .num_resources = 1, | ||
298 | .resource = &bfin_gpios_resources, | ||
299 | }; | ||
300 | |||
301 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 268 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
302 | static struct resource isp1362_hcd_resources[] = { | 269 | static struct resource isp1362_hcd_resources[] = { |
303 | { | 270 | { |
@@ -532,8 +499,6 @@ static struct platform_device *cm_bf561_devices[] __initdata = { | |||
532 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 499 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
533 | ¶_flash_device, | 500 | ¶_flash_device, |
534 | #endif | 501 | #endif |
535 | |||
536 | &bfin_gpios_device, | ||
537 | }; | 502 | }; |
538 | 503 | ||
539 | static int __init cm_bf561_init(void) | 504 | static int __init cm_bf561_init(void) |
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index caed96bb957..9e2d8cfba54 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -1,30 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf561/ezkit.c | 2 | * Copyright 2004-2009 Analog Devices Inc. |
3 | * Based on: | 3 | * 2005 National ICT Australia (NICTA) |
4 | * Author: | 4 | * Aidan Williams <aidan@nicta.com.au> |
5 | * | 5 | * |
6 | * Created: | 6 | * Licensed under the GPL-2 or later. |
7 | * Description: | ||
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 | */ | 7 | */ |
29 | 8 | ||
30 | #include <linux/device.h> | 9 | #include <linux/device.h> |
@@ -387,19 +366,6 @@ static struct platform_device bfin_device_gpiokeys = { | |||
387 | }; | 366 | }; |
388 | #endif | 367 | #endif |
389 | 368 | ||
390 | static struct resource bfin_gpios_resources = { | ||
391 | .start = 0, | ||
392 | .end = MAX_BLACKFIN_GPIOS - 1, | ||
393 | .flags = IORESOURCE_IRQ, | ||
394 | }; | ||
395 | |||
396 | static struct platform_device bfin_gpios_device = { | ||
397 | .name = "simple-gpio", | ||
398 | .id = -1, | ||
399 | .num_resources = 1, | ||
400 | .resource = &bfin_gpios_resources, | ||
401 | }; | ||
402 | |||
403 | #if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) | 369 | #if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) |
404 | #include <linux/i2c-gpio.h> | 370 | #include <linux/i2c-gpio.h> |
405 | 371 | ||
@@ -493,8 +459,6 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
493 | &isp1362_hcd_device, | 459 | &isp1362_hcd_device, |
494 | #endif | 460 | #endif |
495 | 461 | ||
496 | &bfin_gpios_device, | ||
497 | |||
498 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 462 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
499 | &ezkit_flash_device, | 463 | &ezkit_flash_device, |
500 | #endif | 464 | #endif |
diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c index 6f77dbe952f..8ba7252455e 100644 --- a/arch/blackfin/mach-bf561/boards/tepla.c +++ b/arch/blackfin/mach-bf561/boards/tepla.c | |||
@@ -1,15 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf561/tepla.c | 2 | * Copyright 2004-2007 Analog Devices Inc. |
3 | * 2005 National ICT Australia (NICTA) | ||
4 | * Aidan Williams <aidan@nicta.com.au> | ||
3 | * | 5 | * |
4 | * Copyright 2004-2007 Analog Devices Inc. | 6 | * Thanks to Jamey Hicks. |
5 | * Only SMSC91C1111 was registered, may do more later. | ||
6 | * | 7 | * |
7 | * Copyright 2005 National ICT Australia (NICTA), Aidan Williams <aidan@nicta.com.au> | 8 | * Only SMSC91C1111 was registered, may do more later. |
8 | * Thanks to Jamey Hicks. | ||
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * Licensed under the GPL-2 |
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | 11 | */ |
14 | 12 | ||
15 | #include <linux/device.h> | 13 | #include <linux/device.h> |
diff --git a/arch/blackfin/mach-bf561/dma.c b/arch/blackfin/mach-bf561/dma.c index 42b0037afe6..c938c3c7355 100644 --- a/arch/blackfin/mach-bf561/dma.c +++ b/arch/blackfin/mach-bf561/dma.c | |||
@@ -1,31 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf561/dma.c | 2 | * the simple DMA Implementation for Blackfin |
3 | * Based on: | ||
4 | * Author: | ||
5 | * | 3 | * |
6 | * Created: | 4 | * Copyright 2007-2008 Analog Devices Inc. |
7 | * Description: This file contains the simple DMA Implementation for Blackfin | ||
8 | * | 5 | * |
9 | * Modified: | 6 | * Licensed under the GPL-2 or later. |
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 | */ | 7 | */ |
8 | |||
29 | #include <linux/module.h> | 9 | #include <linux/module.h> |
30 | 10 | ||
31 | #include <asm/blackfin.h> | 11 | #include <asm/blackfin.h> |
diff --git a/arch/blackfin/mach-bf561/include/mach/bf561.h b/arch/blackfin/mach-bf561/include/mach/bf561.h index 9968362a2ee..9f9a367e6a2 100644 --- a/arch/blackfin/mach-bf561/include/mach/bf561.h +++ b/arch/blackfin/mach-bf561/include/mach/bf561.h | |||
@@ -1,30 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * File: include/asm-blackfin/mach-bf561/bf561.h | 2 | * SYSTEM MMR REGISTER AND MEMORY MAP FOR ADSP-BF561 |
3 | * Based on: | ||
4 | * Author: | ||
5 | * | 3 | * |
6 | * Created: | 4 | * Copyright 2005-2008 Analog Devices Inc. |
7 | * Description: SYSTEM MMR REGISTER AND MEMORY MAP FOR ADSP-BF561 | ||
8 | * | 5 | * |
9 | * Modified: | 6 | * Licensed under the GPL-2 or later. |
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 | */ | 7 | */ |
29 | 8 | ||
30 | #ifndef __MACH_BF561_H__ | 9 | #ifndef __MACH_BF561_H__ |
diff --git a/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h index fd5e8878b8c..e33e158bc16 100644 --- a/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h | |||
@@ -1,32 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * file: include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 2 | * Copyright 2006-2009 Analog Devices Inc. |
3 | * based on: | ||
4 | * author: | ||
5 | * | 3 | * |
6 | * created: | 4 | * Licensed under the GPL-2 or later. |
7 | * description: | ||
8 | * blackfin serial driver head file | ||
9 | * rev: | ||
10 | * | ||
11 | * modified: | ||
12 | * | ||
13 | * | ||
14 | * bugs: enter bugs at http://blackfin.uclinux.org/ | ||
15 | * | ||
16 | * this program is free software; you can redistribute it and/or modify | ||
17 | * it under the terms of the gnu general public license as published by | ||
18 | * the free software foundation; either version 2, or (at your option) | ||
19 | * any later version. | ||
20 | * | ||
21 | * this program is distributed in the hope that it will be useful, | ||
22 | * but without any warranty; without even the implied warranty of | ||
23 | * merchantability or fitness for a particular purpose. see the | ||
24 | * gnu general public license for more details. | ||
25 | * | ||
26 | * you should have received a copy of the gnu general public license | ||
27 | * along with this program; see the file copying. | ||
28 | * if not, write to the free software foundation, | ||
29 | * 59 temple place - suite 330, boston, ma 02111-1307, usa. | ||
30 | */ | 5 | */ |
31 | 6 | ||
32 | #include <linux/serial.h> | 7 | #include <linux/serial.h> |
diff --git a/arch/blackfin/mach-bf561/include/mach/blackfin.h b/arch/blackfin/mach-bf561/include/mach/blackfin.h index 8be31358ef8..67d6bdcd3fa 100644 --- a/arch/blackfin/mach-bf561/include/mach/blackfin.h +++ b/arch/blackfin/mach-bf561/include/mach/blackfin.h | |||
@@ -1,31 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * File: include/asm-blackfin/mach-bf561/blackfin.h | 2 | * Copyright 2005-2009 Analog Devices Inc. |
3 | * Based on: | ||
4 | * Author: | ||
5 | * | 3 | * |
6 | * Created: | 4 | * Licensed under the GPL-2 or later. |
7 | * Description: | ||
8 | * | ||
9 | * Rev: | ||
10 | * | ||
11 | * Modified: | ||
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, or (at your option) | ||
18 | * 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; see the file COPYING. | ||
27 | * If not, write to the Free Software Foundation, | ||
28 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
29 | */ | 5 | */ |
30 | 6 | ||
31 | #ifndef _MACH_BLACKFIN_H_ | 7 | #ifndef _MACH_BLACKFIN_H_ |
diff --git a/arch/blackfin/mach-bf561/include/mach/cdefBF561.h b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h index 9d9858c2be6..81ecdb71c6a 100644 --- a/arch/blackfin/mach-bf561/include/mach/cdefBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h | |||
@@ -1,31 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * File: include/asm-blackfin/mach-bf561/cdefBF561.h | 2 | * Copyright 2005-2009 Analog Devices Inc. |
3 | * Based on: | ||
4 | * Author: | ||
5 | * | 3 | * |
6 | * Created: | 4 | * Licensed under the GPL-2 or later. |
7 | * Description: C POINTERS TO SYSTEM MMR REGISTER AND MEMORY MAP FOR ADSP-BF561 | ||
8 | * | ||
9 | * Rev: | ||
10 | * | ||
11 | * Modified: | ||
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, or (at your option) | ||
18 | * 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; see the file COPYING. | ||
27 | * If not, write to the Free Software Foundation, | ||
28 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
29 | */ | 5 | */ |
30 | 6 | ||
31 | #ifndef _CDEF_BF561_H | 7 | #ifndef _CDEF_BF561_H |
diff --git a/arch/blackfin/mach-bf561/include/mach/defBF561.h b/arch/blackfin/mach-bf561/include/mach/defBF561.h index 5fc0f05026e..a31e509553f 100644 --- a/arch/blackfin/mach-bf561/include/mach/defBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/defBF561.h | |||
@@ -1,32 +1,7 @@ | |||
1 | |||
2 | /* | 1 | /* |
3 | * File: include/asm-blackfin/mach-bf561/defBF561.h | 2 | * Copyright 2005-2009 Analog Devices Inc. |
4 | * Based on: | ||
5 | * Author: | ||
6 | * | ||
7 | * Created: | ||
8 | * Description: | ||
9 | * SYSTEM MMR REGISTER AND MEMORY MAP FOR ADSP-BF561 | ||
10 | * Rev: | ||
11 | * | ||
12 | * Modified: | ||
13 | * | ||
14 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
15 | * | ||
16 | * This program is free software; you can redistribute it and/or modify | ||
17 | * it under the terms of the GNU General Public License as published by | ||
18 | * the Free Software Foundation; either version 2, or (at your option) | ||
19 | * any later version. | ||
20 | * | ||
21 | * This program is distributed in the hope that it will be useful, | ||
22 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
24 | * GNU General Public License for more details. | ||
25 | * | 3 | * |
26 | * You should have received a copy of the GNU General Public License | 4 | * Licensed under the ADI BSD license or the GPL-2 (or later) |
27 | * along with this program; see the file COPYING. | ||
28 | * If not, write to the Free Software Foundation, | ||
29 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
30 | */ | 5 | */ |
31 | 6 | ||
32 | #ifndef _DEF_BF561_H | 7 | #ifndef _DEF_BF561_H |
diff --git a/arch/blackfin/mach-bf561/include/mach/gpio.h b/arch/blackfin/mach-bf561/include/mach/gpio.h index 7882f79e1ad..a651a8cf805 100644 --- a/arch/blackfin/mach-bf561/include/mach/gpio.h +++ b/arch/blackfin/mach-bf561/include/mach/gpio.h | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf561/include/mach/gpio.h | ||
3 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
4 | * | ||
5 | * Copyright (C) 2008 Analog Devices Inc. | 2 | * Copyright (C) 2008 Analog Devices Inc. |
6 | * Licensed under the GPL-2 or later. | 3 | * Licensed under the GPL-2 or later. |
7 | */ | 4 | */ |
diff --git a/arch/blackfin/mach-bf561/include/mach/irq.h b/arch/blackfin/mach-bf561/include/mach/irq.h index 6698389c556..7b208db267b 100644 --- a/arch/blackfin/mach-bf561/include/mach/irq.h +++ b/arch/blackfin/mach-bf561/include/mach/irq.h | |||
@@ -1,32 +1,7 @@ | |||
1 | |||
2 | /* | 1 | /* |
3 | * File: include/asm-blackfin/mach-bf561/irq.h | 2 | * Copyright 2005-2008 Analog Devices Inc. |
4 | * Based on: | ||
5 | * Author: | ||
6 | * | ||
7 | * Created: | ||
8 | * Description: | ||
9 | * | ||
10 | * Rev: | ||
11 | * | ||
12 | * Modified: | ||
13 | * | ||
14 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
15 | * | ||
16 | * This program is free software; you can redistribute it and/or modify | ||
17 | * it under the terms of the GNU General Public License as published by | ||
18 | * the Free Software Foundation; either version 2, or (at your option) | ||
19 | * any later version. | ||
20 | * | ||
21 | * This program is distributed in the hope that it will be useful, | ||
22 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
24 | * GNU General Public License for more details. | ||
25 | * | 3 | * |
26 | * You should have received a copy of the GNU General Public License | 4 | * Licensed under the GPL-2 or later. |
27 | * along with this program; see the file COPYING. | ||
28 | * If not, write to the Free Software Foundation, | ||
29 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
30 | */ | 5 | */ |
31 | 6 | ||
32 | #ifndef _BF561_IRQ_H_ | 7 | #ifndef _BF561_IRQ_H_ |
diff --git a/arch/blackfin/mach-bf561/include/mach/portmux.h b/arch/blackfin/mach-bf561/include/mach/portmux.h index 2e5ad6347de..3a7b46bbe84 100644 --- a/arch/blackfin/mach-bf561/include/mach/portmux.h +++ b/arch/blackfin/mach-bf561/include/mach/portmux.h | |||
@@ -1,3 +1,9 @@ | |||
1 | /* | ||
2 | * Copyright 2007-2009 Analog Devices Inc. | ||
3 | * | ||
4 | * Licensed under the GPL-2 or later. | ||
5 | */ | ||
6 | |||
1 | #ifndef _MACH_PORTMUX_H_ | 7 | #ifndef _MACH_PORTMUX_H_ |
2 | #define _MACH_PORTMUX_H_ | 8 | #define _MACH_PORTMUX_H_ |
3 | 9 | ||
diff --git a/arch/blackfin/mach-bf561/include/mach/smp.h b/arch/blackfin/mach-bf561/include/mach/smp.h index f9e65ebe81b..390c7f4ae7b 100644 --- a/arch/blackfin/mach-bf561/include/mach/smp.h +++ b/arch/blackfin/mach-bf561/include/mach/smp.h | |||
@@ -1,3 +1,9 @@ | |||
1 | /* | ||
2 | * Copyright 2007-2008 Analog Devices Inc. | ||
3 | * | ||
4 | * Licensed under the GPL-2 or later. | ||
5 | */ | ||
6 | |||
1 | #ifndef _MACH_BF561_SMP | 7 | #ifndef _MACH_BF561_SMP |
2 | #define _MACH_BF561_SMP | 8 | #define _MACH_BF561_SMP |
3 | 9 | ||
diff --git a/arch/blackfin/mach-bf561/ints-priority.c b/arch/blackfin/mach-bf561/ints-priority.c index 9d2f2334472..b4424172ad9 100644 --- a/arch/blackfin/mach-bf561/ints-priority.c +++ b/arch/blackfin/mach-bf561/ints-priority.c | |||
@@ -1,30 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf561/ints-priority.c | 2 | * Set up the interrupt priorities |
3 | * Based on: arch/blackfin/mach-bf537/ints-priority.c | ||
4 | * Author: Michael Hennerich | ||
5 | * | 3 | * |
6 | * Created: | 4 | * Copyright 2005-2009 Analog Devices Inc. |
7 | * Description: Set up the interrupt priorities | ||
8 | * | 5 | * |
9 | * Modified: | 6 | * Licensed under the GPL-2 or later. |
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 | */ | 7 | */ |
29 | 8 | ||
30 | #include <linux/module.h> | 9 | #include <linux/module.h> |
diff --git a/arch/blackfin/mach-bf561/secondary.S b/arch/blackfin/mach-bf561/secondary.S index f72a6af20c4..8e6050369c0 100644 --- a/arch/blackfin/mach-bf561/secondary.S +++ b/arch/blackfin/mach-bf561/secondary.S | |||
@@ -1,26 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf561/secondary.S | 2 | * BF561 coreB bootstrap file |
3 | * Based on: arch/blackfin/mach-bf561/head.S | ||
4 | * Author: Philippe Gerum <rpm@xenomai.org> | ||
5 | * | 3 | * |
6 | * Copyright 2007 Analog Devices Inc. | 4 | * Copyright 2007-2009 Analog Devices Inc. |
5 | * Philippe Gerum <rpm@xenomai.org> | ||
7 | * | 6 | * |
8 | * Description: BF561 coreB bootstrap file | 7 | * Licensed under the GPL-2 or later. |
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation; either version 2 of the License, or | ||
13 | * (at your option) any later version. | ||
14 | * | ||
15 | * This program is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License | ||
21 | * along with this program; if not, see the file COPYING, or write | ||
22 | * to the Free Software Foundation, Inc., | ||
23 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
24 | */ | 8 | */ |
25 | 9 | ||
26 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c index 8c10701c251..510f5764149 100644 --- a/arch/blackfin/mach-bf561/smp.c +++ b/arch/blackfin/mach-bf561/smp.c | |||
@@ -1,23 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/blackfin/mach-bf561/smp.c | 2 | * Copyright 2007-2009 Analog Devices Inc. |
3 | * Author: Philippe Gerum <rpm@xenomai.org> | 3 | * Philippe Gerum <rpm@xenomai.org> |
4 | * | 4 | * |
5 | * Copyright 2007 Analog Devices Inc. | 5 | * Licensed under the GPL-2 or later. |
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, see the file COPYING, or write | ||
19 | * to the Free Software Foundation, Inc., | ||
20 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
21 | */ | 6 | */ |
22 | 7 | ||
23 | #include <linux/init.h> | 8 | #include <linux/init.h> |