X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fspi%2Fatmel_spi.c;h=1d8a2f6bb8ebada212ad8d9617825bd9b96958ab;hb=refs%2Fheads%2Fkvme080;hp=c2a9fef58edcc3e9d29235233aa24c7a83a63ca9;hpb=ef29498655b18d2bfd69048e20835d19333981ab;p=powerpc.git

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c2a9fef58e..1d8a2f6bb8 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
+#include <asm/arch/cpu.h>
 
 #include "atmel_spi.h"
 
@@ -421,7 +422,7 @@ static int atmel_spi_setup(struct spi_device *spi)
 		if (ret)
 			return ret;
 		spi->controller_state = (void *)npcs_pin;
-		gpio_direction_output(npcs_pin);
+		gpio_direction_output(npcs_pin, !(spi->mode & SPI_CS_HIGH));
 	}
 
 	dev_dbg(&spi->dev,
@@ -491,7 +492,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
 	return 0;
 }
 
-static void atmel_spi_cleanup(const struct spi_device *spi)
+static void atmel_spi_cleanup(struct spi_device *spi)
 {
 	if (spi->controller_state)
 		gpio_free((unsigned int)spi->controller_data);
@@ -548,10 +549,8 @@ static int __init atmel_spi_probe(struct platform_device *pdev)
 		goto out_free_buffer;
 	as->irq = irq;
 	as->clk = clk;
-#ifdef CONFIG_ARCH_AT91
 	if (!cpu_is_at91rm9200())
 		as->new_1 = 1;
-#endif
 
 	ret = request_irq(irq, atmel_spi_interrupt, 0,
 			pdev->dev.bus_id, master);