Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4581949d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/bpw' into spi-next

parents 8bce7eb7 804ae438

drivers/spi/spi-altera.c

+0 −12
Original line number Diff line number Diff line
@@ -103,16 +103,6 @@ static void altera_spi_chipsel(struct spi_device *spi, int value) 
	}

}



static int altera_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)

{

	return 0;

}



static int altera_spi_setup(struct spi_device *spi)

{

	return 0;

}



static inline unsigned int hw_txbyte(struct altera_spi *hw, int count)

{

	if (hw->tx) {
@@ -231,7 +221,6 @@ static int altera_spi_probe(struct platform_device *pdev) 
	master->bus_num = pdev->id;

	master->num_chipselect = 16;

	master->mode_bits = SPI_CS_HIGH;

	master->setup = altera_spi_setup;



	hw = spi_master_get_devdata(master);

	platform_set_drvdata(pdev, hw);
@@ -240,7 +229,6 @@ static int altera_spi_probe(struct platform_device *pdev) 
	hw->bitbang.master = spi_master_get(master);

	if (!hw->bitbang.master)

		return err;

	hw->bitbang.setup_transfer = altera_spi_setupxfer;

	hw->bitbang.chipselect = altera_spi_chipsel;

	hw->bitbang.txrx_bufs = altera_spi_txrx;

drivers/spi/spi-ath79.c

+1 −3
Original line number Diff line number Diff line
@@ -155,9 +155,6 @@ static int ath79_spi_setup(struct spi_device *spi) 
{

	int status = 0;



	if (spi->bits_per_word > 32)

		return -EINVAL;



	if (!spi->controller_state) {

		status = ath79_spi_setup_cs(spi);

		if (status)
@@ -226,6 +223,7 @@ static int ath79_spi_probe(struct platform_device *pdev) 


	pdata = pdev->dev.platform_data;



	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);

	master->setup = ath79_spi_setup;

	master->cleanup = ath79_spi_cleanup;

	if (pdata) {

drivers/spi/spi-atmel.c

+1 −8
Original line number Diff line number Diff line
@@ -1280,13 +1280,6 @@ static int atmel_spi_setup(struct spi_device *spi) 
		return -EINVAL;

	}



	if (bits < 8 || bits > 16) {

		dev_dbg(&spi->dev,

				"setup: invalid bits_per_word %u (8 to 16)\n",

				bits);

		return -EINVAL;

	}



	/* see notes above re chipselect */

	if (!atmel_spi_is_v2(as)

			&& spi->chip_select == 0
@@ -1527,7 +1520,7 @@ static int atmel_spi_probe(struct platform_device *pdev) 


	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;



	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16);

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

	master->bus_num = pdev->id;

	master->num_chipselect = master->dev.of_node ? 0 : 4;

drivers/spi/spi-au1550.c

+1 −11
Original line number Diff line number Diff line
@@ -248,11 +248,6 @@ static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t) 
			hz = t->speed_hz;

	}



	if (bpw < 4 || bpw > 24) {

		dev_err(&spi->dev, "setupxfer: invalid bits_per_word=%d\n",

			bpw);

		return -EINVAL;

	}

	if (hz > spi->max_speed_hz || hz > hw->freq_max || hz < hw->freq_min) {

		dev_err(&spi->dev, "setupxfer: clock rate=%d out of range\n",

			hz);
@@ -296,12 +291,6 @@ static int au1550_spi_setup(struct spi_device *spi) 
{

	struct au1550_spi *hw = spi_master_get_devdata(spi->master);



	if (spi->bits_per_word < 4 || spi->bits_per_word > 24) {

		dev_err(&spi->dev, "setup: invalid bits_per_word=%d\n",

			spi->bits_per_word);

		return -EINVAL;

	}



	if (spi->max_speed_hz == 0)

		spi->max_speed_hz = hw->freq_max;

	if (spi->max_speed_hz > hw->freq_max
@@ -782,6 +771,7 @@ static int au1550_spi_probe(struct platform_device *pdev) 


	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;

	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 24);



	hw = spi_master_get_devdata(master);

drivers/spi/spi-bcm63xx.c

+1 −19
Original line number Diff line number Diff line
@@ -124,17 +124,6 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi, 
/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA)



static int bcm63xx_spi_setup(struct spi_device *spi)

{

	if (spi->bits_per_word != 8) {

		dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",

			__func__, spi->bits_per_word);

		return -EINVAL;

	}



	return 0;

}



static int bcm63xx_txrx_bufs(struct spi_device *spi, struct spi_transfer *first,

				unsigned int num_transfers)

{
@@ -277,13 +266,6 @@ static int bcm63xx_spi_transfer_one(struct spi_master *master, 
	 * full-duplex transfers.

	 */

	list_for_each_entry(t, &m->transfers, transfer_list) {

		if (t->bits_per_word != 8) {

			dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",

				__func__, t->bits_per_word);

			status = -EINVAL;

			goto exit;

		}



		if (!first)

			first = t;
@@ -430,11 +412,11 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 


	master->bus_num = pdata->bus_num;

	master->num_chipselect = pdata->num_chipselect;

	master->setup = bcm63xx_spi_setup;

	master->prepare_transfer_hardware = bcm63xx_spi_prepare_transfer;

	master->unprepare_transfer_hardware = bcm63xx_spi_unprepare_transfer;

	master->transfer_one_message = bcm63xx_spi_transfer_one;

	master->mode_bits = MODEBITS;

	master->bits_per_word_mask = SPI_BPW_MASK(8);

	bs->msg_type_shift = pdata->msg_type_shift;

	bs->msg_ctl_width = pdata->msg_ctl_width;

	bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA));