u-boot.git/drivers/spi, branch v2015.01-rc2

Merge git://git.denx.de/u-boot-dm

2014-11-24T17:01:48Z

Conflicts: drivers/serial/serial-uclass.c Signed-off-by: Tom Rini

linux/kernel.h: sync min, max, min3, max3 macros with Linux

2014-11-23T11:48:30Z

U-Boot has never cared about the type when we get max/min of two values, but Linux Kernel does. This commit gets min, max, min3, max3 macros synced with the kernel introducing type checks. Many of references of those macros must be fixed to suppress warnings. We have two options: - Use min, max, min3, max3 only when the arguments have the same type (or add casts to the arguments) - Use min_t/max_t instead with the appropriate type for the first argument Signed-off-by: Masahiro Yamada Acked-by: Pavel Machek Acked-by: Lukasz Majewski Tested-by: Lukasz Majewski [trini: Fixup arch/blackfin/lib/string.c] Signed-off-by: Tom Rini

dm: spi: Use device_bind_driver() instead of our own function

2014-11-22T09:16:48Z

The SPI function does the same thing, so we may as well just use the new generic function. The 'cs' parameter was not actually used, so can be dropped. Signed-off-by: Simon Glass Reviewed-by: Jagannadha Sutradharudu Teki Acked-by: Heiko Schocher

dm: spi: Correct handling of SPI chip selects in sandbox

2014-11-22T09:16:47Z

This code was not updated when the chip select handling was adjusted. Fix it to call the correct function. Signed-off-by: Simon Glass Reviewed-by: Jagannadha Sutradharudu Teki Acked-by: Heiko Schocher

spi, atmel: move CONFIG_SYS_SPI_WRITE_TOUT into common header

2014-11-17T13:47:16Z

move CONFIG_SYS_SPI_WRITE_TOUT into drivers/spi/atmel_spi.h and define a default value. Delete this define in the board config files, where it is possible (all boards use currently the same value). Signed-off-by: Heiko Schocher Reviewed-by: Jagannadha Sutradharudu Teki Reviewed-by: Andreas Bießmann Signed-off-by: Andreas Bießmann

SPI: mxc_spi: delay initialisation until claim bus

2014-10-27T17:07:03Z

it is not correct to init for a specific slave in spi_setup_slave. instead buffer the values and delay init until spi_claim_bus. Signed-off-by: Markus Niebel Acked-by: Stefano Babic Reviewed-by: Jagannadha Sutradharudu Teki

SPI: mxc_spi: remove second reset from ECSPI config handler

2014-10-27T17:07:03Z

the second reset prevents other registers to be written. This will prevent to have the correct signal levels for SCLK before writing to the config reg in spi_xchg_single. Tested with GPIO based chipselect and SPI_MODE_3 on i.MX6S Signed-off-by: Markus Niebel Acked-by: Stefano Babic Reviewed-by: Jagannadha Sutradharudu Teki

spi: altera: Move the config options to the top

2014-10-27T17:07:03Z

Just move the configuration options scattered all over the driver to the top of the source file. No functional change. Signed-off-by: Marek Vasut Cc: Chin Liang See Cc: Dinh Nguyen Cc: Albert Aribaud Cc: Pavel Machek Acked-by: Pavel Machek Reviewed-by: Jagannadha Sutradharudu Teki

spi: altera: Clean up the use of variable d

2014-10-27T17:07:03Z

The variable d is used in rather questionable way. Rework the code a bit so it's clearer what it does. Also, rename the variable from d to data to make it's name less mysterious. Finally, change it's data type to uint32_t , since it's accessed as a 32bit number. Signed-off-by: Marek Vasut Cc: Chin Liang See Cc: Dinh Nguyen Cc: Albert Aribaud Cc: Pavel Machek Cc: Jagannadha Sutradharudu Teki Acked-by: Pavel Machek Reviewed-by: Jagannadha Sutradharudu Teki

spi: altera: Zap endless loop

2014-10-27T17:07:03Z

The driver contained an endless loop when waiting for TX completion, this is a bad idea since if the hardware fails, the loop might spin forever. Add timeout and handle it. Signed-off-by: Marek Vasut Cc: Chin Liang See Cc: Dinh Nguyen Cc: Albert Aribaud Cc: Pavel Machek Cc: Jagannadha Sutradharudu Teki Acked-by: Pavel Machek Reviewed-by: Jagannadha Sutradharudu Teki