atmel_spi: remove unnecessary (and wrong) #ifdefs
Now that the cpu_is_xxx() macros are available both on AVR32 and AT91, we can remove a couple of #ifdefs from this driver. One of them is actually wrong -- new_1 should be set on AVR32 but isn't. This causes the bus clock to run at twice the speed it is configured to. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Cc: David Brownell <david-b@pacbell.net> Acked-by: Andrew Victor <andrew@sanpeople.com> Cc: Nicolas Ferre <nicolas.ferre@rfo.atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e7498281d3
commit
a1e3cf418f
|
@ -22,10 +22,7 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/arch/board.h>
|
||||
#include <asm/arch/gpio.h>
|
||||
|
||||
#ifdef CONFIG_ARCH_AT91
|
||||
#include <asm/arch/cpu.h>
|
||||
#endif
|
||||
|
||||
#include "atmel_spi.h"
|
||||
|
||||
|
@ -552,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);
|
||||
|
|
Loading…
Reference in a new issue