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

ar71xx: make ar934x_nfc driver compatible with 3.7

Browse source 
Also add compatibility patches for the currently
supported kernels.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34278
This commit is contained in:
Gabor Juhos 2012-11-20 16:29:42 +00:00
parent 4468fd7ae4
commit 8194237789
4 changed files with 59 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
View file

@ -762,18 +762,6 @@ ar934x_nfc_read_buf(struct mtd_info *mtd, u8 *buf, int len)
nfc->buf_index = buf_index;
}
static int
ar934x_nfc_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
{
int i;
for (i = 0; i < len; i++)
if (buf[i] != ar934x_nfc_read_byte(mtd))
return -EFAULT;
return 0;
}
static void
ar934x_nfc_hw_init(struct ar934x_nfc *nfc)
{
@ -1059,7 +1047,6 @@ ar934x_nfc_probe(struct platform_device *pdev)
nand->read_byte = ar934x_nfc_read_byte;
nand->write_buf = ar934x_nfc_write_buf;
nand->read_buf = ar934x_nfc_read_buf;
nand->verify_buf = ar934x_nfc_verify_buf;
nand->select_chip = ar934x_nfc_select_chip;
ret = ar934x_nfc_alloc_buf(nfc, AR934X_NFC_ID_BUF_SIZE);

2
target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch
View file

@ -1,7 +1,7 @@
reverted:
--- a/drivers/mtd/nand/ar934x_nfc.c
+++ b/drivers/mtd/nand/ar934x_nfc.c
@@ -1051,6 +1051,7 @@ ar934x_nfc_probe(struct platform_device
@@ -1039,6 +1039,7 @@ ar934x_nfc_probe(struct platform_device
else
mtd->name = dev_name(&pdev->dev);

29
target/linux/ar71xx/patches-3.3/a05-ar934x_nfc-add-buffer-verification.patch Normal file
View file

@ -0,0 +1,29 @@
--- a/drivers/mtd/nand/ar934x_nfc.c
+++ b/drivers/mtd/nand/ar934x_nfc.c
@@ -762,6 +762,18 @@ ar934x_nfc_read_buf(struct mtd_info *mtd
nfc->buf_index = buf_index;
}
+static int
+ar934x_nfc_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
+{
+ int i;
+
+ for (i = 0; i < len; i++)
+ if (buf[i] != ar934x_nfc_read_byte(mtd))
+ return -EFAULT;
+
+ return 0;
+}
+
static void
ar934x_nfc_hw_init(struct ar934x_nfc *nfc)
{
@@ -1048,6 +1060,7 @@ ar934x_nfc_probe(struct platform_device
nand->read_byte = ar934x_nfc_read_byte;
nand->write_buf = ar934x_nfc_write_buf;
nand->read_buf = ar934x_nfc_read_buf;
+ nand->verify_buf = ar934x_nfc_verify_buf;
nand->select_chip = ar934x_nfc_select_chip;
ret = ar934x_nfc_alloc_buf(nfc, AR934X_NFC_ID_BUF_SIZE);

29
target/linux/ar71xx/patches-3.6/a05-ar934x_nfc-add-buffer-verification.patch Normal file
View file

@ -0,0 +1,29 @@
--- a/drivers/mtd/nand/ar934x_nfc.c
+++ b/drivers/mtd/nand/ar934x_nfc.c
@@ -762,6 +762,18 @@ ar934x_nfc_read_buf(struct mtd_info *mtd
nfc->buf_index = buf_index;
}
+static int
+ar934x_nfc_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
+{
+ int i;
+
+ for (i = 0; i < len; i++)
+ if (buf[i] != ar934x_nfc_read_byte(mtd))
+ return -EFAULT;
+
+ return 0;
+}
+
static void
ar934x_nfc_hw_init(struct ar934x_nfc *nfc)
{
@@ -1048,6 +1060,7 @@ ar934x_nfc_probe(struct platform_device
nand->read_byte = ar934x_nfc_read_byte;
nand->write_buf = ar934x_nfc_write_buf;
nand->read_buf = ar934x_nfc_read_buf;
+ nand->verify_buf = ar934x_nfc_verify_buf;
nand->select_chip = ar934x_nfc_select_chip;
ret = ar934x_nfc_alloc_buf(nfc, AR934X_NFC_ID_BUF_SIZE);