KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixup mtd refresh and co.

Browse source 
SVN-Revision: 27491
This commit is contained in:
Imre Kaloz 2011-07-06 12:55:21 +00:00
parent f24764a372
commit 90bd74dd8b
5 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/generic/patches-2.6.36/065-rootfs_split.patch
View file

@ -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

10
target/linux/generic/patches-2.6.37/400-rootfs_split.patch
View file

@ -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

10
target/linux/generic/patches-2.6.38/400-rootfs_split.patch
View file

@ -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

10
target/linux/generic/patches-2.6.39/400-rootfs_split.patch
View file

@ -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

21
target/linux/generic/patches-3.0/400-rootfs_split.patch
View file

@ -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