projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath79: fix gmac compatible in ar9330.dtsi and ag71xx_setup_gmac_933x
[oweals/openwrt.git]
/
target
/
linux
/
ramips
/
patches-4.14
/
0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
diff --git
a/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
b/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
index 6ee0845ffe06b828f0f7fada948b0afd82c88f2b..2e7cc33c8f6a79526aa50d03b8cc23485a8b7e61 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
+++ b/
target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
@@
-125,7
+125,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
{ "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024,
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) },
{ "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024,
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) },
-@@ -122
0,6 +1272
,9 @@ static int spi_nor_read(struct mtd_info
+@@ -122
4,6 +1276
,9 @@ static int spi_nor_read(struct mtd_info
if (ret)
return ret;
if (ret)
return ret;
@@
-135,7
+135,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
while (len) {
loff_t addr = from;
while (len) {
loff_t addr = from;
-@@ -124
4,6 +1299
,18 @@ static int spi_nor_read(struct mtd_info
+@@ -124
8,6 +1303
,18 @@ static int spi_nor_read(struct mtd_info
ret = 0;
read_err:
ret = 0;
read_err:
@@
-154,7
+154,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
return ret;
}
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
return ret;
}
-@@ -134
5,6 +1412
,10 @@ static int spi_nor_write(struct mtd_info
+@@ -134
9,6 +1416
,10 @@ static int spi_nor_write(struct mtd_info
if (ret)
return ret;
if (ret)
return ret;
@@
-165,7
+165,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
for (i = 0; i < len; ) {
ssize_t written;
loff_t addr = to + i;
for (i = 0; i < len; ) {
ssize_t written;
loff_t addr = to + i;
-@@ -13
92,6 +1463
,7 @@ static int spi_nor_write(struct mtd_info
+@@ -13
89,6 +1460
,7 @@ static int spi_nor_write(struct mtd_info
}
write_err:
}
write_err:
@@
-173,7
+173,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
}
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
}
-@@ -280
8,8 +2880
,10 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -280
5,8 +2877
,10 @@ int spi_nor_scan(struct spi_nor *nor, co
} else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;
} else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;