projects
/
openwrt
/
staging
/
hauke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bcm47xx: Refresh kernel 5.15
[openwrt/staging/hauke.git]
/
target
/
linux
/
bcm47xx
/
patches-5.15
/
102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch
diff --git
a/target/linux/bcm47xx/patches-5.15/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch
b/target/linux/bcm47xx/patches-5.15/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch
index d9324c25953ef90ca0a4f046c1fee51930fbc804..d7eab183d6c61648d95f6eff229d30e7cb34dd81 100644
(file)
--- a/
target/linux/bcm47xx/patches-5.15/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch
+++ b/
target/linux/bcm47xx/patches-5.15/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch
@@
-16,7
+16,7
@@
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
-@@ -27
22,7 +2722
,7 @@ static const struct nand_controller_ops
+@@ -27
71,7 +2771
,7 @@ static const struct nand_controller_ops
static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
{
struct brcmnand_controller *ctrl = host->ctrl;
static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
{
struct brcmnand_controller *ctrl = host->ctrl;
@@
-25,7
+25,7
@@
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
struct mtd_info *mtd;
struct nand_chip *chip;
int ret;
struct mtd_info *mtd;
struct nand_chip *chip;
int ret;
-@@ -27
30,7 +2730
,7 @@ static int brcmnand_init_cs(struct brcmn
+@@ -27
79,7 +2779
,7 @@ static int brcmnand_init_cs(struct brcmn
ret = of_property_read_u32(dn, "reg", &host->cs);
if (ret) {
ret = of_property_read_u32(dn, "reg", &host->cs);
if (ret) {
@@
-34,7
+34,7
@@
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
return -ENXIO;
}
return -ENXIO;
}
-@@ -27
39,13 +2739
,13 @@ static int brcmnand_init_cs(struct brcmn
+@@ -27
88,13 +2788
,13 @@ static int brcmnand_init_cs(struct brcmn
nand_set_flash_node(chip, dn);
nand_set_controller_data(chip, host);
nand_set_flash_node(chip, dn);
nand_set_controller_data(chip, host);