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

Commit ed0795aa 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: (37 commits)
  Blackfin: use new common PERCPU_INPUT define
  MAINTAINERS: Fix Analog Devices mailinglist address
  Blackfin: boards: update ASoC resources after machine driver overhaul
  Blackfin: work around anomaly 05000480
  Blackfin: fix addr type with bfin_write_{or,and} helpers
  Blackfin: convert /proc/sram to seq_file
  Blackfin: switch /proc/gpio to seq_file
  Blackfin: fix indentation with bfin_read() helper
  Blackfin: convert old cpumask API to new one
  Blackfin: don't touch task->cpus_allowed directly
  Blackfin: don't touch cpu_possible_map and cpu_present_map directly
  Blackfin: bf548-ezkit/bf561-ezkit: update nor flash layout
  Blackfin: initial perf_event support
  Blackfin: update anomaly lists to latest public info
  Blackfin: use on-chip reset func with newer parts
  Blackfin: bf533-stamp/bf537-stamp: drop ad1980 from defconfigs
  Blackfin: optimize MMR reads during startup a bit
  Blackfin: bf537: demux port H mask A and emac rx ints
  Blackfin: bf537: fix excessive gpio int demuxing
  Blackfin: bf54x: drop unused pm gpio handling
  ...
parents 4e8a780e d6cb2e3a

MAINTAINERS

+10 −10
Original line number Diff line number Diff line
@@ -287,35 +287,35 @@ F: sound/pci/ad1889.* 


AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER

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

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

L:	device-drivers-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

L:	device-drivers-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

L:	device-drivers-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

L:	device-drivers-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

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

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

S:	Supported

F:	drivers/input/touchscreen/ad7879.c
@@ -341,7 +341,7 @@ 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

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

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

S:	Supported

F:	drivers/mfd/adp5520.c
@@ -352,7 +352,7 @@ 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

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

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

S:	Supported

F:	drivers/input/keyboard/adp5588-keys.c
@@ -360,7 +360,7 @@ 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

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

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

S:	Supported

F:	drivers/video/backlight/adp8860_bl.c
@@ -387,7 +387,7 @@ 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

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

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

S:	Supported

F:	drivers/input/misc/adxl34x.c
@@ -526,7 +526,7 @@ S: Maintained 
F:	drivers/infiniband/hw/amso1100/



ANALOG DEVICES INC ASOC CODEC DRIVERS

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

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

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

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

S:	Supported

arch/blackfin/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -24,11 +24,13 @@ config BLACKFIN 
	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_IDE

	select HAVE_IRQ_WORK

	select HAVE_KERNEL_GZIP if RAMKERNEL

	select HAVE_KERNEL_BZIP2 if RAMKERNEL

	select HAVE_KERNEL_LZMA if RAMKERNEL

	select HAVE_KERNEL_LZO if RAMKERNEL

	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_ATOMIC64

arch/blackfin/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config DEBUG_VERBOSE 
	  Most people should say N here.



config DEBUG_MMRS

	bool "Generate Blackfin MMR tree"

	tristate "Generate Blackfin MMR tree"

	select DEBUG_FS

	help

	  Create a tree of Blackfin MMRs via the debugfs tree.  If

arch/blackfin/configs/BF527-EZKIT-V2_defconfig

+5 −7
Original line number Diff line number Diff line
@@ -121,13 +121,11 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

# CONFIG_LOGO_BLACKFIN_VGA16 is not set

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_SOC=m

CONFIG_SND_BF5XX_I2S=m

CONFIG_SND_BF5XX_SOC_SSM2602=m

CONFIG_SND_BF5XX_AC97=m

CONFIG_SND_BF5XX_SOC_AD1980=m

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_BF5XX_I2S=y

CONFIG_SND_BF5XX_SOC_SSM2602=y

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

arch/blackfin/configs/BF527-EZKIT_defconfig

+6 −8
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ CONFIG_SERIAL_BFIN_UART1=y 
# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_BLACKFIN_TWI=m

CONFIG_I2C_BLACKFIN_TWI=y

CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100

CONFIG_SPI=y

CONFIG_SPI_BFIN=y
@@ -115,13 +115,11 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

# CONFIG_LOGO_BLACKFIN_VGA16 is not set

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_SOC=m

CONFIG_SND_BF5XX_I2S=m

CONFIG_SND_BF5XX_SOC_SSM2602=m

CONFIG_SND_BF5XX_AC97=m

CONFIG_SND_BF5XX_SOC_AD1980=m

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_BF5XX_I2S=y

CONFIG_SND_BF5XX_SOC_SSM2602=y

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y