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

Commit c833ff73 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown
Browse files

spi: sh-msiof: Move clock management to (un)prepare_message() 



Move clock management and pin configuration from the bitbang chipselect()
method to the SPI core prepare_message() and unprepare_message() methods.

As spi_master.{,un}prepare_message() is guaranteed to be called in
matching pairs, the clock management synchronization is no longer needed.

As sh_msiof_spi_set_pin_regs() is no longer called at spi_master.setup()
time (through spi_bitbang_setup() and the spi_bitbang.chipselect()
callback), we now have to take care of that ourselves.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent beb74bb0

drivers/spi/spi-sh-msiof.c

+38 −23
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct sh_msiof_spi_priv { 
	const struct sh_msiof_chipdata *chipdata;

	struct sh_msiof_spi_info *info;

	struct completion done;

	unsigned long flags;

	int tx_fifo_size;

	int rx_fifo_size;

};
@@ -459,6 +458,7 @@ static int sh_msiof_spi_setup_transfer(struct spi_device *spi, 
static int sh_msiof_spi_setup(struct spi_device *spi)

{

	struct device_node	*np = spi->master->dev.of_node;

	struct sh_msiof_spi_priv *p = spi_master_get_devdata(spi->master);



	if (!np) {

		/*
@@ -468,25 +468,24 @@ static int sh_msiof_spi_setup(struct spi_device *spi) 
		spi->cs_gpio = (uintptr_t)spi->controller_data;

	}



	/* Configure pins before deasserting CS */

	sh_msiof_spi_set_pin_regs(p, !!(spi->mode & SPI_CPOL),

				  !!(spi->mode & SPI_CPHA),

				  !!(spi->mode & SPI_3WIRE),

				  !!(spi->mode & SPI_LSB_FIRST),

				  !!(spi->mode & SPI_CS_HIGH));



	return spi_bitbang_setup(spi);

}



static void sh_msiof_spi_chipselect(struct spi_device *spi, int is_on)

static int sh_msiof_prepare_message(struct spi_master *master,

				    struct spi_message *msg)

{

	struct sh_msiof_spi_priv *p = spi_master_get_devdata(spi->master);

	int value;

	struct sh_msiof_spi_priv *p = spi_master_get_devdata(master);

	const struct spi_device *spi = msg->spi;



	/* chip select is active low unless SPI_CS_HIGH is set */

	if (spi->mode & SPI_CS_HIGH)

		value = (is_on == BITBANG_CS_ACTIVE) ? 1 : 0;

	else

		value = (is_on == BITBANG_CS_ACTIVE) ? 0 : 1;



	if (is_on == BITBANG_CS_ACTIVE) {

		if (!test_and_set_bit(0, &p->flags)) {

	pm_runtime_get_sync(&p->pdev->dev);

	clk_enable(p->clk);

		}



	/* Configure pins before asserting CS */

	sh_msiof_spi_set_pin_regs(p, !!(spi->mode & SPI_CPOL),
@@ -494,17 +493,31 @@ static void sh_msiof_spi_chipselect(struct spi_device *spi, int is_on) 
				  !!(spi->mode & SPI_3WIRE),

				  !!(spi->mode & SPI_LSB_FIRST),

				  !!(spi->mode & SPI_CS_HIGH));

	return 0;

}



	if (spi->cs_gpio >= 0)

		gpio_set_value(spi->cs_gpio, value);

static int sh_msiof_unprepare_message(struct spi_master *master,

				      struct spi_message *msg)

{

	struct sh_msiof_spi_priv *p = spi_master_get_devdata(master);



	if (is_on == BITBANG_CS_INACTIVE) {

		if (test_and_clear_bit(0, &p->flags)) {

	clk_disable(p->clk);

	pm_runtime_put(&p->pdev->dev);

	return 0;

}

	}



static void sh_msiof_spi_chipselect(struct spi_device *spi, int is_on)

{

	int value;



	/* chip select is active low unless SPI_CS_HIGH is set */

	if (spi->mode & SPI_CS_HIGH)

		value = (is_on == BITBANG_CS_ACTIVE) ? 1 : 0;

	else

		value = (is_on == BITBANG_CS_ACTIVE) ? 0 : 1;



	if (spi->cs_gpio >= 0)

		gpio_set_value(spi->cs_gpio, value);

}



static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
@@ -811,6 +824,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) 
	master->num_chipselect = p->info->num_chipselect;

	master->setup = sh_msiof_spi_setup;

	master->cleanup = spi_bitbang_cleanup;

	master->prepare_message = sh_msiof_prepare_message;

	master->unprepare_message = sh_msiof_unprepare_message;



	p->bitbang.master = master;

	p->bitbang.chipselect = sh_msiof_spi_chipselect;