mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
|
From b7c1e53751cb3990153084f31c41f25fde3b629c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
||
|
|
Date: Fri, 24 Nov 2023 20:38:14 +0100
|
||
|
|
Subject: [PATCH] nvmem: Do not expect fixed layouts to grab a layout driver
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Two series lived in parallel for some time, which led to this situation:
|
||
|
|
- The nvmem-layout container is used for dynamic layouts
|
||
|
|
- We now expect fixed layouts to also use the nvmem-layout container but
|
||
|
|
this does not require any additional driver, the support is built-in the
|
||
|
|
nvmem core.
|
||
|
|
|
||
|
|
Ensure we don't refuse to probe for wrong reasons.
|
||
|
|
|
||
|
|
Fixes: 27f699e578b1 ("nvmem: core: add support for fixed cells *layout*")
|
||
|
|
Cc: stable@vger.kernel.org
|
||
|
|
Reported-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
|
||
|
|
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
||
|
|
Tested-by: Rafał Miłecki <rafal@milecki.pl>
|
||
|
|
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
|
||
|
|
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
|
||
|
|
|
||
|
|
Link: https://lore.kernel.org/r/20231124193814.360552-1-miquel.raynal@bootlin.com
|
||
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
---
|
||
|
|
drivers/nvmem/core.c | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
--- a/drivers/nvmem/core.c
|
||
|
|
+++ b/drivers/nvmem/core.c
|
||
|
|
@@ -797,6 +797,12 @@ static struct nvmem_layout *nvmem_layout
|
||
|
|
if (!layout_np)
|
||
|
|
return NULL;
|
||
|
|
|
||
|
|
+ /* Fixed layouts don't have a matching driver */
|
||
|
|
+ if (of_device_is_compatible(layout_np, "fixed-layout")) {
|
||
|
|
+ of_node_put(layout_np);
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* In case the nvmem device was built-in while the layout was built as a
|
||
|
|
* module, we shall manually request the layout driver loading otherwise
|