summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/include/mach/board.h
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-03-05 05:00:46 +0100
committerRob Herring <rob.herring@calxeda.com>2012-03-05 05:00:46 +0100
commitd50673ed97a7ce609cf62bcd40c57517ada31806 (patch)
treede1464fe1a4126be6b34762015afb8ad8a90a2f0 /arch/arm/mach-at91/include/mach/board.h
parentMerge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlin... (diff)
parentMerge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at9... (diff)
downloadlinux-d50673ed97a7ce609cf62bcd40c57517ada31806.tar.xz
linux-d50673ed97a7ce609cf62bcd40c57517ada31806.zip
Merge remote-tracking branch 'arm-soc/at91/base2+cleanup' into cleanup-base
Diffstat (limited to 'arch/arm/mach-at91/include/mach/board.h')
-rw-r--r--arch/arm/mach-at91/include/mach/board.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index 3b33f07b1e11..dc8d6d4f17cf 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -107,6 +107,8 @@ struct atmel_nand_data {
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 correction_cap; /* PMECC correction capability */
+ u16 sector_size; /* Sector size for PMECC */
struct mtd_partition *parts;
unsigned int num_parts;
};
@@ -179,7 +181,9 @@ extern void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data);
extern void __init at91_add_device_ac97(struct ac97c_platform_data *data);
/* ISI */
-extern void __init at91_add_device_isi(void);
+struct isi_platform_data;
+extern void __init at91_add_device_isi(struct isi_platform_data *data,
+ bool use_pck_as_mck);
/* Touchscreen Controller */
struct at91_tsadcc_data {