From: Mark Brown <broonie@linaro.org>
Date: Sun, 30 Mar 2014 00:51:17 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x... 
X-Git-Tag: v3.15-rc1~147^2~4
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=6e07b9179aa0f85d16b95a7d5d2a48c7a145291a

Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x-psc', 'spi/topic/mpc52xx', 'spi/topic/mxs', 'spi/topic/nuc900', 'spi/topic/oc-tiny' and 'spi/topic/octeon' into spi-next
---

6e07b9179aa0f85d16b95a7d5d2a48c7a145291a
diff --cc drivers/spi/spi-mpc52xx.c
index e3d29a56d70a,7c675fe83101,f573c3c09968,7c675fe83101,95bd2ffb0572,7c675fe83101,7c675fe83101,7c675fe83101,7c675fe83101..aac2a5ddd964
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@@@@@@@@@ -357,17 -357,20 -356,20 -357,20 -357,6 -357,20 -357,20 -357,20 -357,20 +356,6 @@@@@@@@@@ static void mpc52xx_spi_wq(struct work_
          * spi_master ops
          */
         
---- ----static int mpc52xx_spi_setup(struct spi_device *spi)
---- ----{
---- ----	if (spi->bits_per_word % 8)
---- ----		return -EINVAL;
---- ----
---- ----	if (spi->mode & ~(SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST))
 --- ----		return -EINVAL;
 --- ----
 --- ----	if (spi->chip_select >= spi->master->num_chipselect)
---- ----		return -EINVAL;
---- ----
---- ----	return 0;
---- ----}
---- ----
         static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m)
         {
         	struct mpc52xx_spi *ms = spi_master_get_devdata(spi->master);