Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d6be43d 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: (43 commits)
  Blackfin: spi-docs: further clarify GPIO CS behavior with various modes
  Blackfin: boards: fix pcm device name
  Blackfin: SMP: punt unused atomic_test_mask helper
  Blackfin: irqs: do not trace arch_local_{*,irq_*} functions
  Blackfin: bf526: restrict reboot workaround to 0.0 silicon
  Blackfin: bf51x: fix alternative portmux options
  Blackfin: bf54x: fix GPIO resume code
  Blackfin: dpmc: optimize SDRAM programming slightly
  Blackfin: dpmc: don't save/restore scratch registers
  Blackfin: bf538: pull gpio/port logic out of core hibernate paths
  Blackfin: dpmc: optimize hibernate/resume path
  Blackfin: dpmc: do not save/restore EVT0/EVT1/EVT4 when hibernating
  Blackfin: dpmc: relocate hibernate helper macros
  Blackfin: dpmc: omit RETE/RETN when hibernating
  Blackfin: dpmc: optimize SIC_IWR programming a little
  Blackfin: gpio/ints: generalize pint logic
  Blackfin: dpmc: bind to MMR names and not CPUs
  Blackfin: debug-mmrs: generalize pint logic
  Blackfin: bf54x: switch to common pint MMR struct
  Blackfin: bf54x: tweak MMR pint names
  ...
parents f5fc8790 10617340

Documentation/blackfin/bfin-spi-notes.txt

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ the entire SPI transfer. - And not just bits_per_word duration. 
In most cases you can utilize SPI MODE_3 instead of MODE_0 to work-around this

behavior. If your SPI slave device in question requires SPI MODE_0 or MODE_2

timing, you can utilize the GPIO controlled SPI Slave Select option instead.

In this case, you should use GPIO based CS for all of your slaves and not just

the ones using mode 0 or 2 in order to guarantee correct CS toggling behavior.



You can even use the same pin whose peripheral role is a SSEL,

but use it as a GPIO instead.

arch/blackfin/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -953,6 +953,16 @@ config BFIN_GPTIMERS 
	  To compile this driver as a module, choose M here: the module

	  will be called gptimers.



config HAVE_PWM

	tristate "Enable PWM API support"

	depends on BFIN_GPTIMERS

	help

	  Enable support for the Pulse Width Modulation framework (as

	  found in linux/pwm.h).



	  To compile this driver as a module, choose M here: the module

	  will be called pwm.



choice

	prompt "Uncached DMA region"

	default DMA_UNCACHED_1M

arch/blackfin/configs/BF561-EZKIT_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=m

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=m

CONFIG_MTD_CFI_AMDSTD=m

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=m

CONFIG_MTD_PHYSMAP=m

CONFIG_MTD_PHYSMAP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

arch/blackfin/include/asm/Kbuild

+43 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



generic-y += auxvec.h

generic-y += bitsperlong.h

generic-y += bugs.h

generic-y += cputime.h

generic-y += current.h

generic-y += device.h

generic-y += div64.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += fb.h

generic-y += futex.h

generic-y += hw_irq.h

generic-y += ioctl.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += kmap_types.h

generic-y += local64.h

generic-y += local.h

generic-y += mman.h

generic-y += msgbuf.h

generic-y += param.h

generic-y += percpu.h

generic-y += pgalloc.h

generic-y += resource.h

generic-y += scatterlist.h

generic-y += sembuf.h

generic-y += serial.h

generic-y += setup.h

generic-y += shmbuf.h

generic-y += shmparam.h

generic-y += socket.h

generic-y += sockios.h

generic-y += statfs.h

generic-y += termbits.h

generic-y += termios.h

generic-y += topology.h

generic-y += types.h

generic-y += ucontext.h

generic-y += unaligned.h

generic-y += user.h

generic-y += xor.h



header-y += bfin_sport.h

header-y += cachectl.h

header-y += fixed_code.h

arch/blackfin/include/asm/atomic.h

+4 −9
Original line number Diff line number Diff line 
/*

 * Copyright 2004-2009 Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later.

 */

 * Copyright 2004-2009 Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later.

 */



#ifndef __ARCH_BLACKFIN_ATOMIC__

#define __ARCH_BLACKFIN_ATOMIC__
@@ -76,11 +76,6 @@ static inline void atomic_set_mask(int mask, atomic_t *v) 
	__raw_atomic_set_asm(&v->counter, mask);

}



static inline int atomic_test_mask(int mask, atomic_t *v)

{

	return __raw_atomic_test_asm(&v->counter, mask);

}



/* Atomic operations are already serializing */

#define smp_mb__before_atomic_dec()    barrier()

#define smp_mb__after_atomic_dec() barrier()