  		if (as->use_cs_gpios && spi->chip_select != 0)
  			gpio_set_value(asd->npcs_pin, active);
  		spi_writel(as, MR, mr);
-@@ -406,12 +416,18 @@
+@@ -406,12 +416,18 @@ static void cs_deactivate(struct atmel_s
  	struct atmel_spi_device *asd = spi->controller_state;
  	unsigned active = spi->mode & SPI_CS_HIGH;
  	u32 mr;

--- drivers/spi/spi-atmel.c	2017-12-19 16:57:06.980960647 -0600
+++ new-spi-atmel.c	2017-12-19 17:12:09.740960647 -0600
@@ -353,22 +353,32 @@
 	struct atmel_spi_device *asd = spi->controller_state;
 	unsigned active = spi->mode & SPI_CS_HIGH;
 	u32 mr;

 					| SPI_BIT(MODFDIS)
 					| SPI_BIT(MSTR));
 		}
@@ -390,7 +400,7 @@ static void cs_activate(struct atmel_spi
 		}
 
 		mr = spi_readl(as, MR);
