Commit 96bf4019 authored by Qipan Li's avatar Qipan Li Committed by Mark Brown
Browse files

spi: sirf: request and free cs gpio in setup and cleanup callbacks 



move spi controller's gpio request work out from probe() to spi device
register stage, so after spi device register spi controller can deactive
device's gpio chipselect. old code can't do it because gpio request has
not be done until device register is finised in spi_bitbang_start.
and add cleanup function to free CS gpio.

Signed-off-by: default avatarQipan Li <Qipan.Li@csr.com>
Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f08654a2

drivers/spi/spi-sirf.c

+37 −18
Original line number Diff line number Diff line
@@ -631,14 +631,47 @@ spi_sirfsoc_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 
static int spi_sirfsoc_setup(struct spi_device *spi)

{

	struct sirfsoc_spi *sspi;

	int ret = 0;



	sspi = spi_master_get_devdata(spi->master);



	if (spi->cs_gpio == -ENOENT)

		sspi->hw_cs = true;

	else

	else {

		sspi->hw_cs = false;

	return spi_sirfsoc_setup_transfer(spi, NULL);

		if (!spi_get_ctldata(spi)) {

			void *cs = kmalloc(sizeof(int), GFP_KERNEL);

			if (!cs) {

				ret = -ENOMEM;

				goto exit;

			}

			ret = gpio_is_valid(spi->cs_gpio);

			if (!ret) {

				dev_err(&spi->dev, "no valid gpio\n");

				ret = -ENOENT;

				goto exit;

			}

			ret = gpio_request(spi->cs_gpio, DRIVER_NAME);

			if (ret) {

				dev_err(&spi->dev, "failed to request gpio\n");

				goto exit;

			}

			spi_set_ctldata(spi, cs);

		}

	}

	writel(readl(sspi->base + SIRFSOC_SPI_CTRL) | SIRFSOC_SPI_CS_IO_MODE,

			sspi->base + SIRFSOC_SPI_CTRL);

	spi_sirfsoc_chipselect(spi, BITBANG_CS_INACTIVE);

exit:

	return ret;

}



static void spi_sirfsoc_cleanup(struct spi_device *spi)

{

	if (spi_get_ctldata(spi)) {

		gpio_free(spi->cs_gpio);

		kfree(spi_get_ctldata(spi));

	}

}



static int spi_sirfsoc_probe(struct platform_device *pdev)
@@ -647,7 +680,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) 
	struct spi_master *master;

	struct resource *mem_res;

	int irq;

	int i, ret;

	int ret;



	ret = device_reset(&pdev->dev);

	if (ret) {
@@ -685,6 +718,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) 
	sspi->bitbang.setup_transfer = spi_sirfsoc_setup_transfer;

	sspi->bitbang.txrx_bufs = spi_sirfsoc_transfer;

	sspi->bitbang.master->setup = spi_sirfsoc_setup;

	sspi->bitbang.master->cleanup = spi_sirfsoc_cleanup;

	master->bus_num = pdev->id;

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

	master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(12) |
@@ -733,21 +767,6 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) 
	ret = spi_bitbang_start(&sspi->bitbang);

	if (ret)

		goto free_dummypage;

	for (i = 0; master->cs_gpios && i < master->num_chipselect; i++) {

		if (master->cs_gpios[i] == -ENOENT)

			continue;

		if (!gpio_is_valid(master->cs_gpios[i])) {

			dev_err(&pdev->dev, "no valid gpio\n");

			ret = -EINVAL;

			goto free_dummypage;

		}

		ret = devm_gpio_request(&pdev->dev,

				master->cs_gpios[i], DRIVER_NAME);

		if (ret) {

			dev_err(&pdev->dev, "failed to request gpio\n");

			goto free_dummypage;

		}

	}

	dev_info(&pdev->dev, "registerred, bus number = %d\n", master->bus_num);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE