Commit 103ccee4 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

spi: revert master->setup function removal for altera and nuc900 



Commit 24778be2 "spi: convert drivers to use bits_per_word_mask" removed
what appeared to be redundant code from many drivers. However, it
appears that in the spi-bitbang case, these functions are required by
the spi-bitbang core, even if they don't do anything. Restore them.

For 3.12, the spi-bitbang core should be adjusted not to require these
callbacks to exist if they don't need to do anything.

This is the equivalent of Michal Simek's patch "spi/xilinx: Revert
master->setup function removal", applied to other affected drivers.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ed893559

drivers/spi/spi-altera.c

+12 −0
Original line number Diff line number Diff line
@@ -103,6 +103,16 @@ 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) {
@@ -221,6 +231,7 @@ 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);
@@ -229,6 +240,7 @@ 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-nuc900.c

+13 −0
Original line number Diff line number Diff line
@@ -174,6 +174,17 @@ static void nuc900_spi_gobusy(struct nuc900_spi *hw) 
	spin_unlock_irqrestore(&hw->lock, flags);

}



static int nuc900_spi_setupxfer(struct spi_device *spi,

				 struct spi_transfer *t)

{

	return 0;

}



static int nuc900_spi_setup(struct spi_device *spi)

{

	return 0;

}



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

{

	return hw->tx ? hw->tx[count] : 0;
@@ -366,8 +377,10 @@ static int nuc900_spi_probe(struct platform_device *pdev) 
	master->num_chipselect     = hw->pdata->num_cs;

	master->bus_num            = hw->pdata->bus_num;

	hw->bitbang.master         = hw->master;

	hw->bitbang.setup_transfer = nuc900_spi_setupxfer;

	hw->bitbang.chipselect     = nuc900_spi_chipsel;

	hw->bitbang.txrx_bufs      = nuc900_spi_txrx;

	hw->bitbang.master->setup  = nuc900_spi_setup;



	hw->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (hw->res == NULL) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE