Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[sfrench/cifs-2.6.git] / drivers / spi / spi-tegra114.c

diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 44550182a4a364e53ba1b62da634ca6362d2df90..a76acedd7e2f402190a3525804cc012770747fc7 100644 (file)
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -50,7 +50,7 @@
 #define SPI_IDLE_SDA_PULL_LOW                  (2 << 18)
 #define SPI_IDLE_SDA_PULL_HIGH                 (3 << 18)
 #define SPI_IDLE_SDA_MASK                      (3 << 18)
-#define SPI_CS_SS_VAL                          (1 << 20)
+#define SPI_CS_SW_VAL                          (1 << 20)
 #define SPI_CS_SW_HW                           (1 << 21)
 /* SPI_CS_POL_INACTIVE bits are default high */
                                                /* n from 0 to 3 */
@@ -705,9 +705,9 @@ static u32 tegra_spi_setup_transfer_one(struct spi_device *spi,
 
                command1 |= SPI_CS_SW_HW;
                if (spi->mode & SPI_CS_HIGH)
-                       command1 |= SPI_CS_SS_VAL;
+                       command1 |= SPI_CS_SW_VAL;
                else
-                       command1 &= ~SPI_CS_SS_VAL;
+                       command1 &= ~SPI_CS_SW_VAL;
 
                tegra_spi_writel(tspi, 0, SPI_COMMAND2);
        } else {