Commit 0be8c8bd 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: (52 commits)
  Blackfin: encode cpu-rev into uImage name
  Blackfin: bf54x: don't ack GPIO ints when unmasking them
  Blackfin: sram_free_with_lsl: do not ignore return value of sram_free
  Blackfin: boards: add missing "static" to peripheral lists
  Blackfin: DNP5370: new board port
  Blackfin: bf518f-ezbrd: fix dsa resources
  Blackfin: move "-m elf32bfin" to general LDFLAGS
  Blackfin: kgdb_test: make sure to initialize num2
  Blackfin: kgdb: disable preempt schedule when running single step in kgdb
  Blackfin: kgdb: disable interrupt when single stepping in ADEOS
  Blackfin: SMP: kgdb: apply anomaly 257 work around
  Blackfin: fix building IPIPE code when XIP is enabled
  Blackfin: SMP: kgdb: flush core internal write buffer before flushinv
  Blackfin: sport_uart resources: remove unused secondary RX/TX pins
  Blackfin: tll6527m: fix spelling in unused code (struct name)
  Blackfin: bf527-ezkit: add adau1373 chip address
  Blackfin: no-mpu: fix masking of small uncached dma region
  Blackfin: pm: drop irq save/restore in standby and suspend to mem callback
  MAINTAINERS: update Analog Devices support info
  Blackfin: dpmc.h: pull in new pll.h
  ...
parents e54be894 a780c6e8

MAINTAINERS

+78 −4
Original line number Diff line number Diff line
@@ -285,6 +285,41 @@ L: linux-parisc@vger.kernel.org 
S:	Maintained

F:	sound/pci/ad1889.*



AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/AD5254

S:	Supported

F:	drivers/misc/ad525x_dpot.c



AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/AD5398

S:	Supported

F:	drivers/regulator/ad5398.c



AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/AD7142

S:	Supported

F:	drivers/input/misc/ad714x.c



AD7877 TOUCHSCREEN DRIVER

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/AD7877

S:	Supported

F:	drivers/input/touchscreen/ad7877.c



AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/AD7879

S:	Supported

F:	drivers/input/touchscreen/ad7879.c



ADM1025 HARDWARE MONITOR DRIVER

M:	Jean Delvare <khali@linux-fr.org>

L:	lm-sensors@lm-sensors.org
@@ -304,6 +339,32 @@ W: http://linuxwireless.org/ 
S:	Orphan

F:	drivers/net/wireless/adm8211.*



ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/ADP5520

S:	Supported

F:	drivers/mfd/adp5520.c

F:	drivers/video/backlight/adp5520_bl.c

F:	drivers/led/leds-adp5520.c

F:	drivers/gpio/adp5520-gpio.c

F:	drivers/input/keyboard/adp5520-keys.c



ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/ADP5588

S:	Supported

F:	drivers/input/keyboard/adp5588-keys.c

F:	drivers/gpio/adp5588-gpio.c



ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/ADP8860

S:	Supported

F:	drivers/video/backlight/adp8860_bl.c



ADT746X FAN DRIVER

M:	Colin Leroy <colin@colino.net>

S:	Maintained
@@ -316,6 +377,13 @@ S: Maintained 
F:	Documentation/hwmon/adt7475

F:	drivers/hwmon/adt7475.c



ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	device-driver-devel@blackfin.uclinux.org

W:	http://wiki-analog.com/ADXL345

S:	Supported

F:	drivers/input/misc/adxl34x.c



ADVANSYS SCSI DRIVER

M:	Matthew Wilcox <matthew@wil.cx>

L:	linux-scsi@vger.kernel.org
@@ -440,17 +508,23 @@ L: linux-rdma@vger.kernel.org 
S:	Maintained

F:	drivers/infiniband/hw/amso1100/



ANALOG DEVICES INC ASOC DRIVERS

L:	uclinux-dist-devel@blackfin.uclinux.org

ANALOG DEVICES INC ASOC CODEC DRIVERS

L:	device-driver-devel@blackfin.uclinux.org

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

W:	http://blackfin.uclinux.org/

W:	http://wiki-analog.com/

S:	Supported

