Merge branch 'spi-mcspi' into spi-next

3 files changed, 8 insertions, 8 deletions

diff --git a/Documentation/devicetree/bindings/spi/omap-spi.txt b/Documentation/devicetree/bindings/spi/omap-spi.txt
index 2ef0a6b85653..938809c6829b 100644
--- a/Documentation/devicetree/bindings/spi/omap-spi.txt
+++ b/Documentation/devicetree/bindings/spi/omap-spi.txt
@@ -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:
 
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 643e7e27aa47..cc4f2dd89b50 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -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;
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h
index ce70f7b5a8e1..a65572d53211 100644
--- a/include/linux/platform_data/spi-omap2-mcspi.h
+++ b/include/linux/platform_data/spi-omap2-mcspi.h
@@ -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;