3d92e05118
Commit bf4289cba0 ("ATMEL: fix nand ecc support") indicated that it
wanted to "Move platform data to a common header
include/linux/platform_data/atmel_nand.h" and the new header even had
re-include protectors with:
#ifndef __ATMEL_NAND_H__
However, the file that was added was simply called atmel.h
and this caused avr32 defconfig to fail with:
In file included from arch/avr32/boards/atstk1000/setup.c:22:
arch/avr32/mach-at32ap/include/mach/board.h:10:44: error: linux/platform_data/atmel_nand.h: No such file or directory
In file included from arch/avr32/boards/atstk1000/setup.c:22:
arch/avr32/mach-at32ap/include/mach/board.h:121: warning: 'struct atmel_nand_data' declared inside parameter list
arch/avr32/mach-at32ap/include/mach/board.h:121: warning: its scope is only this definition or declaration, which is probably not what you want
make[2]: *** [arch/avr32/boards/atstk1000/setup.o] Error 1
It seems the scope of the file contents will expand beyond
just nand, so ignore the original intention, and fix up the
users who reference the bad name with the _nand suffix.
CC: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
CC: David Woodhouse <dwmw2@infradead.org>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
28 lines
639 B
C
28 lines
639 B
C
/*
|
|
* atmel platform data
|
|
*
|
|
* GPL v2 Only
|
|
*/
|
|
|
|
#ifndef __ATMEL_H__
|
|
#define __ATMEL_H__
|
|
|
|
#include <linux/mtd/nand.h>
|
|
|
|
/* NAND / SmartMedia */
|
|
struct atmel_nand_data {
|
|
int enable_pin; /* chip enable */
|
|
int det_pin; /* card detect */
|
|
int rdy_pin; /* ready/busy */
|
|
u8 rdy_pin_active_low; /* rdy_pin value is inverted */
|
|
u8 ale; /* address line number connected to ALE */
|
|
u8 cle; /* address line number connected to CLE */
|
|
u8 bus_width_16; /* buswidth is 16 bit */
|
|
u8 ecc_mode; /* ecc mode */
|
|
u8 on_flash_bbt; /* bbt on flash */
|
|
struct mtd_partition *parts;
|
|
unsigned int num_parts;
|
|
};
|
|
|
|
#endif /* __ATMEL_H__ */
|