From 10f03f1a249df01ec760e3494298510efad3271f Mon Sep 17 00:00:00 2001 From: john stultz Date: Tue, 15 Sep 2009 21:17:19 -0700 Subject: Blackfin: convert to use arch_gettimeoffset() Convert Blackfin to use GENERIC_TIME via the arch_getoffset() infrastructure, reducing the amount of arch specific code we need to maintain. I've taken my best swing at converting this, but I'm not 100% confident I got it right. My cross-compiler is now out of date (gcc4.2) so I wasn't able to check if it compiled. Any assistance from arch maintainers or testers to get this merged would be great. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Mike Frysinger --- arch/blackfin/Kconfig | 10 ++++--- arch/blackfin/kernel/time.c | 63 ++------------------------------------------- 2 files changed, 8 insertions(+), 65 deletions(-) (limited to 'arch/blackfin') diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 9a01d445eca..e51988237d3 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -229,7 +229,7 @@ endchoice config SMP depends on BF561 - select GENERIC_TIME + select GENERIC_CLOCKEVENTS bool "Symmetric multi-processing support" ---help--- This enables support for systems with more than one CPU, @@ -613,12 +613,10 @@ comment "Kernel Timer/Scheduler" source kernel/Kconfig.hz config GENERIC_TIME - bool "Generic time" - default y + def_bool y config GENERIC_CLOCKEVENTS bool "Generic clock events" - depends on GENERIC_TIME default y choice @@ -653,6 +651,10 @@ config GPTMR0_CLOCKSOURCE depends on GENERIC_CLOCKEVENTS depends on !TICKSOURCE_GPTMR0 +config ARCH_USES_GETTIMEOFFSET + depends on !GENERIC_CLOCKEVENTS + def_bool y + source kernel/time/Kconfig comment "Misc" diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c index adb54aa7d7c..e5069fe6861 100644 --- a/arch/blackfin/kernel/time.c +++ b/arch/blackfin/kernel/time.c @@ -81,11 +81,11 @@ time_sched_init(irqreturn_t(*timer_routine) (int, void *)) #endif } +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET /* * Should return useconds since last timer tick */ -#ifndef CONFIG_GENERIC_TIME -static unsigned long gettimeoffset(void) +u32 arch_gettimeoffset(void) { unsigned long offset; unsigned long clocks_per_jiffy; @@ -184,65 +184,6 @@ void __init time_init(void) time_sched_init(timer_interrupt); } -#ifndef CONFIG_GENERIC_TIME -void do_gettimeofday(struct timeval *tv) -{ - unsigned long flags; - unsigned long seq; - unsigned long usec, sec; - - do { - seq = read_seqbegin_irqsave(&xtime_lock, flags); - usec = gettimeoffset(); - sec = xtime.tv_sec; - usec += (xtime.tv_nsec / NSEC_PER_USEC); - } - while (read_seqretry_irqrestore(&xtime_lock, seq, flags)); - - while (usec >= USEC_PER_SEC) { - usec -= USEC_PER_SEC; - sec++; - } - - tv->tv_sec = sec; - tv->tv_usec = usec; -} -EXPORT_SYMBOL(do_gettimeofday); - -int do_settimeofday(struct timespec *tv) -{ - time_t wtm_sec, sec = tv->tv_sec; - long wtm_nsec, nsec = tv->tv_nsec; - - if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC) - return -EINVAL; - - write_seqlock_irq(&xtime_lock); - /* - * This is revolting. We need to set the xtime.tv_usec - * correctly. However, the value in this location is - * is value at the last tick. - * Discover what correction gettimeofday - * would have done, and then undo it! - */ - nsec -= (gettimeoffset() * NSEC_PER_USEC); - - wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec); - wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec); - - set_normalized_timespec(&xtime, sec, nsec); - set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); - - ntp_clear(); - - write_sequnlock_irq(&xtime_lock); - clock_was_set(); - - return 0; -} -EXPORT_SYMBOL(do_settimeofday); -#endif /* !CONFIG_GENERIC_TIME */ - /* * Scheduler clock - returns current time in nanosec units. */ -- cgit v1.2.3-18-g5258 From 96f1050d3df105c9ae6c6ac224f370199ea82fcd Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Thu, 24 Sep 2009 14:11:24 +0000 Subject: Blackfin: mass clean up of copyright/licensing info Bill Gatliff & David Brownell pointed out we were missing some copyrights, and licensing terms in some of the files in ./arch/blackfin, so this fixes things, and cleans them up. It also removes: - verbose GPL text(refer to the top level ./COPYING file) - file names (you are looking at the file) - bug url (it's in the ./MAINTAINERS file) - "or later" on GPL-2, when we did not have that right It also allows some Blackfin-specific assembly files to be under a BSD like license (for people to use them outside of Linux). Signed-off-by: Robin Getz Signed-off-by: Mike Frysinger --- arch/blackfin/ADI_BSD.txt | 41 ++++++++++++++++++++ arch/blackfin/include/asm/atomic.h | 6 +++ arch/blackfin/include/asm/bfin-global.h | 26 ++----------- arch/blackfin/include/asm/bfin5xx_spi.h | 2 - arch/blackfin/include/asm/bfin_rotary.h | 4 ++ arch/blackfin/include/asm/bfin_simple_timer.h | 6 +++ arch/blackfin/include/asm/bitops.h | 6 +++ arch/blackfin/include/asm/blackfin.h | 5 ++- arch/blackfin/include/asm/bug.h | 6 +++ arch/blackfin/include/asm/byteorder.h | 5 --- arch/blackfin/include/asm/cache.h | 5 ++- arch/blackfin/include/asm/cacheflush.h | 27 ++----------- arch/blackfin/include/asm/cdef_LPBlackfin.h | 32 +++------------- arch/blackfin/include/asm/checksum.h | 9 ++++- arch/blackfin/include/asm/clocks.h | 27 ++----------- arch/blackfin/include/asm/context.S | 27 +------------ arch/blackfin/include/asm/cplb.h | 27 +------------ arch/blackfin/include/asm/cplbinit.h | 27 ++----------- arch/blackfin/include/asm/cpu.h | 21 ++--------- arch/blackfin/include/asm/def_LPBlackfin.h | 36 ++++-------------- arch/blackfin/include/asm/dma-mapping.h | 6 +++ arch/blackfin/include/asm/dpmc.h | 6 ++- arch/blackfin/include/asm/early_printk.h | 22 ++--------- arch/blackfin/include/asm/elf.h | 6 ++- arch/blackfin/include/asm/entry.h | 6 +++ arch/blackfin/include/asm/fcntl.h | 6 +++ arch/blackfin/include/asm/fixed_code.h | 10 ++++- arch/blackfin/include/asm/flat.h | 5 ++- arch/blackfin/include/asm/gpio.h | 27 +------------ arch/blackfin/include/asm/hardirq.h | 6 +++ arch/blackfin/include/asm/io.h | 6 +++ arch/blackfin/include/asm/irq.h | 17 +++------ arch/blackfin/include/asm/irq_handler.h | 6 +++ arch/blackfin/include/asm/l1layout.h | 5 ++- arch/blackfin/include/asm/linkage.h | 6 +++ arch/blackfin/include/asm/mmu.h | 9 ++++- arch/blackfin/include/asm/mmu_context.h | 27 +------------ arch/blackfin/include/asm/module.h | 6 +++ arch/blackfin/include/asm/mutex.h | 4 ++ arch/blackfin/include/asm/nand.h | 12 ++---- arch/blackfin/include/asm/page.h | 6 +++ arch/blackfin/include/asm/page_offset.h | 9 ++++- arch/blackfin/include/asm/pda.h | 21 ++--------- arch/blackfin/include/asm/pgtable.h | 6 +++ arch/blackfin/include/asm/poll.h | 7 ++++ arch/blackfin/include/asm/portmux.h | 5 ++- arch/blackfin/include/asm/posix_types.h | 6 +++ arch/blackfin/include/asm/processor.h | 6 +++ arch/blackfin/include/asm/ptrace.h | 6 +++ arch/blackfin/include/asm/sections.h | 6 +++ arch/blackfin/include/asm/segment.h | 6 +++ arch/blackfin/include/asm/sigcontext.h | 6 +++ arch/blackfin/include/asm/siginfo.h | 6 +++ arch/blackfin/include/asm/smp.h | 21 ++--------- arch/blackfin/include/asm/spinlock.h | 6 +++ arch/blackfin/include/asm/spinlock_types.h | 6 +++ arch/blackfin/include/asm/stat.h | 6 +++ arch/blackfin/include/asm/string.h | 6 +++ arch/blackfin/include/asm/swab.h | 6 +++ arch/blackfin/include/asm/system.h | 32 ++-------------- arch/blackfin/include/asm/thread_info.h | 24 +----------- arch/blackfin/include/asm/tlb.h | 6 +++ arch/blackfin/include/asm/trace.h | 5 ++- arch/blackfin/include/asm/traps.h | 13 +++---- arch/blackfin/include/asm/uaccess.h | 5 ++- arch/blackfin/include/asm/unistd.h | 6 +++ arch/blackfin/kernel/asm-offsets.c | 27 ++----------- arch/blackfin/kernel/bfin_dma_5xx.c | 1 + arch/blackfin/kernel/bfin_gpio.c | 27 ++----------- arch/blackfin/kernel/cplb-mpu/cplbinit.c | 20 ++-------- arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 19 ++-------- arch/blackfin/kernel/cplb-nompu/cplbinit.c | 19 +--------- arch/blackfin/kernel/cplb-nompu/cplbmgr.c | 16 +------- arch/blackfin/kernel/cplbinfo.c | 1 + arch/blackfin/kernel/dma-mapping.c | 27 ++----------- arch/blackfin/kernel/early_printk.c | 23 ++--------- arch/blackfin/kernel/entry.S | 27 +------------ arch/blackfin/kernel/fixed_code.S | 5 +++ arch/blackfin/kernel/flat.c | 18 +-------- arch/blackfin/kernel/init_task.c | 27 +------------ arch/blackfin/kernel/irqchip.c | 27 +------------ arch/blackfin/kernel/module.c | 27 +------------ arch/blackfin/kernel/process.c | 27 ++----------- arch/blackfin/kernel/ptrace.c | 28 ++------------ arch/blackfin/kernel/setup.c | 6 +-- arch/blackfin/kernel/shadow_console.c | 2 - arch/blackfin/kernel/signal.c | 27 +------------ arch/blackfin/kernel/sys_bfin.c | 30 ++------------- arch/blackfin/kernel/time-ts.c | 10 ++--- arch/blackfin/kernel/traps.c | 27 +------------ arch/blackfin/kernel/vmlinux.lds.S | 27 +------------ arch/blackfin/lib/ashldi3.c | 27 +------------ arch/blackfin/lib/ashrdi3.c | 27 +------------ arch/blackfin/lib/checksum.c | 30 +++------------ arch/blackfin/lib/divsi3.S | 28 ++------------ arch/blackfin/lib/gcclib.h | 27 +------------ arch/blackfin/lib/lshrdi3.c | 27 +------------ arch/blackfin/lib/memchr.S | 27 +------------ arch/blackfin/lib/memcmp.S | 27 +------------ arch/blackfin/lib/memcpy.S | 37 ++++-------------- arch/blackfin/lib/memmove.S | 27 +------------ arch/blackfin/lib/memset.S | 27 +------------ arch/blackfin/lib/modsi3.S | 36 +++--------------- arch/blackfin/lib/muldi3.S | 6 +++ arch/blackfin/lib/outs.S | 29 +++----------- arch/blackfin/lib/smulsi3_highpart.S | 6 +++ arch/blackfin/lib/udivsi3.S | 27 +------------ arch/blackfin/lib/umodsi3.S | 27 ++----------- arch/blackfin/lib/umulsi3_highpart.S | 6 +++ arch/blackfin/mach-bf518/boards/ezbrd.c | 30 ++------------- arch/blackfin/mach-bf518/dma.c | 28 ++------------ arch/blackfin/mach-bf518/include/mach/bf518.h | 27 +------------ .../mach-bf518/include/mach/bfin_serial_5xx.h | 29 +------------- arch/blackfin/mach-bf518/include/mach/blackfin.h | 29 +------------- arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 29 +------------- arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 29 +------------- arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 29 +------------- arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 29 +------------- .../mach-bf518/include/mach/cdefBF51x_base.h | 28 +------------- arch/blackfin/mach-bf518/include/mach/defBF512.h | 28 +------------- arch/blackfin/mach-bf518/include/mach/defBF514.h | 28 +------------- arch/blackfin/mach-bf518/include/mach/defBF516.h | 28 +------------- arch/blackfin/mach-bf518/include/mach/defBF518.h | 28 +------------- .../mach-bf518/include/mach/defBF51x_base.h | 28 +------------- arch/blackfin/mach-bf518/include/mach/gpio.h | 3 -- arch/blackfin/mach-bf518/include/mach/irq.h | 29 +------------- arch/blackfin/mach-bf518/include/mach/portmux.h | 6 +++ arch/blackfin/mach-bf518/ints-priority.c | 27 ++----------- arch/blackfin/mach-bf527/boards/cm_bf527.c | 31 +++------------ arch/blackfin/mach-bf527/boards/ezbrd.c | 30 ++------------- arch/blackfin/mach-bf527/boards/ezkit.c | 30 ++------------- arch/blackfin/mach-bf527/dma.c | 28 ++------------ arch/blackfin/mach-bf527/include/mach/bf527.h | 27 +------------ .../mach-bf527/include/mach/bfin_serial_5xx.h | 29 +------------- arch/blackfin/mach-bf527/include/mach/blackfin.h | 29 +------------- arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 29 +------------- arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 29 +------------- arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 29 +------------- .../mach-bf527/include/mach/cdefBF52x_base.h | 28 +------------- arch/blackfin/mach-bf527/include/mach/defBF522.h | 28 +------------- arch/blackfin/mach-bf527/include/mach/defBF525.h | 28 +------------- arch/blackfin/mach-bf527/include/mach/defBF527.h | 28 +------------- .../mach-bf527/include/mach/defBF52x_base.h | 28 +------------- arch/blackfin/mach-bf527/include/mach/gpio.h | 3 -- arch/blackfin/mach-bf527/include/mach/irq.h | 29 +------------- arch/blackfin/mach-bf527/include/mach/portmux.h | 6 +++ arch/blackfin/mach-bf527/ints-priority.c | 27 ++----------- arch/blackfin/mach-bf533/boards/H8606.c | 33 +++------------- arch/blackfin/mach-bf533/boards/blackstamp.c | 14 ++----- arch/blackfin/mach-bf533/boards/cm_bf533.c | 30 +++------------ arch/blackfin/mach-bf533/boards/ezkit.c | 30 ++------------- arch/blackfin/mach-bf533/boards/ip0x.c | 36 ++++-------------- arch/blackfin/mach-bf533/boards/stamp.c | 30 ++------------- arch/blackfin/mach-bf533/dma.c | 28 ++------------ arch/blackfin/mach-bf533/include/mach/bf533.h | 27 ++----------- .../mach-bf533/include/mach/bfin_serial_5xx.h | 29 +------------- arch/blackfin/mach-bf533/include/mach/blackfin.h | 28 +------------- arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 28 +------------- arch/blackfin/mach-bf533/include/mach/defBF532.h | 44 ++-------------------- arch/blackfin/mach-bf533/include/mach/gpio.h | 3 -- arch/blackfin/mach-bf533/include/mach/irq.h | 28 +------------- arch/blackfin/mach-bf533/include/mach/portmux.h | 6 +++ arch/blackfin/mach-bf533/ints-priority.c | 27 ++----------- arch/blackfin/mach-bf537/boards/cm_bf537e.c | 31 +++------------ arch/blackfin/mach-bf537/boards/cm_bf537u.c | 31 +++------------ arch/blackfin/mach-bf537/boards/minotaur.c | 6 +++ arch/blackfin/mach-bf537/boards/pnav10.c | 30 ++------------- arch/blackfin/mach-bf537/boards/stamp.c | 30 ++------------- arch/blackfin/mach-bf537/boards/tcm_bf537.c | 31 +++------------ arch/blackfin/mach-bf537/dma.c | 28 ++------------ arch/blackfin/mach-bf537/include/mach/bf537.h | 27 ++----------- .../mach-bf537/include/mach/bfin_serial_5xx.h | 29 +------------- arch/blackfin/mach-bf537/include/mach/blackfin.h | 29 +------------- arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 29 +------------- arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 29 +------------- arch/blackfin/mach-bf537/include/mach/defBF534.h | 28 +------------- arch/blackfin/mach-bf537/include/mach/defBF537.h | 29 +------------- arch/blackfin/mach-bf537/include/mach/gpio.h | 3 -- arch/blackfin/mach-bf537/include/mach/irq.h | 29 +------------- arch/blackfin/mach-bf537/include/mach/portmux.h | 6 +++ arch/blackfin/mach-bf537/ints-priority.c | 27 ++----------- arch/blackfin/mach-bf538/boards/ezkit.c | 30 ++------------- arch/blackfin/mach-bf538/dma.c | 28 ++------------ arch/blackfin/mach-bf538/include/mach/bf538.h | 27 ++----------- .../mach-bf538/include/mach/bfin_serial_5xx.h | 29 +------------- arch/blackfin/mach-bf538/include/mach/blackfin.h | 29 +------------- arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 28 +------------- arch/blackfin/mach-bf538/include/mach/defBF539.h | 44 ++-------------------- arch/blackfin/mach-bf538/include/mach/gpio.h | 3 -- arch/blackfin/mach-bf538/include/mach/irq.h | 29 +------------- arch/blackfin/mach-bf538/include/mach/portmux.h | 6 +++ arch/blackfin/mach-bf538/ints-priority.c | 27 ++----------- arch/blackfin/mach-bf548/boards/cm_bf548.c | 31 +++------------ arch/blackfin/mach-bf548/boards/ezkit.c | 30 ++------------- arch/blackfin/mach-bf548/dma.c | 27 ++----------- arch/blackfin/mach-bf548/include/mach/bf548.h | 27 +------------ .../blackfin/mach-bf548/include/mach/bf54x-lq043.h | 6 +++ arch/blackfin/mach-bf548/include/mach/bf54x_keys.h | 6 +++ .../mach-bf548/include/mach/bfin_serial_5xx.h | 29 +------------- arch/blackfin/mach-bf548/include/mach/blackfin.h | 29 +------------- arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 28 +------------- .../mach-bf548/include/mach/cdefBF54x_base.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/defBF542.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/defBF544.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/defBF547.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/defBF548.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/defBF549.h | 28 +------------- .../mach-bf548/include/mach/defBF54x_base.h | 28 +------------- arch/blackfin/mach-bf548/include/mach/gpio.h | 30 +-------------- arch/blackfin/mach-bf548/include/mach/irq.h | 29 +------------- arch/blackfin/mach-bf548/include/mach/portmux.h | 6 +++ arch/blackfin/mach-bf548/ints-priority.c | 27 ++----------- arch/blackfin/mach-bf561/atomic.S | 21 ++--------- arch/blackfin/mach-bf561/boards/cm_bf561.c | 30 +++------------ arch/blackfin/mach-bf561/boards/ezkit.c | 29 ++------------ arch/blackfin/mach-bf561/boards/tepla.c | 14 +++---- arch/blackfin/mach-bf561/dma.c | 28 ++------------ arch/blackfin/mach-bf561/include/mach/bf561.h | 27 ++----------- .../mach-bf561/include/mach/bfin_serial_5xx.h | 29 +------------- arch/blackfin/mach-bf561/include/mach/blackfin.h | 28 +------------- arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 28 +------------- arch/blackfin/mach-bf561/include/mach/defBF561.h | 29 +------------- arch/blackfin/mach-bf561/include/mach/gpio.h | 3 -- arch/blackfin/mach-bf561/include/mach/irq.h | 29 +------------- arch/blackfin/mach-bf561/include/mach/portmux.h | 6 +++ arch/blackfin/mach-bf561/include/mach/smp.h | 6 +++ arch/blackfin/mach-bf561/ints-priority.c | 27 ++----------- arch/blackfin/mach-bf561/secondary.S | 24 ++---------- arch/blackfin/mach-bf561/smp.c | 21 ++--------- arch/blackfin/mach-common/arch_checks.c | 27 ++----------- arch/blackfin/mach-common/cache-c.c | 2 - arch/blackfin/mach-common/cache.S | 2 - arch/blackfin/mach-common/cpufreq.c | 27 ++----------- arch/blackfin/mach-common/entry.S | 31 +++------------ arch/blackfin/mach-common/head.S | 2 - arch/blackfin/mach-common/interrupt.S | 30 +++------------ arch/blackfin/mach-common/ints-priority.c | 35 ++++------------- arch/blackfin/mach-common/irqpanic.c | 27 ++----------- arch/blackfin/mach-common/pm.c | 34 +++-------------- arch/blackfin/mach-common/smp.c | 22 ++--------- arch/blackfin/mm/blackfin_sram.h | 27 ++----------- arch/blackfin/mm/init.c | 27 +------------ arch/blackfin/mm/isram-driver.c | 14 +------ arch/blackfin/mm/sram-alloc.c | 27 ++----------- 248 files changed, 893 insertions(+), 4298 deletions(-) create mode 100644 arch/blackfin/ADI_BSD.txt (limited to 'arch/blackfin') diff --git a/arch/blackfin/ADI_BSD.txt b/arch/blackfin/ADI_BSD.txt new file mode 100644 index 00000000000..501d0b64594 --- /dev/null +++ b/arch/blackfin/ADI_BSD.txt @@ -0,0 +1,41 @@ +This BSD-Style License applies to a few files in ./arch/blackfin directory, +and is included here, so people understand which code they can use outside +the Linux kernel, in non-GPL based projects. + +Using the files released under the "ADI BSD" license, must comply with +these license terms. + +-------------------------------------------------------------------------- + +Copyright Analog Devices, Inc. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + - Neither the name of Analog Devices, Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + - The use of this software may or may not infringe the patent rights + of one or more patent holders. This license does not release you + from the requirement that you obtain separate licenses from these + patent holders to use this software. + +THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, INTELLECTUAL PROPERTY RIGHTS, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h index 88f36d599fe..d27c6274247 100644 --- a/arch/blackfin/include/asm/atomic.h +++ b/arch/blackfin/include/asm/atomic.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef __ARCH_BLACKFIN_ATOMIC__ #define __ARCH_BLACKFIN_ATOMIC__ diff --git a/arch/blackfin/include/asm/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h index aef0594e786..10064f902d2 100644 --- a/arch/blackfin/include/asm/bfin-global.h +++ b/arch/blackfin/include/asm/bfin-global.h @@ -1,29 +1,9 @@ /* - * File: include/asm-blackfin/bfin-global.h - * Based on: - * Author: * - * Created: - * Description: Global extern defines for blackfin + * Global extern defines for blackfin * - * Modified: - * Copyright 2004-2006 Analog Devices Inc. + * Copyright 2006-2009 Analog Devices Inc. * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ #ifndef _BFIN_GLOBAL_H_ diff --git a/arch/blackfin/include/asm/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h index c281c632827..ed4f8c6db0c 100644 --- a/arch/blackfin/include/asm/bfin5xx_spi.h +++ b/arch/blackfin/include/asm/bfin5xx_spi.h @@ -3,8 +3,6 @@ * * Copyright 2004-2008 Analog Devices Inc. * - * Enter bugs at http://blackfin.uclinux.org/ - * * Licensed under the GPL-2 or later. */ diff --git a/arch/blackfin/include/asm/bfin_rotary.h b/arch/blackfin/include/asm/bfin_rotary.h index 425ece64fd5..abdb2af5290 100644 --- a/arch/blackfin/include/asm/bfin_rotary.h +++ b/arch/blackfin/include/asm/bfin_rotary.h @@ -1,6 +1,10 @@ /* * board initialization should put one of these structures into platform_data * and place the bfin-rotary onto platform_bus named "bfin-rotary". + * + * Copyright 2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. */ #ifndef _BFIN_ROTARY_H diff --git a/arch/blackfin/include/asm/bfin_simple_timer.h b/arch/blackfin/include/asm/bfin_simple_timer.h index fccbb595464..5248c133bc6 100644 --- a/arch/blackfin/include/asm/bfin_simple_timer.h +++ b/arch/blackfin/include/asm/bfin_simple_timer.h @@ -1,3 +1,9 @@ +/* + * Copyright 2006-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _bfin_simple_timer_h_ #define _bfin_simple_timer_h_ diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h index daffa71576d..a2ff3fb3568 100644 --- a/arch/blackfin/include/asm/bitops.h +++ b/arch/blackfin/include/asm/bitops.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_BITOPS_H #define _BLACKFIN_BITOPS_H diff --git a/arch/blackfin/include/asm/blackfin.h b/arch/blackfin/include/asm/blackfin.h index 4d443958339..eb7c1441d8f 100644 --- a/arch/blackfin/include/asm/blackfin.h +++ b/arch/blackfin/include/asm/blackfin.h @@ -1,6 +1,9 @@ /* - * Common header file for blackfin family of processors. + * Common header file for Blackfin family of processors. * + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. */ #ifndef _BLACKFIN_H_ diff --git a/arch/blackfin/include/asm/bug.h b/arch/blackfin/include/asm/bug.h index 655e49540e4..6f4548a1355 100644 --- a/arch/blackfin/include/asm/bug.h +++ b/arch/blackfin/include/asm/bug.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_BUG_H #define _BLACKFIN_BUG_H diff --git a/arch/blackfin/include/asm/byteorder.h b/arch/blackfin/include/asm/byteorder.h index 3e69106a4d3..9558416d578 100644 --- a/arch/blackfin/include/asm/byteorder.h +++ b/arch/blackfin/include/asm/byteorder.h @@ -1,6 +1 @@ -#ifndef _BLACKFIN_BYTEORDER_H -#define _BLACKFIN_BYTEORDER_H - #include - -#endif /* _BLACKFIN_BYTEORDER_H */ diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h index 477050ad5c5..7d829eaf6ed 100644 --- a/arch/blackfin/include/asm/cache.h +++ b/arch/blackfin/include/asm/cache.h @@ -1,6 +1,9 @@ /* - * include/asm-blackfin/cache.h + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. */ + #ifndef __ARCH_BLACKFIN_CACHE_H #define __ARCH_BLACKFIN_CACHE_H diff --git a/arch/blackfin/include/asm/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h index 7e55549e180..af03a36c7a4 100644 --- a/arch/blackfin/include/asm/cacheflush.h +++ b/arch/blackfin/include/asm/cacheflush.h @@ -1,30 +1,9 @@ /* - * File: include/asm-blackfin/cacheflush.h - * Based on: include/asm-m68knommu/cacheflush.h - * Author: LG Soft India - * Copyright (C) 2004 Analog Devices Inc. - * Created: Tue Sep 21 2004 - * Description: Blackfin low-level cache routines adapted from the i386 - * and PPC versions by Greg Ungerer (gerg@snapgear.com) + * Blackfin low-level cache routines * - * Modified: + * Copyright 2004-2009 Analog Devices Inc. * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Licensed under the GPL-2 or later. */ #ifndef _BLACKFIN_CACHEFLUSH_H diff --git a/arch/blackfin/include/asm/cdef_LPBlackfin.h b/arch/blackfin/include/asm/cdef_LPBlackfin.h index 35f841bce57..8778e0f0373 100644 --- a/arch/blackfin/include/asm/cdef_LPBlackfin.h +++ b/arch/blackfin/include/asm/cdef_LPBlackfin.h @@ -1,30 +1,8 @@ - /* - * File: include/asm-blackfin/mach-common/cdef_LPBlackfin.h - * Based on: - * Author: unknown - * COPYRIGHT 2005 Analog Devices - * Created: ? - * Description: - * - * Modified: - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ +/* + * Copyright 2005-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ #ifndef _CDEF_LPBLACKFIN_H #define _CDEF_LPBLACKFIN_H diff --git a/arch/blackfin/include/asm/checksum.h b/arch/blackfin/include/asm/checksum.h index 793581fc955..a23415be0de 100644 --- a/arch/blackfin/include/asm/checksum.h +++ b/arch/blackfin/include/asm/checksum.h @@ -1,9 +1,14 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * akbar.hussain@lineo.com + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BFIN_CHECKSUM_H #define _BFIN_CHECKSUM_H /* - * MODIFIED FOR BFIN April 30, 2001 akbar.hussain@lineo.com - * * computes the checksum of a memory block at buff, length len, * and adds in "sum" (32-bit) * diff --git a/arch/blackfin/include/asm/clocks.h b/arch/blackfin/include/asm/clocks.h index 033bba92d61..f80dad5ff25 100644 --- a/arch/blackfin/include/asm/clocks.h +++ b/arch/blackfin/include/asm/clocks.h @@ -1,30 +1,9 @@ /* - * File: include/asm-blackfin/mach-common/clocks.h - * Based on: include/asm-blackfin/mach-bf537/bf537.h - * Author: Robin Getz + * Common Clock definitions for various kernel files * - * Created: 25Jul07 - * Description: Common Clock definitions for various kernel files + * Copyright 2007-2008 Analog Devices Inc. * - * Modified: - * Copyright 2004-2007 Analog Devices Inc. - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ #ifndef _BFIN_CLOCKS_H diff --git a/arch/blackfin/include/asm/context.S b/arch/blackfin/include/asm/context.S index f8a664f022b..5dffaf582a2 100644 --- a/arch/blackfin/include/asm/context.S +++ b/arch/blackfin/include/asm/context.S @@ -1,30 +1,7 @@ /* - * File: arch/blackfin/kernel/context.S - * Based on: - * Author: + * Copyright 2007-2009 Analog Devices Inc. * - * Created: - * Description: - * - * Modified: - * Copyright 2004-2007 Analog Devices Inc. - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ /* diff --git a/arch/blackfin/include/asm/cplb.h b/arch/blackfin/include/asm/cplb.h index d18d16837a6..fda96261ed6 100644 --- a/arch/blackfin/include/asm/cplb.h +++ b/arch/blackfin/include/asm/cplb.h @@ -1,30 +1,7 @@ /* - * File: include/asm-blackfin/cplb.h - * Based on: include/asm-blackfin/mach-bf537/bf537.h - * Author: Robin Getz + * Copyright 2004-2009 Analog Devices Inc. * - * Created: 2000 - * Description: Common CPLB definitions for CPLB init - * - * Modified: - * Copyright 2004-2007 Analog Devices Inc. - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ #ifndef _CPLB_H diff --git a/arch/blackfin/include/asm/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h index 05b14a631d0..f315c83a015 100644 --- a/arch/blackfin/include/asm/cplbinit.h +++ b/arch/blackfin/include/asm/cplbinit.h @@ -1,30 +1,9 @@ /* - * File: include/asm-blackfin/cplbinit.h - * Based on: - * Author: + * Common CPLB definitions for CPLB init * - * Created: - * Description: + * Copyright 2006-2008 Analog Devices Inc. * - * Modified: - * Copyright 2004-2006 Analog Devices Inc. - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ #ifndef __ASM_CPLBINIT_H__ diff --git a/arch/blackfin/include/asm/cpu.h b/arch/blackfin/include/asm/cpu.h index fadfa82f93b..b191dc662bd 100644 --- a/arch/blackfin/include/asm/cpu.h +++ b/arch/blackfin/include/asm/cpu.h @@ -1,23 +1,8 @@ /* - * File: arch/blackfin/include/asm/cpu.h. - * Author: Philippe Gerum + * Copyright 2007-2009 Analog Devices Inc. + * Philippe Gerum * - * Copyright 2007 Analog Devices Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ #ifndef __ASM_BLACKFIN_CPU_H diff --git a/arch/blackfin/include/asm/def_LPBlackfin.h b/arch/blackfin/include/asm/def_LPBlackfin.h index 6341eebff3d..25906468622 100644 --- a/arch/blackfin/include/asm/def_LPBlackfin.h +++ b/arch/blackfin/include/asm/def_LPBlackfin.h @@ -1,32 +1,10 @@ - /* - * File: include/asm-blackfin/mach-common/def_LPBlackfin.h - * Based on: - * Author: unknown - * COPYRIGHT 2005 Analog Devices - * Created: ? - * Description: - * - * Modified: - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/* LP Blackfin CORE REGISTER BIT & ADDRESS DEFINITIONS FOR ADSP-BF532/33 */ +/* + * Blackfin core register bit & address definitions + * + * Copyright 2005-2008 Analog Devices Inc. + * + * Licensed under the ADI BSD license or GPL-2 (or later). + */ #ifndef _DEF_LPBLACKFIN_H #define _DEF_LPBLACKFIN_H diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index ed6b1f3cccc..7a23d824ac9 100644 --- a/arch/blackfin/include/asm/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_DMA_MAPPING_H #define _BLACKFIN_DMA_MAPPING_H diff --git a/arch/blackfin/include/asm/dpmc.h b/arch/blackfin/include/asm/dpmc.h index 96e8208f929..925e66cb2d4 100644 --- a/arch/blackfin/include/asm/dpmc.h +++ b/arch/blackfin/include/asm/dpmc.h @@ -1,9 +1,11 @@ /* - * include/asm-blackfin/dpmc.h - Miscellaneous IOCTL commands for Dynamic Power - * Management Controller Driver. + * Miscellaneous IOCTL commands for Dynamic Power Management Controller Driver + * * Copyright (C) 2004-2008 Analog Device Inc. * + * Licensed under the GPL-2 */ + #ifndef _BLACKFIN_DPMC_H_ #define _BLACKFIN_DPMC_H_ diff --git a/arch/blackfin/include/asm/early_printk.h b/arch/blackfin/include/asm/early_printk.h index 53a762b6fcd..68a910db886 100644 --- a/arch/blackfin/include/asm/early_printk.h +++ b/arch/blackfin/include/asm/early_printk.h @@ -1,27 +1,11 @@ /* - * File: include/asm-blackfin/early_printk.h - * Author: Robin Getz * - * Changed by HuTao Apr18, 2003 - * - * Copyright was missing when I got the code so took from MIPS arch ...MaTed--- - * Copyright (C) 1994 by Waldorf GMBH, written by Ralf Baechle - * Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001 by Ralf Baechle - * - * Adapted for BlackFin (ADI) by Ted Ma - * Copyright (c) 2002 Arcturus Networks Inc. (www.arcturusnetworks.com) - * Copyright (c) 2002 Lineo, Inc. + * Licensed under the GPL-2 */ #ifndef _BFIN_IRQ_H_ diff --git a/arch/blackfin/include/asm/irq_handler.h b/arch/blackfin/include/asm/irq_handler.h index 7d9e2d3bbed..7fbe42307b9 100644 --- a/arch/blackfin/include/asm/irq_handler.h +++ b/arch/blackfin/include/asm/irq_handler.h @@ -1,3 +1,9 @@ +/* + * Copyright 2007-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _IRQ_HANDLER_H #define _IRQ_HANDLER_H diff --git a/arch/blackfin/include/asm/l1layout.h b/arch/blackfin/include/asm/l1layout.h index 79dbefaa5be..c87e68647a2 100644 --- a/arch/blackfin/include/asm/l1layout.h +++ b/arch/blackfin/include/asm/l1layout.h @@ -1,6 +1,9 @@ /* - * l1layout.h * Defines a layout of L1 scratchpad memory that userspace can rely on. + * + * Copyright 2006-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. */ #ifndef _L1LAYOUT_H_ diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h index 5a822bb790f..f7d6d47a048 100644 --- a/arch/blackfin/include/asm/linkage.h +++ b/arch/blackfin/include/asm/linkage.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef __ASM_LINKAGE_H #define __ASM_LINKAGE_H diff --git a/arch/blackfin/include/asm/mmu.h b/arch/blackfin/include/asm/mmu.h index dbfd686360e..26f6b70b11e 100644 --- a/arch/blackfin/include/asm/mmu.h +++ b/arch/blackfin/include/asm/mmu.h @@ -1,8 +1,13 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * 2002 David McCullough + * + * Licensed under the GPL-2. + */ + #ifndef __MMU_H #define __MMU_H -/* Copyright (C) 2002, David McCullough */ - struct sram_list_struct { struct sram_list_struct *next; void *addr; diff --git a/arch/blackfin/include/asm/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h index 040410bb07e..4a3be376ad5 100644 --- a/arch/blackfin/include/asm/mmu_context.h +++ b/arch/blackfin/include/asm/mmu_context.h @@ -1,30 +1,7 @@ /* - * File: include/asm-blackfin/mmu_context.h - * Based on: - * Author: + * Copyright 2004-2009 Analog Devices Inc. * - * Created: - * Description: - * - * Modified: - * Copyright 2004-2006 Analog Devices Inc. - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ #ifndef __BLACKFIN_MMU_CONTEXT_H__ diff --git a/arch/blackfin/include/asm/module.h b/arch/blackfin/include/asm/module.h index e3128df139d..9c1cfffddd9 100644 --- a/arch/blackfin/include/asm/module.h +++ b/arch/blackfin/include/asm/module.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _ASM_BFIN_MODULE_H #define _ASM_BFIN_MODULE_H diff --git a/arch/blackfin/include/asm/mutex.h b/arch/blackfin/include/asm/mutex.h index 5cc641c5083..f726e3a80ad 100644 --- a/arch/blackfin/include/asm/mutex.h +++ b/arch/blackfin/include/asm/mutex.h @@ -4,6 +4,10 @@ * TODO: implement optimized primitives instead, or leave the generic * implementation in place, or pick the atomic_xchg() based generic * implementation. (see asm-generic/mutex-xchg.h for details) + * + * Copyright 2006-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. */ #ifndef _ASM_MUTEX_H diff --git a/arch/blackfin/include/asm/nand.h b/arch/blackfin/include/asm/nand.h index afbaafa793f..3ae8b569edf 100644 --- a/arch/blackfin/include/asm/nand.h +++ b/arch/blackfin/include/asm/nand.h @@ -1,13 +1,9 @@ -/* linux/include/asm-blackfin/nand.h - * - * Copyright (c) 2007 Analog Devices, Inc. - * Bryan Wu - * +/* * BF5XX - NAND flash controller platfrom_device info * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * Copyright 2007-2008 Analog Devices, Inc. + * + * Licensed under the GPL-2 */ /* struct bf5xx_nand_platform diff --git a/arch/blackfin/include/asm/page.h b/arch/blackfin/include/asm/page.h index 29dcf75c611..944a07c6cfd 100644 --- a/arch/blackfin/include/asm/page.h +++ b/arch/blackfin/include/asm/page.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_PAGE_H #define _BLACKFIN_PAGE_H diff --git a/arch/blackfin/include/asm/page_offset.h b/arch/blackfin/include/asm/page_offset.h index cbaff24b4b2..d06a89b89d2 100644 --- a/arch/blackfin/include/asm/page_offset.h +++ b/arch/blackfin/include/asm/page_offset.h @@ -1,5 +1,10 @@ - -/* This handles the memory map.. */ +/* + * This handles the memory map + * + * Copyright 2004-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ #ifdef CONFIG_BLACKFIN #define PAGE_OFFSET_RAW 0x00000000 diff --git a/arch/blackfin/include/asm/pda.h b/arch/blackfin/include/asm/pda.h index a6f95695731..d49bb261d9b 100644 --- a/arch/blackfin/include/asm/pda.h +++ b/arch/blackfin/include/asm/pda.h @@ -1,23 +1,8 @@ /* - * File: arch/blackfin/include/asm/pda.h - * Author: Philippe Gerum + * Copyright 2007-2009 Analog Devices Inc. + * Philippe Gerum * - * Copyright 2007 Analog Devices Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ #ifndef _ASM_BLACKFIN_PDA_H diff --git a/arch/blackfin/include/asm/pgtable.h b/arch/blackfin/include/asm/pgtable.h index 783c8f7f8f8..b54cbddf547 100644 --- a/arch/blackfin/include/asm/pgtable.h +++ b/arch/blackfin/include/asm/pgtable.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_PGTABLE_H #define _BLACKFIN_PGTABLE_H diff --git a/arch/blackfin/include/asm/poll.h b/arch/blackfin/include/asm/poll.h index a0556671357..072d8966c5c 100644 --- a/arch/blackfin/include/asm/poll.h +++ b/arch/blackfin/include/asm/poll.h @@ -1,3 +1,10 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + * + */ + #ifndef __BFIN_POLL_H #define __BFIN_POLL_H diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h index 88eb5c07cc2..edd8ef3a378 100644 --- a/arch/blackfin/include/asm/portmux.h +++ b/arch/blackfin/include/asm/portmux.h @@ -1,6 +1,9 @@ /* - * Common header file for blackfin family of processors. + * Common header file for Blackfin family of processors * + * Copyright 2007-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. */ #ifndef _PORTMUX_H_ diff --git a/arch/blackfin/include/asm/posix_types.h b/arch/blackfin/include/asm/posix_types.h index 80c9d64eb26..41bc1875c4d 100644 --- a/arch/blackfin/include/asm/posix_types.h +++ b/arch/blackfin/include/asm/posix_types.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef __ARCH_BFIN_POSIX_TYPES_H #define __ARCH_BFIN_POSIX_TYPES_H diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h index a36ad8dac06..aea880274de 100644 --- a/arch/blackfin/include/asm/processor.h +++ b/arch/blackfin/include/asm/processor.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef __ASM_BFIN_PROCESSOR_H #define __ASM_BFIN_PROCESSOR_H diff --git a/arch/blackfin/include/asm/ptrace.h b/arch/blackfin/include/asm/ptrace.h index e3f086dc726..27290c955a7 100644 --- a/arch/blackfin/include/asm/ptrace.h +++ b/arch/blackfin/include/asm/ptrace.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BFIN_PTRACE_H #define _BFIN_PTRACE_H diff --git a/arch/blackfin/include/asm/sections.h b/arch/blackfin/include/asm/sections.h index ae4dae1e370..1f5381fbb4a 100644 --- a/arch/blackfin/include/asm/sections.h +++ b/arch/blackfin/include/asm/sections.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_SECTIONS_H #define _BLACKFIN_SECTIONS_H diff --git a/arch/blackfin/include/asm/segment.h b/arch/blackfin/include/asm/segment.h index 02cfd09b5a9..f8e1984ffc7 100644 --- a/arch/blackfin/include/asm/segment.h +++ b/arch/blackfin/include/asm/segment.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BFIN_SEGMENT_H #define _BFIN_SEGMENT_H diff --git a/arch/blackfin/include/asm/sigcontext.h b/arch/blackfin/include/asm/sigcontext.h index ce00b03c277..ce4081a4d81 100644 --- a/arch/blackfin/include/asm/sigcontext.h +++ b/arch/blackfin/include/asm/sigcontext.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _ASM_BLACKFIN_SIGCONTEXT_H #define _ASM_BLACKFIN_SIGCONTEXT_H diff --git a/arch/blackfin/include/asm/siginfo.h b/arch/blackfin/include/asm/siginfo.h index eca4565cea3..3e81306394e 100644 --- a/arch/blackfin/include/asm/siginfo.h +++ b/arch/blackfin/include/asm/siginfo.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BFIN_SIGINFO_H #define _BFIN_SIGINFO_H diff --git a/arch/blackfin/include/asm/smp.h b/arch/blackfin/include/asm/smp.h index 118deeeae7c..6a0fe94b84a 100644 --- a/arch/blackfin/include/asm/smp.h +++ b/arch/blackfin/include/asm/smp.h @@ -1,23 +1,8 @@ /* - * File: arch/blackfin/include/asm/smp.h - * Author: Philippe Gerum + * Copyright 2007-2009 Analog Devices Inc. + * Philippe Gerum * - * Copyright 2007 Analog Devices Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see the file COPYING, or write - * to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Licensed under the GPL-2 or later. */ #ifndef __ASM_BLACKFIN_SMP_H diff --git a/arch/blackfin/include/asm/spinlock.h b/arch/blackfin/include/asm/spinlock.h index d6ff4b59fcb..b0c7f0ee4b0 100644 --- a/arch/blackfin/include/asm/spinlock.h +++ b/arch/blackfin/include/asm/spinlock.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef __BFIN_SPINLOCK_H #define __BFIN_SPINLOCK_H diff --git a/arch/blackfin/include/asm/spinlock_types.h b/arch/blackfin/include/asm/spinlock_types.h index b1e3c4c7b38..be75762c061 100644 --- a/arch/blackfin/include/asm/spinlock_types.h +++ b/arch/blackfin/include/asm/spinlock_types.h @@ -1,3 +1,9 @@ +/* + * Copyright 2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef __ASM_SPINLOCK_TYPES_H #define __ASM_SPINLOCK_TYPES_H diff --git a/arch/blackfin/include/asm/stat.h b/arch/blackfin/include/asm/stat.h index d2b6f11ec23..2e27665c4e9 100644 --- a/arch/blackfin/include/asm/stat.h +++ b/arch/blackfin/include/asm/stat.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2006 Analog Devices Inc. + * + * Licensed under the GPL-2. + */ + #ifndef _BFIN_STAT_H #define _BFIN_STAT_H diff --git a/arch/blackfin/include/asm/string.h b/arch/blackfin/include/asm/string.h index 321f4d96e4a..d7f0ccb418c 100644 --- a/arch/blackfin/include/asm/string.h +++ b/arch/blackfin/include/asm/string.h @@ -1,3 +1,9 @@ +/* + * Copyright 2004-2008 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_STRING_H_ #define _BLACKFIN_STRING_H_ diff --git a/arch/blackfin/include/asm/swab.h b/arch/blackfin/include/asm/swab.h index d442113de51..89de6507ca2 100644 --- a/arch/blackfin/include/asm/swab.h +++ b/arch/blackfin/include/asm/swab.h @@ -1,3 +1,9 @@ +/* + * Copyright 2009 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + #ifndef _BLACKFIN_SWAB_H #define _BLACKFIN_SWAB_H diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h index 85e8f16cf8c..dde19b1d25f 100644 --- a/arch/blackfin/include/asm/system.h +++ b/arch/blackfin/include/asm/system.h @@ -1,34 +1,8 @@ /* - * File: include/asm/system.h - * Based on: - * Author: Tony Kou (tonyko@lineo.ca) - * Copyright (c) 2002 Arcturus Networks Inc. - * (www.arcturusnetworks.com) - * Copyright (c) 2003 Metrowerks (www.metrowerks.com) - * Copyright (c) 2004 Analog Device Inc. - * Created: 25Jan2001 - Tony Kou - * Description: system.h include file + * Copyright 2004-2009 Analog Devices Inc. + * Tony Kou (tonyko@lineo.ca) * - * Modified: 22Sep2006 - Robin Getz - * - move include blackfin.h down, so I can get access to - * irq functions in other include files. - * - * Bugs: Enter bugs at http://blackfin.uclinux.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, M