On Wed, Sep 24, 2014 at 06:15:43PM +0530, Jagannadha Sutradharudu Teki wrote:

Hi Tom,

Please pull this PR.

thanks! Jagan.

The following changes since commit 47d3debe1ab8315dc9ade22279e02f60eceda25b:

Merge git://git.denx.de/u-boot-dm (2014-09-23 15:21:43 -0400)

are available in the git repository at:

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

for you to fetch changes up to bf9b86dc47988a404964c97c74e541a129719f9c:

spi: kirkwood_spi.c: cosmetic: Fix minor coding style issues (2014-09-24 17:48:56 +0530)

---

Nikita Kiryanov (3): mtd: spi: add support for M25PE16 and M25PX16 spi: mxc: fix sf probe when using mxc_spi spl: replace CONFIG_SPL_SPI_* with CONFIG_SF_DEFAULT_*

Stefan Roese (5): sf: Add M25PX64 SPI NOR flash ID arm: kirkwood: spi.h: Add some missing parenthesis spi: kirkwood_spi.c: Some fixes and cleanup spi: kirkwood_spi.c: Make global variable static spi: kirkwood_spi.c: cosmetic: Fix minor coding style issues

arch/arm/include/asm/arch-kirkwood/spi.h | 8 ++--- board/boundary/nitrogen6x/nitrogen6x.c | 5 +++ board/embest/mx6boards/mx6boards.c | 5 +++ board/freescale/mx6qsabreauto/mx6qsabreauto.c | 7 ++++ board/freescale/mx6sabresd/mx6sabresd.c | 7 ++++ board/freescale/mx6slevk/mx6slevk.c | 5 +++ board/gateworks/gw_ventana/gw_ventana.c | 7 +++- board/genesi/mx51_efikamx/efikamx.c | 5 +++ board/ttcontrol/vision2/vision2.c | 5 +++ common/cmd_sf.c | 13 -------- drivers/mtd/spi/sf_params.c | 3 ++ drivers/mtd/spi/spi_spl_load.c | 6 ++-- drivers/spi/kirkwood_spi.c | 27 +++++++-------- drivers/spi/mxc_spi.c | 48 ++++++++++++++------------- include/configs/am335x_evm.h | 2 -- include/configs/da850evm.h | 4 --- include/configs/dra7xx_evm.h | 2 -- include/configs/embestmx6boards.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/ks2_evm.h | 2 -- include/configs/mx51_efikamx.h | 4 +-- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/pcm051.h | 2 -- include/configs/sama5d3xek.h | 2 -- include/configs/siemens-am33x-common.h | 2 -- include/configs/tseries.h | 2 -- include/configs/vision2.h | 4 +-- include/configs/zynq-common.h | 2 -- include/spi_flash.h | 13 ++++++++ 31 files changed, 115 insertions(+), 87 deletions(-)

Applied to u-boot/master, thanks!