mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
6d65f5ea2b
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.133
Removed upstreamed:
bcm47xx/patches-5.15/101-v5.18-mtd-rawnand-brcmnand-Allow-SoC-to-provide-I-O-operations.patch[1]
Cherry picked build fix.[2] All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.133&id=56cf9f446b331414a15ef0e8dedf23583ec2c427
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.15/fix-up-backport-of-136191703038-interconnect-teach-l.patch
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 89895937dd)
125 lines
3.8 KiB
Diff
125 lines
3.8 KiB
Diff
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Subject: [PATCH v3 7/9] mtd: rawnand: brcmnand: Allow platform data instantation
|
|
Date: Fri, 07 Jan 2022 10:46:12 -0800
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
Make use of the recently refactored code in brcmnand_init_cs() and
|
|
derive the chip-select from the platform data that is supplied. Update
|
|
the various code paths to avoid relying on possibly non-existent
|
|
resources, too.
|
|
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 45 ++++++++++++++++++------
|
|
1 file changed, 35 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
|
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
|
@@ -9,6 +9,7 @@
|
|
#include <linux/delay.h>
|
|
#include <linux/device.h>
|
|
#include <linux/platform_device.h>
|
|
+#include <linux/platform_data/brcmnand.h>
|
|
#include <linux/err.h>
|
|
#include <linux/completion.h>
|
|
#include <linux/interrupt.h>
|
|
@@ -2811,7 +2812,8 @@ static const struct nand_controller_ops
|
|
.attach_chip = brcmnand_attach_chip,
|
|
};
|
|
|
|
-static int brcmnand_init_cs(struct brcmnand_host *host)
|
|
+static int brcmnand_init_cs(struct brcmnand_host *host,
|
|
+ const char * const *part_probe_types)
|
|
{
|
|
struct brcmnand_controller *ctrl = host->ctrl;
|
|
struct device *dev = ctrl->dev;
|
|
@@ -2864,7 +2866,7 @@ static int brcmnand_init_cs(struct brcmn
|
|
if (ret)
|
|
return ret;
|
|
|
|
- ret = mtd_device_register(mtd, NULL, 0);
|
|
+ ret = mtd_device_parse_register(mtd, part_probe_types, NULL, NULL, 0);
|
|
if (ret)
|
|
nand_cleanup(chip);
|
|
|
|
@@ -3033,17 +3035,15 @@ static int brcmnand_edu_setup(struct pla
|
|
|
|
int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
|
|
{
|
|
+ struct brcmnand_platform_data *pd = dev_get_platdata(&pdev->dev);
|
|
struct device *dev = &pdev->dev;
|
|
struct device_node *dn = dev->of_node, *child;
|
|
struct brcmnand_controller *ctrl;
|
|
+ struct brcmnand_host *host;
|
|
struct resource *res;
|
|
int ret;
|
|
|
|
- /* We only support device-tree instantiation */
|
|
- if (!dn)
|
|
- return -ENODEV;
|
|
-
|
|
- if (!of_match_node(brcmnand_of_match, dn))
|
|
+ if (dn && !of_match_node(brcmnand_of_match, dn))
|
|
return -ENODEV;
|
|
|
|
ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL);
|
|
@@ -3070,7 +3070,7 @@ int brcmnand_probe(struct platform_devic
|
|
/* NAND register range */
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
ctrl->nand_base = devm_ioremap_resource(dev, res);
|
|
- if (IS_ERR(ctrl->nand_base))
|
|
+ if (IS_ERR(ctrl->nand_base) && !brcmnand_soc_has_ops(soc))
|
|
return PTR_ERR(ctrl->nand_base);
|
|
|
|
/* Enable clock before using NAND registers */
|
|
@@ -3214,7 +3214,6 @@ int brcmnand_probe(struct platform_devic
|
|
|
|
for_each_available_child_of_node(dn, child) {
|
|
if (of_device_is_compatible(child, "brcm,nandcs")) {
|
|
- struct brcmnand_host *host;
|
|
|
|
host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
|
|
if (!host) {
|
|
@@ -3234,7 +3233,7 @@ int brcmnand_probe(struct platform_devic
|
|
|
|
nand_set_flash_node(&host->chip, child);
|
|
|
|
- ret = brcmnand_init_cs(host);
|
|
+ ret = brcmnand_init_cs(host, NULL);
|
|
if (ret) {
|
|
devm_kfree(dev, host);
|
|
continue; /* Try all chip-selects */
|
|
@@ -3244,6 +3243,32 @@ int brcmnand_probe(struct platform_devic
|
|
}
|
|
}
|
|
|
|
+ if (!list_empty(&ctrl->host_list))
|
|
+ return 0;
|
|
+
|
|
+ if (!pd) {
|
|
+ ret = -ENODEV;
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
+ /* If we got there we must have been probing via platform data */
|
|
+ host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
|
|
+ if (!host) {
|
|
+ ret = -ENOMEM;
|
|
+ goto err;
|
|
+ }
|
|
+ host->pdev = pdev;
|
|
+ host->ctrl = ctrl;
|
|
+ host->cs = pd->chip_select;
|
|
+ host->chip.ecc.size = pd->ecc_stepsize;
|
|
+ host->chip.ecc.strength = pd->ecc_strength;
|
|
+
|
|
+ ret = brcmnand_init_cs(host, pd->part_probe_types);
|
|
+ if (ret)
|
|
+ goto err;
|
|
+
|
|
+ list_add_tail(&host->node, &ctrl->host_list);
|
|
+
|
|
/* No chip-selects could initialize properly */
|
|
if (list_empty(&ctrl->host_list)) {
|
|
ret = -ENODEV;
|