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

Pull blackfin updates from Steven Miao.

* tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
  Revert "blackfin: dma: current count mmr is read only"
  bf533: fix build error: add linux/gpio.h

diff --combined arch/blackfin/configs/BF526-EZBRD_defconfig
index 1759fad540178705f0ff77940655d47569f18b93,530ba7a6d7b033a7d597efe08ae5b47a6e607d96..e66ba31ef84de15520ded3e787fd1b7b91af4425
--- 1/arch/blackfin/configs/BF526-EZBRD_defconfig
--- 2/arch/blackfin/configs/BF526-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF526-EZBRD_defconfig
@@@ -53,7 -53,6 +53,6 @@@ CONFIG_IP_PNP=
  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
@@@ -63,6 -62,7 +62,7 @@@ CONFIG_MTD_COMPLEX_MAPPINGS=
  CONFIG_MTD_PHYSMAP=y
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_NAND=m
+ CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_RAM=y
  CONFIG_SCSI=y
  # CONFIG_SCSI_PROC_FS is not set
@@@ -123,6 -123,7 +123,6 @@@ CONFIG_HID_SAMSUNG=
  CONFIG_HID_SONY=y
  CONFIG_HID_SUNPLUS=y
  CONFIG_USB=y
 -CONFIG_USB_DEVICEFS=y
  # CONFIG_USB_DEVICE_CLASS is not set
  CONFIG_USB_OTG_BLACKLIST_HUB=y
  CONFIG_USB_MON=y

diff --combined arch/blackfin/configs/BF527-EZKIT-V2_defconfig
index 357729682c0064edf2d908093037506a9dd31669,a21c79275eaeedd2bda8a84fb29d002c351829f5..0207c588c19f3cad7d91b4dff2b84555474034f9
--- 1/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
--- 2/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
@@@ -58,7 -58,6 +58,6 @@@ CONFIG_BFIN_SIR0=
  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=m
  CONFIG_MTD_RAM=y
@@@ -66,6 -65,7 +65,7 @@@ CONFIG_MTD_ROM=
  CONFIG_MTD_COMPLEX_MAPPINGS=y
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_NAND=m
+ CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_RAM=y
  CONFIG_SCSI=y
  # CONFIG_SCSI_PROC_FS is not set
@@@ -147,6 -147,7 +147,6 @@@ CONFIG_HID_SAMSUNG=
  CONFIG_HID_SONY=y
  CONFIG_HID_SUNPLUS=y
  CONFIG_USB=y
 -CONFIG_USB_DEVICEFS=y
  # CONFIG_USB_DEVICE_CLASS is not set
  CONFIG_USB_OTG_BLACKLIST_HUB=y
  CONFIG_USB_MON=y

diff --combined arch/blackfin/configs/BF527-EZKIT_defconfig
index 2e73a5d33da88f294f12d035a2f974917e8d3845,5070a860d8c4ed131ea7373ebcc4c84204e4b67b..99c131ba7d908b557d85ebb57a0d0e0b6cf409b7
--- 1/arch/blackfin/configs/BF527-EZKIT_defconfig
--- 2/arch/blackfin/configs/BF527-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig
@@@ -57,7 -57,6 +57,6 @@@ CONFIG_BFIN_SIR0=
  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=m
  CONFIG_MTD_RAM=y
@@@ -65,6 -64,7 +64,7 @@@ CONFIG_MTD_ROM=
  CONFIG_MTD_COMPLEX_MAPPINGS=y
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_NAND=m
+ CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_RAM=y
  CONFIG_SCSI=y
  # CONFIG_SCSI_PROC_FS is not set
@@@ -141,6 -141,7 +141,6 @@@ CONFIG_HID_SAMSUNG=
  CONFIG_HID_SONY=y
  CONFIG_HID_SUNPLUS=y
  CONFIG_USB=y
 -CONFIG_USB_DEVICEFS=y
  # CONFIG_USB_DEVICE_CLASS is not set
  CONFIG_USB_OTG_BLACKLIST_HUB=y
  CONFIG_USB_MON=y

diff --combined arch/blackfin/configs/BF548-EZKIT_defconfig
index f0a2ddf5de468d0a96f1fbc716b3e37915c377f8,efb293057287281ebed3a590c220532b5712ff74..38cb17d218d46f04f1b677beb748438e37cf65ea
--- 1/arch/blackfin/configs/BF548-EZKIT_defconfig
--- 2/arch/blackfin/configs/BF548-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@@ -64,7 -64,6 +64,6 @@@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplu
  CONFIG_FW_LOADER=m
  CONFIG_MTD=y
  CONFIG_MTD_CMDLINE_PARTS=y
- CONFIG_MTD_CHAR=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CFI=y
  CONFIG_MTD_CFI_INTELEXT=y
@@@ -75,6 -74,7 +74,7 @@@ CONFIG_MTD_M25P80=
  CONFIG_MTD_NAND=y
  CONFIG_MTD_NAND_BF5XX=y
  # CONFIG_MTD_NAND_BF5XX_HWECC is not set
+ CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_RAM=y
  # CONFIG_SCSI_PROC_FS is not set
  CONFIG_BLK_DEV_SD=y
@@@ -159,6 -159,7 +159,6 @@@ CONFIG_HID_SAMSUNG=
  CONFIG_HID_SONY=y
  CONFIG_HID_SUNPLUS=y
  CONFIG_USB=y
 -CONFIG_USB_DEVICEFS=y
  # CONFIG_USB_DEVICE_CLASS is not set
  CONFIG_USB_OTG_BLACKLIST_HUB=y
  CONFIG_USB_MON=y