tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'spi-mcspi' into spi-next
+8
-8
+3
-3
Documentation/devicetree/bindings/spi/omap-spi.txt
+3
-3
Documentation/devicetree/bindings/spi/omap-spi.txt
···
6
6
- "ti,omap4-spi" for OMAP4+.
7
7
- ti,spi-num-cs : Number of chipselect supported by the instance.
8
8
- ti,hwmods: Name of the hwmod associated to the McSPI
9
-
- ti,pindir-d0-in-d1-out: Select the D0 pin as input and D1 as
10
-
output. The default is D0 as output and
11
-
D1 as input.
9
+
- ti,pindir-d0-out-d1-in: Select the D0 pin as output and D1 as
10
+
input. The default is D0 as input and
11
+
D1 as output.
12
12
13
13
Example:
14
14
+3
-3
drivers/spi/spi-omap2-mcspi.c
+3
-3
drivers/spi/spi-omap2-mcspi.c
···
765
765
/* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS
766
766
* REVISIT: this controller could support SPI_3WIRE mode.
767
767
*/
768
-
if (mcspi->pin_dir == MCSPI_PINDIR_D0_OUT_D1_IN) {
768
+
if (mcspi->pin_dir == MCSPI_PINDIR_D0_IN_D1_OUT) {
769
769
l &= ~OMAP2_MCSPI_CHCONF_IS;
770
770
l &= ~OMAP2_MCSPI_CHCONF_DPE1;
771
771
l |= OMAP2_MCSPI_CHCONF_DPE0;
···
1187
1187
of_property_read_u32(node, "ti,spi-num-cs", &num_cs);
1188
1188
master->num_chipselect = num_cs;
1189
1189
master->bus_num = bus_num++;
1190
-
if (of_get_property(node, "ti,pindir-d0-in-d1-out", NULL))
1191
-
mcspi->pin_dir = MCSPI_PINDIR_D0_IN_D1_OUT;
1190
+
if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))
1191
+
mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
1192
1192
} else {
1193
1193
pdata = pdev->dev.platform_data;
1194
1194
master->num_chipselect = pdata->num_cs;
+2
-2
include/linux/platform_data/spi-omap2-mcspi.h
+2
-2
include/linux/platform_data/spi-omap2-mcspi.h