Hi Tom,

Please pull these series for Kconfig/defconfig updates for spi/sf subsystems.

thanks! Jagan.

The following changes since commit 8ee81b7f9b675cb675119a998b04ca843d24ddcd:

mtd, spi: Check if flash pointer is used (2015-06-30 00:40:11 +0530)

are available in the git repository at:

git://git.denx.de/u-boot-spi.git master

for you to fetch changes up to 8aa5f1d971df0f668144759991e19b5195606a32:

spi: cf_qspi: fix clamp macro type check compilation warnings (2015-07-01 22:58:50 +0530)

---------------------------------------------------------------- Angelo Dureghello (1): spi: cf_qspi: fix clamp macro type check compilation warnings

Haikun Wang (1): sf: update sst25wf040b flash params

Jagan Teki (43): spi: Zap andes_spi driver spi: Zap ftssp010_spi driver spi: Zap oc_tiny_spi driver spi: xilinx_spi: Move header code to driver spi: xilinx_spi: Driver clean-up spi: davinci_spi: Move header code to driver spi: davinci_spi: Driver cleanup spi/sf: Minor cleanups dm: spi: zynq_spi: Convert to driver model zynq: Kconfig: Enable dm spi and spi_flash dts: zynq: Add zynq spi controller nodes spi: zynq_spi: Add fdt support in driver dts: zynq: Enable spi1 for zc770_xm010 board dm: spi: xilinx_spi: Convert to driver model spi: xilinx_spi: Add asm/io.h include file spi: Kconfig: Add Zynq SPI controller entry defconfig: Add CONFIG_OF_CONTROL in zynq_picozed zynq: defconfig: Move CONFIG_OF_* to Kconfig sf: dataflash: Rename to CONFIG_SPI_FLASH_DATAFLASH README: Add CONFIG_SPI_FLASH_DATAFLASH description sf: Add Kconfig menu entry common: Add CMD_SF Kconfig entry sf: Kconfig: Update SPI_FLASH entry sf: Kconfig: Add SPI_FLASH_MTD entry sf: Kconfig: Add SPI_FLASH_DATAFLASH entry spi: Add Kconfig menu entry spi: Kconfig: Add XILINX_SPI entry spi: Kconfig: Add TI_QSPI entry spi: Makefile: Use object file alphabetic order spi: Kconfig: Show dm-spi drivers if DM_SPI set spi: Kconfig: Add FSL_DSPI entry spi: Kconfig: Add FSL_ESPI entry spi: Kconfig: Add FSL_QSPI entry spi: Kconfig: Add EXYNOS_SPI entry spi: Kconfig: Add ICH_SPI entry spi: Kconfig: Add TEGRA114_SPI entry spi: Kconfig: Add TEGRA20_SFLASH entry spi: Kconfig: Add TEGRA20_SLINK entry README: Remove CONFIG_SPI_FLASH_MTD help text defconfig: Move CONFIG_SPI_FLASH_BAR from configs sf: Kconfig: Add SPI_FLASH_BAR entry README: Remove CONFIG_SPI_FLASH_BAR help text README: Remove CONFIG_SPI_FLASH_DATAFLASH help text

README | 14 - arch/arm/Kconfig | 4 + arch/arm/dts/zynq-7000.dtsi | 26 ++ arch/arm/dts/zynq-zc770-xm010.dts | 5 + common/Kconfig | 5 + configs/alt_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig | 1 + configs/lager_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/porter_defconfig | 1 + configs/silk_defconfig | 1 + configs/zynq_microzed_defconfig | 2 - configs/zynq_zc702_defconfig | 1 - configs/zynq_zc706_defconfig | 1 - configs/zynq_zc70x_defconfig | 2 - configs/zynq_zc770_xm010_defconfig | 2 - configs/zynq_zc770_xm012_defconfig | 2 - configs/zynq_zc770_xm013_defconfig | 2 - configs/zynq_zed_defconfig | 2 - configs/zynq_zybo_defconfig | 2 - doc/device-tree-bindings/spi/spi-zynq.txt | 29 ++ drivers/mtd/spi/Kconfig | 55 +++- drivers/mtd/spi/Makefile | 2 +- drivers/mtd/spi/sf_dataflash.c | 10 - drivers/mtd/spi/sf_internal.h | 18 +- drivers/mtd/spi/sf_params.c | 2 +- drivers/spi/Kconfig | 112 ++++++- drivers/spi/Makefile | 13 +- drivers/spi/andes_spi.c | 284 ----------------- drivers/spi/andes_spi.h | 115 ------- drivers/spi/cf_qspi.c | 3 +- drivers/spi/davinci_spi.c | 369 ++++++++++++++-------- drivers/spi/davinci_spi.h | 121 -------- drivers/spi/ftssp010_spi.c | 498 ------------------------------ drivers/spi/oc_tiny_spi.c | 245 --------------- drivers/spi/xilinx_spi.c | 318 ++++++++++++------- drivers/spi/xilinx_spi.h | 138 --------- drivers/spi/zynq_spi.c | 300 ++++++++++-------- include/configs/alt.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/bg0900.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h | 1 - include/configs/ls1021aqds.h | 2 +- include/configs/maxbcm.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/spi.h | 2 +- include/spi_flash.h | 10 +- 57 files changed, 868 insertions(+), 1870 deletions(-) create mode 100644 doc/device-tree-bindings/spi/spi-zynq.txt delete mode 100644 drivers/spi/andes_spi.c delete mode 100644 drivers/spi/andes_spi.h delete mode 100644 drivers/spi/davinci_spi.h delete mode 100644 drivers/spi/ftssp010_spi.c delete mode 100644 drivers/spi/oc_tiny_spi.c delete mode 100644 drivers/spi/xilinx_spi.h