Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

1 files changed, 18 insertions, 1 deletions

diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index a76ab898f445..428d9122940b 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -1,5 +1,5 @@
 /*
- * $Id: mtd-abi.h,v 1.7 2004/11/23 15:37:32 gleixner Exp $
+ * $Id: mtd-abi.h,v 1.11 2005/05/19 16:08:58 gleixner Exp $
  *
  * Portions of MTD ABI definition which are shared by kernel and user space 
  */
@@ -29,6 +29,7 @@ struct mtd_oob_buf {
 #define MTD_NORFLASH            3
 #define MTD_NANDFLASH           4
 #define MTD_PEROM               5
+#define MTD_DATAFLASH           6
 #define MTD_OTHER               14
 #define MTD_UNKNOWN             15
 
@@ -60,6 +61,12 @@ struct mtd_oob_buf {
 #define MTD_NANDECC_PLACE       1       // Use the given placement in the structure (YAFFS1 legacy mode)
 #define MTD_NANDECC_AUTOPLACE   2       // Use the default placement scheme
 #define MTD_NANDECC_PLACEONLY   3       // Use the given placement in the structure (Do not store ecc result on read)
+#define MTD_NANDECC_AUTOPL_USR  4       // Use the given autoplacement scheme rather than using the default
+
+/* OTP mode selection */
+#define MTD_OTP_OFF             0
+#define MTD_OTP_FACTORY         1
+#define MTD_OTP_USER            2
 
 struct mtd_info_user {
         uint8_t type;
@@ -80,6 +87,12 @@ struct region_info_user {
         uint32_t regionindex;
 };
 
+struct otp_info {
+        uint32_t start;
+        uint32_t length;
+        uint32_t locked;
+};
+
 #define MEMGETINFO              _IOR('M', 1, struct mtd_info_user)
 #define MEMERASE                _IOW('M', 2, struct erase_info_user)
 #define MEMWRITEOOB             _IOWR('M', 3, struct mtd_oob_buf)
@@ -92,6 +105,10 @@ struct region_info_user {
 #define MEMGETOOBSEL            _IOR('M', 10, struct nand_oobinfo)
 #define MEMGETBADBLOCK          _IOW('M', 11, loff_t)
 #define MEMSETBADBLOCK          _IOW('M', 12, loff_t)
+#define OTPSELECT               _IOR('M', 13, int)
+#define OTPGETREGIONCOUNT       _IOW('M', 14, int)
+#define OTPGETREGIONINFO        _IOW('M', 15, struct otp_info)
+#define OTPLOCK         _IOR('M', 16, struct otp_info)
 
 struct nand_oobinfo {
         uint32_t useecc;