F:	sound/soc/blackfin/*

F:	sound/soc/codecs/ad1*

F:	sound/soc/codecs/adau*

F:	sound/soc/codecs/adav*

F:	sound/soc/codecs/ssm*



ANALOG DEVICES INC ASOC DRIVERS

L:	uclinux-dist-devel@blackfin.uclinux.org

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

W:	http://blackfin.uclinux.org/

S:	Supported

F:	sound/soc/blackfin/*



AOA (Apple Onboard Audio) ALSA DRIVER

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linuxppc-dev@lists.ozlabs.org

arch/blackfin/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ KBUILD_CFLAGS += -mlong-calls 
endif

KBUILD_AFLAGS           += $(call cc-option,-mno-fdpic)

KBUILD_CFLAGS_MODULE    += -mlong-calls

KBUILD_LDFLAGS_MODULE   += -m elf32bfin

LDFLAGS                 += -m elf32bfin

KALLSYMS         += --symbol-prefix=_



KBUILD_DEFCONFIG := BF537-STAMP_defconfig
@@ -97,8 +97,11 @@ rev-$(CONFIG_BF_REV_0_6) := 0.6 
rev-$(CONFIG_BF_REV_NONE) := none

rev-$(CONFIG_BF_REV_ANY)  := any



KBUILD_CFLAGS += -mcpu=$(cpu-y)-$(rev-y)

KBUILD_AFLAGS += -mcpu=$(cpu-y)-$(rev-y)

CPU_REV := $(cpu-y)-$(rev-y)

export CPU_REV



KBUILD_CFLAGS += -mcpu=$(CPU_REV)

KBUILD_AFLAGS += -mcpu=$(CPU_REV)



# - we utilize the silicon rev from the toolchain, so move it over to the checkflags

CHECKFLAGS_SILICON = $(shell echo "" | $(CPP) $(KBUILD_CFLAGS) -dD - 2>/dev/null | awk '$$2 == "__SILICON_REVISION__" { print $$3 }')

arch/blackfin/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += -a $(CONFIG_ROM_BASE) -x 


quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \

                   -C $(2) -n '$(MACHINE)-$(KERNELRELEASE)' \

                   -C $(2) -n '$(CPU_REV)-$(KERNELRELEASE)' \

                   -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \

                   $(UIMAGE_OPTS-y) -d $< $@

arch/blackfin/configs/BF561-EZKIT-SMP_defconfig

0 → 100644
+113 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_ELF_CORE is not set

# CONFIG_FUTEX is not set

# CONFIG_SIGNALFD is not set

# CONFIG_TIMERFD is not set

# CONFIG_EVENTFD is not set

# CONFIG_AIO is not set

CONFIG_SLAB=y

CONFIG_MMAP_ALLOW_UNINITIALIZED=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_BF561=y

CONFIG_SMP=y

CONFIG_IRQ_TIMER0=10

CONFIG_CLKIN_HZ=30000000

CONFIG_HIGH_RES_TIMERS=y

CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0

CONFIG_BFIN_GPTIMERS=m

CONFIG_C_CDPRIO=y

CONFIG_BANK_3=0xAAC2

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_IRDA=m

CONFIG_IRLAN=m

CONFIG_IRCOMM=m

CONFIG_IRDA_CACHE_LAST_LSAP=y

CONFIG_IRTTY_SIR=m

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=m

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=m

CONFIG_MTD_CFI_AMDSTD=m

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=m

CONFIG_MTD_PHYSMAP=m

CONFIG_BLK_DEV_RAM=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

CONFIG_INPUT=m

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=m

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_DEVKMEM is not set

CONFIG_BFIN_JTAG_COMM=m

CONFIG_SERIAL_BFIN=y

CONFIG_SERIAL_BFIN_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_SPI=y

CONFIG_SPI_BFIN=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_BFIN_WDT=y

# CONFIG_USB_SUPPORT is not set

# CONFIG_DNOTIFY is not set

CONFIG_JFFS2_FS=m

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

CONFIG_SMB_FS=m

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_MMRS=y

CONFIG_DEBUG_HWERR=y

CONFIG_EXACT_HWERR=y

CONFIG_DEBUG_DOUBLEFAULT=y

CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y

CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/blackfin/configs/DNP5370_defconfig

0 → 100644
+121 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_LOCALVERSION="DNP5370"

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

CONFIG_SLOB=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_BF537=y

CONFIG_BF_REV_0_3=y

CONFIG_DNP5370=y

CONFIG_IRQ_ERROR=7

# CONFIG_CYCLES_CLOCKSOURCE is not set

CONFIG_C_CDPRIO=y

CONFIG_C_AMBEN_B0_B1_B2=y

CONFIG_PM=y

# CONFIG_SUSPEND is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_RARP=y

CONFIG_SYN_COOKIES=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_LLC2=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_DEBUG=y

CONFIG_MTD_DEBUG_VERBOSE=1

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_NFTL=y

CONFIG_NFTL_RW=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_ROM=y

CONFIG_MTD_ABSENT=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_UCLINUX=y

CONFIG_MTD_PLATRAM=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_BLOCK2MTD=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_PLATFORM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_DAVICOM_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_BFIN_MAC=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_BFIN_DMA_INTERFACE is not set

# CONFIG_VT is not set

# CONFIG_DEVKMEM is not set

CONFIG_BFIN_JTAG_COMM=y

CONFIG_BFIN_JTAG_COMM_CONSOLE=y

CONFIG_SERIAL_BFIN=y

CONFIG_SERIAL_BFIN_CONSOLE=y

CONFIG_SERIAL_BFIN_UART0=y

CONFIG_LEGACY_PTY_COUNT=64

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_BLACKFIN_TWI=y

CONFIG_SPI=y

CONFIG_SPI_BFIN=y

CONFIG_SPI_SPIDEV=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_SENSORS_LM75=y

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SPI=y

CONFIG_DMADEVICES=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

# CONFIG_DNOTIFY is not set

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_FAT_DEFAULT_CODEPAGE=850

CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=y

CONFIG_ROMFS_FS=y

CONFIG_ROMFS_BACKED_BY_BOTH=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_DEBUG_LOCK_ALLOC=y

CONFIG_DEBUG_KOBJECT=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_LIST=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_PAGE_POISONING=y

# CONFIG_FTRACE is not set

CONFIG_DEBUG_DOUBLEFAULT=y

CONFIG_CPLB_INFO=y

CONFIG_CRC_CCITT=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE