Commit 94b0955d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl',... 

Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl', 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/sirf' into spi-linus
parents 9e82bf01 6e7488f8 a97c883a d9f26748 61e89e65 6e3be9bb 810a58b0

Documentation/devicetree/bindings/spi/spi-rockchip.txt

+6 −2
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ Required Properties: 
- clocks: Must contain an entry for each entry in clock-names.

- clock-names: Shall be "spiclk" for the transfer-clock, and "apb_pclk" for

			   the peripheral clock.

- #address-cells: should be 1.

- #size-cells: should be 0.



Optional Properties:



- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,

		Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request names should include "tx" and "rx" if present.

- #address-cells: should be 1.

- #size-cells: should be 0.





Example:

drivers/spi/spi-davinci.c

+25 −14
Original line number Diff line number Diff line
@@ -397,24 +397,21 @@ static int davinci_spi_setup(struct spi_device *spi) 
	struct spi_master *master = spi->master;

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

	bool internal_cs = true;

	unsigned long flags = GPIOF_DIR_OUT;



	dspi = spi_master_get_devdata(spi->master);

	pdata = &dspi->pdata;



	flags |= (spi->mode & SPI_CS_HIGH) ? GPIOF_INIT_LOW : GPIOF_INIT_HIGH;



	if (!(spi->mode & SPI_NO_CS)) {

		if (np && (master->cs_gpios != NULL) && (spi->cs_gpio >= 0)) {

			retval = gpio_request_one(spi->cs_gpio,

						  flags, dev_name(&spi->dev));

			retval = gpio_direction_output(

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

			internal_cs = false;

		} else if (pdata->chip_sel &&

			   spi->chip_select < pdata->num_chipselect &&

			   pdata->chip_sel[spi->chip_select] != SPI_INTERN_CS) {

			spi->cs_gpio = pdata->chip_sel[spi->chip_select];

			retval = gpio_request_one(spi->cs_gpio,

						  flags, dev_name(&spi->dev));

			retval = gpio_direction_output(

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

			internal_cs = false;

		}
@@ -439,12 +436,6 @@ static int davinci_spi_setup(struct spi_device *spi) 
	return retval;

}



static void davinci_spi_cleanup(struct spi_device *spi)

{

	if (spi->cs_gpio >= 0)

		gpio_free(spi->cs_gpio);

}



static int davinci_spi_check_error(struct davinci_spi *dspi, int int_status)

{

	struct device *sdev = dspi->bitbang.master->dev.parent;
@@ -956,7 +947,6 @@ static int davinci_spi_probe(struct platform_device *pdev) 
	master->num_chipselect = pdata->num_chipselect;

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

	master->setup = davinci_spi_setup;

	master->cleanup = davinci_spi_cleanup;



	dspi->bitbang.chipselect = davinci_spi_chipselect;

	dspi->bitbang.setup_transfer = davinci_spi_setup_transfer;
@@ -967,6 +957,27 @@ static int davinci_spi_probe(struct platform_device *pdev) 
	if (dspi->version == SPI_VERSION_2)

		dspi->bitbang.flags |= SPI_READY;



	if (pdev->dev.of_node) {

		int i;



		for (i = 0; i < pdata->num_chipselect; i++) {

			int cs_gpio = of_get_named_gpio(pdev->dev.of_node,

							"cs-gpios", i);



			if (cs_gpio == -EPROBE_DEFER) {

				ret = cs_gpio;

				goto free_clk;

			}



			if (gpio_is_valid(cs_gpio)) {

				ret = devm_gpio_request(&pdev->dev, cs_gpio,

							dev_name(&pdev->dev));

				if (ret)

					goto free_clk;

			}

		}

	}



	r = platform_get_resource(pdev, IORESOURCE_DMA, 0);

	if (r)

		dma_rx_chan = r->start;

drivers/spi/spi-dw.c

+10 −2
Original line number Diff line number Diff line
@@ -547,8 +547,7 @@ static int dw_spi_setup(struct spi_device *spi) 
	/* Only alloc on first setup */

	chip = spi_get_ctldata(spi);

	if (!chip) {

		chip = devm_kzalloc(&spi->dev, sizeof(struct chip_data),

				GFP_KERNEL);

		chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);

		if (!chip)

			return -ENOMEM;

		spi_set_ctldata(spi, chip);
@@ -606,6 +605,14 @@ static int dw_spi_setup(struct spi_device *spi) 
	return 0;

}



static void dw_spi_cleanup(struct spi_device *spi)

{

	struct chip_data *chip = spi_get_ctldata(spi);



	kfree(chip);

	spi_set_ctldata(spi, NULL);

}



/* Restart the controller, disable all interrupts, clean rx fifo */

static void spi_hw_init(struct dw_spi *dws)

{
@@ -661,6 +668,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) 
	master->bus_num = dws->bus_num;

	master->num_chipselect = dws->num_cs;

	master->setup = dw_spi_setup;

	master->cleanup = dw_spi_cleanup;

	master->transfer_one_message = dw_spi_transfer_one_message;

	master->max_speed_hz = dws->max_freq;

drivers/spi/spi-fsl-espi.c

+12 −3
Original line number Diff line number Diff line
@@ -452,16 +452,16 @@ static int fsl_espi_setup(struct spi_device *spi) 
	int retval;

	u32 hw_mode;

	u32 loop_mode;

	struct spi_mpc8xxx_cs *cs = spi->controller_state;

	struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);



	if (!spi->max_speed_hz)

		return -EINVAL;



	if (!cs) {

		cs = devm_kzalloc(&spi->dev, sizeof(*cs), GFP_KERNEL);

		cs = kzalloc(sizeof(*cs), GFP_KERNEL);

		if (!cs)

			return -ENOMEM;

		spi->controller_state = cs;

		spi_set_ctldata(spi, cs);

	}



	mpc8xxx_spi = spi_master_get_devdata(spi->master);
@@ -496,6 +496,14 @@ static int fsl_espi_setup(struct spi_device *spi) 
	return 0;

}



