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

Commit 84b9a774 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (35 commits)
  Blackfin Serial Driver: Fix bug - Only insert UART rx char in timer task.
  Blackfin Serial Driver: Fix bug - update tx dma buffer tail before wake up processes.
  Blackfin Serial Driver: Fix bug - Increase buffer tail immediately before starting tx dma.
  [Blackfin] serial driver: Add flow control support to bf54x
  [Blackfin] serial driver: Fix bug Poll RTS/CTS status in DMA mode as well
  [Blackfin] serial driver: ADSP-BF52x arch/mach support
  [Blackfin] serial driver: use simpler comment headers and strip out information that is maintained in the scm's log
  [Blackfin] serial driver: rework break flood anomaly handling to be more robust/realistic about what we can actually work around
  [Blackfin] serial driver: fix bug - cache the bits of the LSR on systems where the LSR is read-to-clear
  [Blackfin] serial driver: fix bug - should not wait for the TFI bit, just clear it when tx stop.
  [Blackfin] serial driver: Fix bug serial driver in DMA mode spams history to console on shell restart
  [Blackfin] serial driver: Fix bug Free rx dma buffer in shutdown.
  [Blackfin] serial driver: Clean up UART DMA code.
  Blackfin Serial driver: Fix bug - serial driver in PIO mode cant handle input very quickly
  [Blackfin] arch: kill section mismatch warnings
  [Blackfin] arch: handle the most common L1 shrinkage case (L1 does not exist for a part) so that any parts labeled for L1 instead get placed into external memory sections
  [Blackfin] arch: add bfin_clear_PPIx_STATUS() helper funcs like we have for other parts
  [Blackfin] arch: make sure we have proper description/copyright/license lines
  [Blackfin] arch: Fix CONFIG_PM support for BF561
  [Blackfin] arch: Remove DPMC char driver option
  ...
parents 3cf9460a 0aef4564

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -767,14 +767,14 @@ S: Maintained 


BLACKFIN ARCHITECTURE

P:	Bryan Wu

M:	bryan.wu@analog.com

M:	cooloney@kernel.org

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

W:	http://blackfin.uclinux.org

S:	Supported



BLACKFIN EMAC DRIVER

P:	Bryan Wu

M:	bryan.wu@analog.com

M:	cooloney@kernel.org

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

W:	http://blackfin.uclinux.org

S:	Supported

arch/blackfin/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -98,8 +98,11 @@ drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/ 
#	them changed.  We use .mach to indicate when they were updated

#	last, otherwise make uses the target directory mtime.



       show_mach_symlink = :

 quiet_show_mach_symlink = echo '  SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -> include/asm-$(ARCH)/mach'

silent_show_mach_symlink = :

