Commit 79a6f564 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: convert to GENERIC_HARDIRQS_NO__DO_IRQ
  Blackfin: drop all simple-gpio board resources
  Blackfin: fix framebuffer mmap bug for nommu
  Blackfin: includecheck fix: mach-bf548, ezkit.c
  Blackfin: drop cs_change_per_word setting
  Blackfin: bf533-ezkit: convert to physmap/jedec_probe
  Blackfin: convert adv7393 resources to new i2c framework
  Blackfin: fix missed cache config renames
  Blackfin: cplbinfo: drop d_path() hacks
  Blackfin: asm/irq.h: pull in mach/anomaly.h for anomaly defines
  Blackfin: BF51x: add PTP MMR defines
  Blackfin: mass clean up of copyright/licensing info
  Blackfin: convert to use arch_gettimeoffset()
parents 7f314370 796dada9

arch/blackfin/ADI_BSD.txt

0 → 100644
+41 −0
Original line number Diff line number Diff line 
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

arch/blackfin/Kconfig

+9 −4
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ config GENERIC_HARDIRQS 
config GENERIC_IRQ_PROBE

	def_bool y



config GENERIC_HARDIRQS_NO__DO_IRQ

	def_bool y



config GENERIC_GPIO

	def_bool y
@@ -229,7 +232,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 +616,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 +654,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"

arch/blackfin/include/asm/atomic.h

+6 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2004-2009 Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later.

 */



#ifndef __ARCH_BLACKFIN_ATOMIC__

#define __ARCH_BLACKFIN_ATOMIC__

arch/blackfin/include/asm/bfin-global.h

+3 −23
Original line number Diff line number Diff line 
/*

 * 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_

arch/blackfin/include/asm/bfin5xx_spi.h

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
 *

 * Copyright 2004-2008 Analog Devices Inc.

 *

 * Enter bugs at http://blackfin.uclinux.org/

 *

 * Licensed under the GPL-2 or later.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE