projects
/
openwrt
/
staging
/
hauke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.4 to 4.4.119
[openwrt/staging/hauke.git]
/
target
/
linux
/
brcm63xx
/
patches-4.4
/
000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch
diff --git
a/target/linux/brcm63xx/patches-4.4/000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch
b/target/linux/brcm63xx/patches-4.4/000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch
index 8a031301b10a31d44cbf2b84dac03a77de81bb28..3dc68f01dfc9da698c1878531937bffaa2f57c30 100644
(file)
--- a/
target/linux/brcm63xx/patches-4.4/000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch
+++ b/
target/linux/brcm63xx/patches-4.4/000-4.5-06-mtd-nand-drop-unnecessary-partition-parser-data.patch
@@
-83,7
+83,7
@@
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
-@@ -19
46,7 +1946
,6 @@ static int brcmnand_init_cs(struct brcmn
+@@ -19
39,7 +1939
,6 @@ static int brcmnand_init_cs(struct brcmn
struct nand_chip *chip;
int ret;
u16 cfg_offs;
struct nand_chip *chip;
int ret;
u16 cfg_offs;
@@
-91,7
+91,7
@@
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
ret = of_property_read_u32(dn, "reg", &host->cs);
if (ret) {
ret = of_property_read_u32(dn, "reg", &host->cs);
if (ret) {
-@@ -20
25,7 +2024
,7 @@ static int brcmnand_init_cs(struct brcmn
+@@ -20
18,7 +2017
,7 @@ static int brcmnand_init_cs(struct brcmn
if (nand_scan_tail(mtd))
return -ENXIO;
if (nand_scan_tail(mtd))
return -ENXIO;
@@
-610,7
+610,7
@@
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
flctl = devm_kzalloc(&pdev->dev, sizeof(struct sh_flctl), GFP_KERNEL);
if (!flctl)
flctl = devm_kzalloc(&pdev->dev, sizeof(struct sh_flctl), GFP_KERNEL);
if (!flctl)
-@@ -112
3,6 +1122
,7 @@ static int flctl_probe(struct platform_d
+@@ -112
4,6 +1123
,7 @@ static int flctl_probe(struct platform_d
platform_set_drvdata(pdev, flctl);
flctl_mtd = &flctl->mtd;
nand = &flctl->chip;
platform_set_drvdata(pdev, flctl);
flctl_mtd = &flctl->mtd;
nand = &flctl->chip;
@@
-618,7
+618,7
@@
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
flctl_mtd->priv = nand;
flctl_mtd->dev.parent = &pdev->dev;
flctl->pdev = pdev;
flctl_mtd->priv = nand;
flctl_mtd->dev.parent = &pdev->dev;
flctl->pdev = pdev;
-@@ -116
3,9 +1163
,7 @@ static int flctl_probe(struct platform_d
+@@ -116
4,9 +1164
,7 @@ static int flctl_probe(struct platform_d
if (ret)
goto err_chip;
if (ret)
goto err_chip;
@@
-662,7
+662,7
@@
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
-@@ -123
2,7 +1232
,6 @@ static int sunxi_nand_chip_init(struct d
+@@ -123
8,7 +1238
,6 @@ static int sunxi_nand_chip_init(struct d
{
const struct nand_sdr_timings *timings;
struct sunxi_nand_chip *chip;
{
const struct nand_sdr_timings *timings;
struct sunxi_nand_chip *chip;
@@
-670,7
+670,7
@@
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
struct mtd_info *mtd;
struct nand_chip *nand;
int nsels;
struct mtd_info *mtd;
struct nand_chip *nand;
int nsels;
-@@ -13
66,8 +1365
,7 @@ static int sunxi_nand_chip_init(struct d
+@@ -13
72,8 +1371
,7 @@ static int sunxi_nand_chip_init(struct d
return ret;
}
return ret;
}