mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-20 16:58:59 +03:00
[generic]: fixup mtd refresh and co.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27491 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
146c7d6f10
commit
23fde26a5c
@ -621,7 +621,7 @@
|
|||||||
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
||||||
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
||||||
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
||||||
+#define MTDREFRESH _IO('M', 23)
|
+#define MTDREFRESH _IO('M', 24)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Obsolete legacy interface. Keep it in order not to break userspace
|
* Obsolete legacy interface. Keep it in order not to break userspace
|
||||||
|
@ -259,10 +259,10 @@
|
|||||||
|
|
||||||
--- a/drivers/mtd/mtdchar.c
|
--- a/drivers/mtd/mtdchar.c
|
||||||
+++ b/drivers/mtd/mtdchar.c
|
+++ b/drivers/mtd/mtdchar.c
|
||||||
@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
|
@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
|
||||||
file->f_pos = 0;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
+#ifdef CONFIG_MTD_PARTITIONS
|
+#ifdef CONFIG_MTD_PARTITIONS
|
||||||
+ case MTDREFRESH:
|
+ case MTDREFRESH:
|
||||||
+ {
|
+ {
|
||||||
@ -271,8 +271,8 @@
|
|||||||
+ }
|
+ }
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
case OTPGETREGIONCOUNT:
|
default:
|
||||||
case OTPGETREGIONINFO:
|
ret = -ENOTTY;
|
||||||
--- a/include/linux/mtd/mtd.h
|
--- a/include/linux/mtd/mtd.h
|
||||||
+++ b/include/linux/mtd/mtd.h
|
+++ b/include/linux/mtd/mtd.h
|
||||||
@@ -125,6 +125,7 @@ struct nand_ecclayout {
|
@@ -125,6 +125,7 @@ struct nand_ecclayout {
|
||||||
@ -325,7 +325,7 @@
|
|||||||
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
||||||
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
||||||
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
||||||
+#define MTDREFRESH _IO('M', 23)
|
+#define MTDREFRESH _IO('M', 24)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Obsolete legacy interface. Keep it in order not to break userspace
|
* Obsolete legacy interface. Keep it in order not to break userspace
|
||||||
|
@ -260,10 +260,10 @@
|
|||||||
|
|
||||||
--- a/drivers/mtd/mtdchar.c
|
--- a/drivers/mtd/mtdchar.c
|
||||||
+++ b/drivers/mtd/mtdchar.c
|
+++ b/drivers/mtd/mtdchar.c
|
||||||
@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
|
@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
|
||||||
file->f_pos = 0;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
+#ifdef CONFIG_MTD_PARTITIONS
|
+#ifdef CONFIG_MTD_PARTITIONS
|
||||||
+ case MTDREFRESH:
|
+ case MTDREFRESH:
|
||||||
+ {
|
+ {
|
||||||
@ -272,8 +272,8 @@
|
|||||||
+ }
|
+ }
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
case OTPGETREGIONCOUNT:
|
default:
|
||||||
case OTPGETREGIONINFO:
|
ret = -ENOTTY;
|
||||||
--- a/include/linux/mtd/mtd.h
|
--- a/include/linux/mtd/mtd.h
|
||||||
+++ b/include/linux/mtd/mtd.h
|
+++ b/include/linux/mtd/mtd.h
|
||||||
@@ -125,6 +125,7 @@ struct nand_ecclayout {
|
@@ -125,6 +125,7 @@ struct nand_ecclayout {
|
||||||
@ -326,7 +326,7 @@
|
|||||||
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
||||||
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
||||||
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
||||||
+#define MTDREFRESH _IO('M', 23)
|
+#define MTDREFRESH _IO('M', 24)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Obsolete legacy interface. Keep it in order not to break userspace
|
* Obsolete legacy interface. Keep it in order not to break userspace
|
||||||
|
@ -260,10 +260,10 @@
|
|||||||
|
|
||||||
--- a/drivers/mtd/mtdchar.c
|
--- a/drivers/mtd/mtdchar.c
|
||||||
+++ b/drivers/mtd/mtdchar.c
|
+++ b/drivers/mtd/mtdchar.c
|
||||||
@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
|
@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
|
||||||
file->f_pos = 0;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
+#ifdef CONFIG_MTD_PARTITIONS
|
+#ifdef CONFIG_MTD_PARTITIONS
|
||||||
+ case MTDREFRESH:
|
+ case MTDREFRESH:
|
||||||
+ {
|
+ {
|
||||||
@ -272,8 +272,8 @@
|
|||||||
+ }
|
+ }
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
case OTPGETREGIONCOUNT:
|
default:
|
||||||
case OTPGETREGIONINFO:
|
ret = -ENOTTY;
|
||||||
--- a/include/linux/mtd/mtd.h
|
--- a/include/linux/mtd/mtd.h
|
||||||
+++ b/include/linux/mtd/mtd.h
|
+++ b/include/linux/mtd/mtd.h
|
||||||
@@ -125,6 +125,7 @@ struct nand_ecclayout {
|
@@ -125,6 +125,7 @@ struct nand_ecclayout {
|
||||||
@ -325,7 +325,7 @@
|
|||||||
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
||||||
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
||||||
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
||||||
+#define MTDREFRESH _IO('M', 23)
|
+#define MTDREFRESH _IO('M', 24)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Obsolete legacy interface. Keep it in order not to break userspace
|
* Obsolete legacy interface. Keep it in order not to break userspace
|
||||||
|
@ -257,18 +257,19 @@
|
|||||||
|
|
||||||
--- a/drivers/mtd/mtdchar.c
|
--- a/drivers/mtd/mtdchar.c
|
||||||
+++ b/drivers/mtd/mtdchar.c
|
+++ b/drivers/mtd/mtdchar.c
|
||||||
@@ -834,6 +834,11 @@ static int mtd_ioctl(struct file *file,
|
@@ -948,6 +948,12 @@ static int mtd_ioctl(struct file *file,
|
||||||
file->f_pos = 0;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ case MTDREFRESH:
|
+ case MTDREFRESH:
|
||||||
+ {
|
+ {
|
||||||
+ ret = mtd_device_refresh(mtd);
|
+ ret = mtd_device_refresh(mtd);
|
||||||
+ break;
|
+ break;
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
case OTPGETREGIONCOUNT:
|
default:
|
||||||
case OTPGETREGIONINFO:
|
ret = -ENOTTY;
|
||||||
|
}
|
||||||
--- a/include/linux/mtd/mtd.h
|
--- a/include/linux/mtd/mtd.h
|
||||||
+++ b/include/linux/mtd/mtd.h
|
+++ b/include/linux/mtd/mtd.h
|
||||||
@@ -125,6 +125,7 @@ struct nand_ecclayout {
|
@@ -125,6 +125,7 @@ struct nand_ecclayout {
|
||||||
@ -314,3 +315,13 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
#define MTDPART_OFS_NXTBLK (-2)
|
#define MTDPART_OFS_NXTBLK (-2)
|
||||||
|
--- a/include/mtd/mtd-abi.h
|
||||||
|
+++ b/include/mtd/mtd-abi.h
|
||||||
|
@@ -127,6 +127,7 @@ struct otp_info {
|
||||||
|
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
|
||||||
|
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
|
||||||
|
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
|
||||||
|
+#define MTDREFRESH _IO('M', 24)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Obsolete legacy interface. Keep it in order not to break userspace
|
||||||
|
Loading…
Reference in New Issue
Block a user