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

Commit bf5c2e27 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

spi: clps711x: Refactor to use core message parsing 



Convert to use default implementation of transfer_one_message() which provides
standard handling of delays and chip select management.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Tested-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 3e9ea4b4

drivers/spi/spi-clps711x.c

+30 −52
Original line number Original line Diff line number Diff line
@@ -25,8 +25,6 @@ 
#define DRIVER_NAME	"spi-clps711x"

#define DRIVER_NAME	"spi-clps711x"





struct spi_clps711x_data {

struct spi_clps711x_data {

	struct completion	done;



	struct clk		*spi_clk;

	struct clk		*spi_clk;

	u32			max_speed_hz;

	u32			max_speed_hz;
@@ -44,15 +42,6 @@ static int spi_clps711x_setup(struct spi_device *spi) 
	return 0;

	return 0;

}

}





static void spi_clps711x_setup_mode(struct spi_device *spi)

{

	/* Setup edge for transfer */

	if (spi->mode & SPI_CPHA)

		clps_writew(clps_readw(SYSCON3) | SYSCON3_ADCCKNSEN, SYSCON3);

	else

		clps_writew(clps_readw(SYSCON3) & ~SYSCON3_ADCCKNSEN, SYSCON3);

}



static void spi_clps711x_setup_xfer(struct spi_device *spi,

static void spi_clps711x_setup_xfer(struct spi_device *spi,

				    struct spi_transfer *xfer)

				    struct spi_transfer *xfer)

{

{
@@ -74,24 +63,29 @@ static void spi_clps711x_setup_xfer(struct spi_device *spi, 
			    SYSCON1_ADCKSEL(0), SYSCON1);

			    SYSCON1_ADCKSEL(0), SYSCON1);

}

}





static int spi_clps711x_transfer_one_message(struct spi_master *master,

static int spi_clps711x_prepare_message(struct spi_master *master,

					struct spi_message *msg)

					struct spi_message *msg)

{

{

	struct spi_clps711x_data *hw = spi_master_get_devdata(master);

	struct spi_device *spi = msg->spi;

	struct spi_device *spi = msg->spi;

	struct spi_transfer *xfer;





	spi_clps711x_setup_mode(spi);

	/* Setup edge for transfer */

	if (spi->mode & SPI_CPHA)

		clps_writew(clps_readw(SYSCON3) | SYSCON3_ADCCKNSEN, SYSCON3);

	else

		clps_writew(clps_readw(SYSCON3) & ~SYSCON3_ADCCKNSEN, SYSCON3);



	return 0;

}





	list_for_each_entry(xfer, &msg->transfers, transfer_list) {

static int spi_clps711x_transfer_one(struct spi_master *master,

				     struct spi_device *spi,

				     struct spi_transfer *xfer)

{

	struct spi_clps711x_data *hw = spi_master_get_devdata(master);

	u8 data;

	u8 data;





	spi_clps711x_setup_xfer(spi, xfer);

	spi_clps711x_setup_xfer(spi, xfer);





		gpio_set_value(spi->cs_gpio, !!(spi->mode & SPI_CS_HIGH));



		reinit_completion(&hw->done);



	hw->len = xfer->len;

	hw->len = xfer->len;

	hw->bpw = xfer->bits_per_word ? : spi->bits_per_word;

	hw->bpw = xfer->bits_per_word ? : spi->bits_per_word;

	hw->tx_buf = (u8 *)xfer->tx_buf;

	hw->tx_buf = (u8 *)xfer->tx_buf;
@@ -99,30 +93,14 @@ static int spi_clps711x_transfer_one_message(struct spi_master *master, 




	/* Initiate transfer */

	/* Initiate transfer */

	data = hw->tx_buf ? *hw->tx_buf++ : 0;

	data = hw->tx_buf ? *hw->tx_buf++ : 0;

		clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,

	clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN, SYNCIO);

			    SYNCIO);

	return 1;



		wait_for_completion(&hw->done);



		if (xfer->delay_usecs)

			udelay(xfer->delay_usecs);



		if (xfer->cs_change ||

		    list_is_last(&xfer->transfer_list, &msg->transfers))

			gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));



		msg->actual_length += xfer->len;

	}



	msg->status = 0;

	spi_finalize_current_message(master);



	return 0;

}

}





static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)

static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)

{

{

	struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;

	struct spi_master *master = dev_id;

	struct spi_clps711x_data *hw = spi_master_get_devdata(master);

	u8 data;

	u8 data;





	/* Handle RX */

	/* Handle RX */
@@ -136,7 +114,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id) 
		clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,

		clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,

			    SYNCIO);

			    SYNCIO);

	} else

	} else

		complete(&hw->done);

		spi_finalize_current_transfer(master);





	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}
@@ -174,7 +152,8 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
	master->bits_per_word_mask =  SPI_BPW_RANGE_MASK(1, 8);

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

	master->num_chipselect = pdata->num_chipselect;

	master->num_chipselect = pdata->num_chipselect;

	master->setup = spi_clps711x_setup;

	master->setup = spi_clps711x_setup;

	master->transfer_one_message = spi_clps711x_transfer_one_message;

	master->prepare_message = spi_clps711x_prepare_message;

	master->transfer_one = spi_clps711x_transfer_one;





	hw = spi_master_get_devdata(master);

	hw = spi_master_get_devdata(master);
@@ -200,7 +179,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
	}

	}

	hw->max_speed_hz = clk_get_rate(hw->spi_clk);

	hw->max_speed_hz = clk_get_rate(hw->spi_clk);





	init_completion(&hw->done);

	platform_set_drvdata(pdev, master);

	platform_set_drvdata(pdev, master);





	/* Disable extended mode due hardware problems */

	/* Disable extended mode due hardware problems */
@@ -210,7 +188,7 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
	clps_readl(SYNCIO);

	clps_readl(SYNCIO);





	ret = devm_request_irq(&pdev->dev, IRQ_SSEOTI, spi_clps711x_isr, 0,

	ret = devm_request_irq(&pdev->dev, IRQ_SSEOTI, spi_clps711x_isr, 0,

			       dev_name(&pdev->dev), hw);

			       dev_name(&pdev->dev), master);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "Can't request IRQ\n");

		dev_err(&pdev->dev, "Can't request IRQ\n");

		goto err_out;

		goto err_out;