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

Commit 170c2d0a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'spi-mcspi' into spi-next

parents 8266bdd2 2cd45179

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

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ Required properties: 
  - "ti,omap4-spi" for OMAP4+.

- ti,spi-num-cs : Number of chipselect supported  by the instance.

- ti,hwmods: Name of the hwmod associated to the McSPI

- ti,pindir-d0-in-d1-out: Select the D0 pin as input and D1 as

			  output. The default is D0 as output and

			  D1 as input.

- ti,pindir-d0-out-d1-in: Select the D0 pin as output and D1 as

			  input. The default is D0 as input and

			  D1 as output.



Example:

drivers/spi/spi-omap2-mcspi.c

+3 −3
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi, 
	/* standard 4-wire master mode:  SCK, MOSI/out, MISO/in, nCS

	 * REVISIT: this controller could support SPI_3WIRE mode.

	 */

	if (mcspi->pin_dir == MCSPI_PINDIR_D0_OUT_D1_IN) {

	if (mcspi->pin_dir == MCSPI_PINDIR_D0_IN_D1_OUT) {

		l &= ~OMAP2_MCSPI_CHCONF_IS;

		l &= ~OMAP2_MCSPI_CHCONF_DPE1;

		l |= OMAP2_MCSPI_CHCONF_DPE0;
@@ -1187,8 +1187,8 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev) 
		of_property_read_u32(node, "ti,spi-num-cs", &num_cs);

		master->num_chipselect = num_cs;

		master->bus_num = bus_num++;

		if (of_get_property(node, "ti,pindir-d0-in-d1-out", NULL))

			mcspi->pin_dir = MCSPI_PINDIR_D0_IN_D1_OUT;

		if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))

			mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;

	} else {

		pdata = pdev->dev.platform_data;

		master->num_chipselect = pdata->num_cs;

include/linux/platform_data/spi-omap2-mcspi.h

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 


#define OMAP4_MCSPI_REG_OFFSET 0x100



#define MCSPI_PINDIR_D0_OUT_D1_IN	0

#define MCSPI_PINDIR_D0_IN_D1_OUT	1

#define MCSPI_PINDIR_D0_IN_D1_OUT	0

#define MCSPI_PINDIR_D0_OUT_D1_IN	1



struct omap2_mcspi_platform_config {

	unsigned short	num_cs;