static void fsl_espi_cleanup(struct spi_device *spi)

{

	struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);



	kfree(cs);

	spi_set_ctldata(spi, NULL);

}



void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)

{

	struct fsl_espi_reg *reg_base = mspi->reg_base;
@@ -605,6 +613,7 @@ static struct spi_master * fsl_espi_probe(struct device *dev, 


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

	master->setup = fsl_espi_setup;

	master->cleanup = fsl_espi_cleanup;



	mpc8xxx_spi = spi_master_get_devdata(master);

	mpc8xxx_spi->spi_do_one_msg = fsl_espi_do_one_msg;

drivers/spi/spi-fsl-spi.c

+7 −3
Original line number Diff line number Diff line
@@ -425,16 +425,16 @@ static int fsl_spi_setup(struct spi_device *spi) 
	struct fsl_spi_reg *reg_base;

	int retval;

	u32 hw_mode;

	struct spi_mpc8xxx_cs	*cs = spi->controller_state;

	struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);



	if (!spi->max_speed_hz)

		return -EINVAL;



	if (!cs) {

		cs = devm_kzalloc(&spi->dev, sizeof(*cs), GFP_KERNEL);

		cs = kzalloc(sizeof(*cs), GFP_KERNEL);

		if (!cs)

			return -ENOMEM;

		spi->controller_state = cs;

		spi_set_ctldata(spi, cs);

	}

	mpc8xxx_spi = spi_master_get_devdata(spi->master);
@@ -496,9 +496,13 @@ static int fsl_spi_setup(struct spi_device *spi) 
static void fsl_spi_cleanup(struct spi_device *spi)

{

	struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(spi->master);

	struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);



	if (mpc8xxx_spi->type == TYPE_GRLIB && gpio_is_valid(spi->cs_gpio))

		gpio_free(spi->cs_gpio);



	kfree(cs);

	spi_set_ctldata(spi, NULL);

}



static void fsl_spi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)