include/asm-blackfin/.mach: $(wildcard include/config/arch/*.h) include/config/auto.conf

	@echo '  SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -> include/asm-$(ARCH)/mach'

	@$($(quiet)show_mach_symlink)

ifneq ($(KBUILD_SRC),)

	$(Q)mkdir -p include/asm-$(ARCH)

	$(Q)ln -fsn $(srctree)/include/asm-$(ARCH)/mach-$(MACHINE) include/asm-$(ARCH)/mach

arch/blackfin/configs/BF527-EZKIT_defconfig

+8 −10
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.22.14

# Thu Nov 29 17:32:47 2007

# Linux kernel version: 2.6.22.16

#

# CONFIG_MMU is not set

# CONFIG_FPU is not set
@@ -116,7 +115,10 @@ CONFIG_PREEMPT_VOLUNTARY=y 
# Processor and Board Settings

#

# CONFIG_BF522 is not set

# CONFIG_BF523 is not set

# CONFIG_BF524 is not set

# CONFIG_BF525 is not set

# CONFIG_BF526 is not set

CONFIG_BF527=y

# CONFIG_BF531 is not set

# CONFIG_BF532 is not set
@@ -306,6 +308,7 @@ CONFIG_BFIN_DCACHE=y 
# CONFIG_BFIN_WB is not set

CONFIG_BFIN_WT=y

CONFIG_L1_MAX_PIECE=16

# CONFIG_MPU is not set



#

# Asynchonous Memory Configuration
@@ -354,6 +357,7 @@ CONFIG_BINFMT_ZFLAT=y 
# Power management options

#

# CONFIG_PM is not set

# CONFIG_PM_WAKEUP_BY_GPIO is not set



#

# Networking
@@ -496,7 +500,6 @@ CONFIG_MTD_CFI_I2=y 
# CONFIG_MTD_CFI_INTELEXT is not set

# CONFIG_MTD_CFI_AMDSTD is not set

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_MW320D=m

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=m

# CONFIG_MTD_ABSENT is not set
@@ -506,9 +509,6 @@ CONFIG_MTD_ROM=m 
#

CONFIG_MTD_COMPLEX_MAPPINGS=y

# CONFIG_MTD_PHYSMAP is not set

CONFIG_MTD_BF5xx=m

CONFIG_BFIN_FLASH_SIZE=0x400000

CONFIG_EBIU_FLASH_BASE=0x20000000

# CONFIG_MTD_UCLINUX is not set

# CONFIG_MTD_PLATRAM is not set
@@ -684,7 +684,6 @@ CONFIG_INPUT_MISC=y 
# CONFIG_INPUT_POWERMATE is not set

# CONFIG_INPUT_YEALINK is not set

# CONFIG_INPUT_UINPUT is not set

# CONFIG_BF53X_PFBUTTONS is not set

# CONFIG_TWI_KEYPAD is not set



#
@@ -702,12 +701,12 @@ CONFIG_INPUT_MISC=y 
# CONFIG_BF5xx_PPIFCD is not set

# CONFIG_BFIN_SIMPLE_TIMER is not set

# CONFIG_BF5xx_PPI is not set

CONFIG_BFIN_OTP=y

# CONFIG_BFIN_OTP_WRITE_ENABLE is not set

# CONFIG_BFIN_SPORT is not set

# CONFIG_BFIN_TIMER_LATENCY is not set

# CONFIG_TWI_LCD is not set

# CONFIG_AD5304 is not set

# CONFIG_BF5xx_TEA5764 is not set

# CONFIG_BF5xx_FBDMA is not set

# CONFIG_VT is not set

# CONFIG_SERIAL_NONSTANDARD is not set
@@ -772,7 +771,6 @@ CONFIG_I2C_CHARDEV=m 
#

# I2C Hardware Bus support

#

# CONFIG_I2C_BLACKFIN_GPIO is not set

CONFIG_I2C_BLACKFIN_TWI=m

CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50

# CONFIG_I2C_GPIO is not set

arch/blackfin/configs/BF533-EZKIT_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -322,10 +322,9 @@ CONFIG_PM=y 
# CONFIG_PM_LEGACY is not set

# CONFIG_PM_DEBUG is not set

# CONFIG_PM_SYSFS_DEPRECATED is not set

CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y

CONFIG_PM_BFIN_SLEEP_DEEPER=y

# CONFIG_PM_BFIN_SLEEP is not set

# CONFIG_PM_WAKEUP_BY_GPIO is not set

# CONFIG_PM_WAKEUP_GPIO_API is not set

CONFIG_PM_WAKEUP_SIC_IWR=0x80



#

# CPU Frequency scaling
@@ -697,7 +696,6 @@ CONFIG_SERIAL_BFIN_DMA=y 
# CONFIG_SERIAL_BFIN_PIO is not set

CONFIG_SERIAL_BFIN_UART0=y

# CONFIG_BFIN_UART0_CTSRTS is not set

# CONFIG_SERIAL_BFIN_UART1 is not set

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_BFIN_SPORT is not set

arch/blackfin/configs/BF533-STAMP_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -323,10 +323,9 @@ CONFIG_PM=y 
# CONFIG_PM_LEGACY is not set

# CONFIG_PM_DEBUG is not set

# CONFIG_PM_SYSFS_DEPRECATED is not set

CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y

CONFIG_PM_BFIN_SLEEP_DEEPER=y

# CONFIG_PM_BFIN_SLEEP is not set

# CONFIG_PM_WAKEUP_BY_GPIO is not set

# CONFIG_PM_WAKEUP_GPIO_API is not set

CONFIG_PM_WAKEUP_SIC_IWR=0x80



#

# CPU Frequency scaling
@@ -714,7 +713,6 @@ CONFIG_SERIAL_BFIN_DMA=y 
# CONFIG_SERIAL_BFIN_PIO is not set

CONFIG_SERIAL_BFIN_UART0=y

# CONFIG_BFIN_UART0_CTSRTS is not set

# CONFIG_SERIAL_BFIN_UART1 is not set

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_BFIN_SPORT is not set