From defd016aefb5135e651ecfbffcfa2d5caf1cba7e Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Tue, 27 Dec 2022 11:22:18 +0100 Subject: bcm47xx: add tags to upstreamed patches All of the mtd patches are upstreamed to 5.18. Add tags indicating this. Signed-off-by: Nick Hainke --- ...d-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 target/linux/bcm47xx/patches-5.10/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch (limited to 'target/linux/bcm47xx/patches-5.10/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch') diff --git a/target/linux/bcm47xx/patches-5.10/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch b/target/linux/bcm47xx/patches-5.10/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch new file mode 100644 index 0000000000..d9324c2595 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.10/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch @@ -0,0 +1,52 @@ +From: Florian Fainelli +Subject: [PATCH v3 3/9] mtd: rawnand: brcmnand: Avoid pdev in brcmnand_init_cs() +Date: Fri, 07 Jan 2022 10:46:08 -0800 +Content-Type: text/plain; charset="utf-8" + +In preparation for encapsulating more of what the loop calling +brcmnand_init_cs() does, avoid using platform_device when it is the +device behind platform_device that we are using for printing errors. + +No functional changes introduced. + +Signed-off-by: Florian Fainelli +--- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c ++++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c +@@ -2722,7 +2722,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; +- struct platform_device *pdev = host->pdev; ++ struct device *dev = ctrl->dev; + struct mtd_info *mtd; + struct nand_chip *chip; + int ret; +@@ -2730,7 +2730,7 @@ static int brcmnand_init_cs(struct brcmn + + ret = of_property_read_u32(dn, "reg", &host->cs); + if (ret) { +- dev_err(&pdev->dev, "can't get chip-select\n"); ++ dev_err(dev, "can't get chip-select\n"); + return -ENXIO; + } + +@@ -2739,13 +2739,13 @@ static int brcmnand_init_cs(struct brcmn + + nand_set_flash_node(chip, dn); + nand_set_controller_data(chip, host); +- mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d", ++ mtd->name = devm_kasprintf(dev, GFP_KERNEL, "brcmnand.%d", + host->cs); + if (!mtd->name) + return -ENOMEM; + + mtd->owner = THIS_MODULE; +- mtd->dev.parent = &pdev->dev; ++ mtd->dev.parent = dev; + + chip->legacy.cmd_ctrl = brcmnand_cmd_ctrl; + chip->legacy.cmdfunc = brcmnand_cmdfunc; -- cgit v1.2.3