Commit 9dee279b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup',... 

Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup', 'spi/topic/clps711x', 'spi/topic/coldfire', 'spi/topic/completion' and 'spi/topic/davinci' into spi-next
parents 0f38af45 78e39523 354312f1 6f50c6bc 8023d384 aa0fe826 b53b34f0

drivers/spi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ config SPI_BUTTERFLY 


config SPI_CLPS711X

	tristate "CLPS711X host SPI controller"

	depends on ARCH_CLPS711X

	depends on ARCH_CLPS711X || COMPILE_TEST

	help

	  This enables dedicated general purpose SPI/Microwire1-compatible

	  master mode interface (SSI1) for CLPS711X-based CPUs.

drivers/spi/spi-atmel.c

+0 −7
Original line number Diff line number Diff line
@@ -994,13 +994,6 @@ static int atmel_spi_setup(struct spi_device *spi) 


	as = spi_master_get_devdata(spi->master);



	if (spi->chip_select > spi->master->num_chipselect) {

		dev_dbg(&spi->dev,

				"setup: invalid chipselect %u (%u defined)\n",

				spi->chip_select, spi->master->num_chipselect);

		return -EINVAL;

	}



	/* see notes above re chipselect */

	if (!atmel_spi_is_v2(as)

			&& spi->chip_select == 0

drivers/spi/spi-bcm2835.c

+0 −1
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 


	master->mode_bits = BCM2835_SPI_MODE_BITS;

	master->bits_per_word_mask = SPI_BPW_MASK(8);

	master->bus_num = -1;

	master->num_chipselect = 3;

	master->transfer_one_message = bcm2835_spi_transfer_one;

	master->dev.of_node = pdev->dev.of_node;

drivers/spi/spi-bcm63xx-hsspi.c

+2 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) 
	while (pending > 0) {

		int curr_step = min_t(int, step_size, pending);



		init_completion(&bs->done);

		reinit_completion(&bs->done);

		if (tx) {

			memcpy_toio(bs->fifo + HSSPI_OPCODE_LEN, tx, curr_step);

			tx += curr_step;
@@ -369,6 +369,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) 
	bs->fifo = (u8 __iomem *)(bs->regs + HSSPI_FIFO_REG(0));



	mutex_init(&bs->bus_mutex);

	init_completion(&bs->done);



	master->bus_num = HSSPI_BUS_NUM;

	master->num_chipselect = 8;

drivers/spi/spi-bcm63xx.c

+2 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int bcm63xx_txrx_bufs(struct spi_device *spi, struct spi_transfer *first, 
			       transfer_list);

	}



	init_completion(&bs->done);

	reinit_completion(&bs->done);



	/* Fill in the Message control register */

	msg_ctl = (len << SPI_BYTE_CNT_SHIFT);
@@ -351,6 +351,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 
	}



	bs = spi_master_get_devdata(master);

	init_completion(&bs->done);



	platform_set_drvdata(pdev, master);

	bs->pdev = pdev;