Hi Tom,

Please pull this PR.

thanks! Jagan.

The following changes since commit c2cbd164ea5b5f564fcf03447c7bf9ec4a9f5699:

Merge branch 'master' of http://git.denx.de/u-boot-mmc (2016-11-17 11:46:56 -0500)

are available in the git repository at:

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

for you to fetch changes up to 84cdc6e27aede7d87322842d262f0414824bb126:

sf: Fix s25fs512s id table (2016-11-18 13:04:55 +0530)

---------------------------------------------------------------- Chris Packham (1): spi: kirkwood_spi: implement mvebu_spi_set_mode()

Jagan Teki (21): sf: Adopt flash table INFO macro from Linux sf: Simplify lock ops detection code sf: sandbox: Use JEDEC_MFR|ID in id exctract sf: Cleanup spi_flash_info{} sf: nr_sectors -> n_sectors sf: Add SPI_FLASH_MAX_ID_LEN sf: Increase max id length by 1 byte sf: Add INFO6 flash_info macro sf: params: Add S25FS256S_64K spi flash support sf: Remove spansion_s25fss_disable_4KB_erase sf: Remove non-meaningful comments sf: Rename sf_params.c to spi_flash_ids.c sf: ids: Use small letter's with flash name sf: ids: Use small letter in ext_jedec sf: Rename few local functions spi: Remove dual flash options/flags sf: dataflash: Remove unneeded spi data sf: dataflash: Move flash id detection into jedec_probe sf: dataflash: Fix add_dataflash return logic sf: dataflash: Minor cleanups sf: Fix s25fs512s id table

arch/arm/include/asm/arch-mvebu/spi.h | 4 + doc/device-tree-bindings/mtd/spi/spi-flash.txt | 2 +- drivers/mtd/spi/Makefile | 2 +- drivers/mtd/spi/sandbox.c | 11 +- drivers/mtd/spi/sf.c | 4 - drivers/mtd/spi/sf_dataflash.c | 178 +++++++++---------- drivers/mtd/spi/sf_internal.h | 71 ++++---- drivers/mtd/spi/sf_params.c | 149 ---------------- drivers/mtd/spi/spi_flash.c | 228 ++++++++----------------- drivers/mtd/spi/spi_flash_ids.c | 180 +++++++++++++++++++ drivers/spi/kirkwood_spi.c | 15 ++ include/linux/err.h | 5 + include/spi.h | 6 - 13 files changed, 400 insertions(+), 455 deletions(-) delete mode 100644 drivers/mtd/spi/sf_params.c create mode 100644 drivers/mtd/spi/spi_flash_ids.c