projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make kernel cross-compile
[powerpc.git]
/
drivers
/
spi
/
atmel_spi.c
diff --git
a/drivers/spi/atmel_spi.c
b/drivers/spi/atmel_spi.c
index
c2a9fef
..
1d8a2f6
100644
(file)
--- 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/io.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
+#include <asm/arch/cpu.h>
#include "atmel_spi.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;
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,
}
dev_dbg(&spi->dev,
@@
-491,7
+492,7
@@
static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
return 0;
}
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);
{
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;
goto out_free_buffer;
as->irq = irq;
as->clk = clk;
-#ifdef CONFIG_ARCH_AT91
if (!cpu_is_at91rm9200())
as->new_1 = 1;
if (!cpu_is_at91rm9200())
as->new_1 = 1;
-#endif
ret = request_irq(irq, atmel_spi_interrupt, 0,
pdev->dev.bus_id, master);
ret = request_irq(irq, atmel_spi_interrupt, 0,
pdev->dev.bus_id, master);