mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +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)
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Subject: [PATCH v3 1/9] mtd: rawnand: brcmnand: Assign soc as early as possible
|
|
Date: Fri, 07 Jan 2022 10:46:06 -0800
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
In order to key off the brcmnand_probe() code in subsequent changes
|
|
depending upon ctrl->soc, assign that variable as early as possible,
|
|
instead of much later when we have checked that it is non-NULL.
|
|
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
|
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
|
@@ -3059,6 +3059,7 @@ int brcmnand_probe(struct platform_devic
|
|
|
|
dev_set_drvdata(dev, ctrl);
|
|
ctrl->dev = dev;
|
|
+ ctrl->soc = soc;
|
|
|
|
/* Enable the static key if the soc provides I/O operations indicating
|
|
* that a non-memory mapped IO access path must be used
|
|
@@ -3205,8 +3206,6 @@ int brcmnand_probe(struct platform_devic
|
|
* interesting ways
|
|
*/
|
|
if (soc) {
|
|
- ctrl->soc = soc;
|
|
-
|
|
ret = devm_request_irq(dev, ctrl->irq, brcmnand_irq, 0,
|
|
DRV_NAME, ctrl);
|
|
|