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

Commit 668b54a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'blackfin-for-linus' of... 

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

Pull blackfin updates from Steven Miao.

* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  eth: bf609 eth clock: add pclk clock for stmmac driver probe
  blackfin: Wire up missing syscalls
  arch: blackfin: kernel: kgdb: Remove unused function
  dma: fix build error after update to v3.19
  blackfin: io: define __raw_readx/writex with bfin_readx/writex
  bf609: add resources for lcd nl8048
  pm: sometimes wake up from suspend to RAM would fail
  debug-mmrs: Eliminate all traces of the USB_PHY_TEST MMR
  bf609: remove softswitch i2c configuration from adv7842 and adv7511 platform data
  bf609: add platform data for soft switch devices on the video extenders
  bf609: enable soft switch gpio driver by default
  bf609: add gpio soft switch platform data for mcp23017 i2c devices
  bf609: use new SND_BF6XX_PCM to choose audio pcm driver
  bug[220] kgdb: change the smp cross core function entry
  arch: blackfin: kernel: setup.c: Cleaning up missing null-terminate in conjunction with strncpy
  blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP
parents fab1e550 d91e14b3

arch/blackfin/configs/BF518F-EZBRD_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ CONFIG_IP_PNP=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_JEDECPROBE=m

CONFIG_MTD_RAM=y

arch/blackfin/configs/BF527-TLL6527M_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ CONFIG_BFIN_SIR0=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

arch/blackfin/configs/BF533-EZKIT_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ CONFIG_IRTTY_SIR=m 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=m

CONFIG_MTD_BLOCK=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_AMDSTD=y

arch/blackfin/configs/BF533-STAMP_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=m

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=m

CONFIG_MTD_CFI_AMDSTD=m

arch/blackfin/configs/BF537-STAMP_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -55,13 +55,14 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
# CONFIG_FW_LOADER is not set

CONFIG_MTD=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_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_BLK_DEV_RAM=y

CONFIG_NETDEVICES=y

CONFIG_NET_BFIN=y