#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 */
 
                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 {