The patch titled
atmel_spi: remove unnecessary (and wrong) #ifdefs
has been added to the -mm tree. Its filename is
atmel_spi-remove-unnecessary-and-wrong-ifdefs.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: atmel_spi: remove unnecessary (and wrong) #ifdefs
From: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
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@xxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Acked-by: Andrew Victor <andrew@xxxxxxxxxxxxx>
Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/spi/atmel_spi.c | 5 -----
1 files changed, 5 deletions(-)
diff -puN drivers/spi/atmel_spi.c~atmel_spi-remove-unnecessary-and-wrong-ifdefs drivers/spi/atmel_spi.c
--- a/drivers/spi/atmel_spi.c~atmel_spi-remove-unnecessary-and-wrong-ifdefs
+++ a/drivers/spi/atmel_spi.c
@@ -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
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);
_
Patches currently in -mm which might be from hskinnemoen@xxxxxxxxx are
origin.patch
git-avr32.patch
use-common-cpu_is_xxx-macros-on-at91-and-avr32.patch
atmel_spi-remove-unnecessary-and-wrong-ifdefs.patch
markers-add-instrumentation-markers-menus-to-avr32.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
