Unverified Commit 33c58c12 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx',... 

Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/topic/jcore', 'spi/topic/meson' and 'spi/topic/orion' into spi-next
parents ae324b27 230c08b2 8197f489 16eab16e a5db27c0 479c03a7

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

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ The Meson SPICC is generic SPI controller for general purpose Full-Duplex 
communications with dedicated 16 words RX/TX PIO FIFOs.



Required properties:

 - compatible: should be "amlogic,meson-gx-spicc" on Amlogic GX SoCs.

 - compatible: should be:

	"amlogic,meson-gx-spicc" on Amlogic GX and compatible SoCs.

	"amlogic,meson-axg-spicc" on Amlogic AXG and compatible SoCs

 - reg: physical base address and length of the controller registers

 - interrupts: The interrupt specifier

 - clock-names: Must contain "core"

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

+9 −0
Original line number Diff line number Diff line
@@ -18,8 +18,17 @@ Required properties: 
	The eight register sets following the control registers refer to

	chip-select lines 0 through 7 respectively.

- cell-index : Which of multiple SPI controllers is this.

- clocks : pointers to the reference clocks for this device, the first

	   one is the one used for the clock on the spi bus, the

	   second one is optional and is the clock used for the

	   functional part of the controller



Optional properties:

- interrupts : Is currently not used.

- clock-names : names of used clocks, mandatory if the second clock is

		used, the name must be "core", and "axi" (the latter

		is only for Armada 7K/8K).





Example:

       spi@10600 {

drivers/spi/spi-fsl-dspi.c

+4 −5
Original line number Diff line number Diff line
@@ -903,10 +903,9 @@ static irqreturn_t dspi_interrupt(int irq, void *dev_id) 
}



static const struct of_device_id fsl_dspi_dt_ids[] = {

	{ .compatible = "fsl,vf610-dspi", .data = (void *)&vf610_data, },

	{ .compatible = "fsl,ls1021a-v1.0-dspi",

		.data = (void *)&ls1021a_v1_data, },

	{ .compatible = "fsl,ls2085a-dspi", .data = (void *)&ls2085a_data, },

	{ .compatible = "fsl,vf610-dspi", .data = &vf610_data, },

	{ .compatible = "fsl,ls1021a-v1.0-dspi", .data = &ls1021a_v1_data, },

	{ .compatible = "fsl,ls2085a-dspi", .data = &ls2085a_data, },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, fsl_dspi_dt_ids);
@@ -980,7 +979,7 @@ static int dspi_probe(struct platform_device *pdev) 
	master->dev.of_node = pdev->dev.of_node;



	master->cleanup = dspi_cleanup;

	master->mode_bits = SPI_CPOL | SPI_CPHA;

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;

	master->bits_per_word_mask = SPI_BPW_MASK(4) | SPI_BPW_MASK(8) |

					SPI_BPW_MASK(16);

drivers/spi/spi-imx.c

+5 −6
Original line number Diff line number Diff line
@@ -1622,6 +1622,11 @@ static int spi_imx_probe(struct platform_device *pdev) 
	spi_imx->devtype_data->intctrl(spi_imx, 0);



	master->dev.of_node = pdev->dev.of_node;

	ret = spi_bitbang_start(&spi_imx->bitbang);

	if (ret) {

		dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);

		goto out_clk_put;

	}



	/* Request GPIO CS lines, if any */

	if (!spi_imx->slave_mode && master->cs_gpios) {
@@ -1640,12 +1645,6 @@ static int spi_imx_probe(struct platform_device *pdev) 
		}

	}



	ret = spi_bitbang_start(&spi_imx->bitbang);

	if (ret) {

		dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);

		goto out_clk_put;

	}



	dev_info(&pdev->dev, "probed\n");



	clk_disable(spi_imx->clk_ipg);

drivers/spi/spi-jcore.c

+3 −1
Original line number Diff line number Diff line
@@ -198,8 +198,10 @@ static int jcore_spi_probe(struct platform_device *pdev) 


	/* Register our spi controller */

	err = devm_spi_register_master(&pdev->dev, master);

	if (err)

	if (err) {

		clk_disable(clk);

		goto exit;

	}



	return 0;