projects
/
openwrt
/
staging
/
wigyori.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 5.10 to 5.10.163
[openwrt/staging/wigyori.git]
/
target
/
linux
/
pistachio
/
patches-5.10
/
401-mtd-nor-support-mtd-name-from-device-tree.patch
diff --git
a/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
b/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
index cf8ef1b8802ab75f0bcecb467d2f54540a76240c..c6569c81ce3f131eb0967613ebe908a6b94b50a3 100644
(file)
--- a/
target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/
target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@
-10,7
+10,7
@@
Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -314
1,6 +3141
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -314
3,6 +3143
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
@@
-18,7
+18,7
@@
Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret;
int i;
int ret;
int i;
-@@ -319
5,7 +3196
,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -319
7,7 +3198
,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;
if (ret)
return ret;
@@
-34,7
+34,7
@@
Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
mtd->type = MTD_NORFLASH;
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
mtd->type = MTD_NORFLASH;
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
-@@ -8
48,6 +848
,17 @@ out_error:
+@@ -8
50,6 +850
,17 @@ out_error:
*/
static void mtd_set_dev_defaults(struct mtd_info *mtd)
{
*/
static void mtd_set_dev_defaults(struct mtd_info *mtd)
{