79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
From fbd03d27776c6121a483921601418e3c8f0ff37e Mon Sep 17 00:00:00 2001
|
|
From: Michael Walle <michael@walle.cc>
|
|
Date: Mon, 6 Feb 2023 13:43:47 +0000
|
|
Subject: [PATCH] nvmem: core: move struct nvmem_cell_info to nvmem-provider.h
|
|
|
|
struct nvmem_cell_info is used to describe a cell. Thus this should
|
|
really be in the nvmem-provider's header. There are two (unused) nvmem
|
|
access methods which use the nvmem_cell_info to describe the cell to be
|
|
accesses. One can argue, that they will create a cell before accessing,
|
|
thus they are both a provider and a consumer.
|
|
|
|
struct nvmem_cell_info will get used more and more by nvmem-providers,
|
|
don't force them to also include the consumer header, although they are
|
|
not.
|
|
|
|
Signed-off-by: Michael Walle <michael@walle.cc>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230206134356.839737-14-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
include/linux/nvmem-consumer.h | 10 +---------
|
|
include/linux/nvmem-provider.h | 19 ++++++++++++++++++-
|
|
2 files changed, 19 insertions(+), 10 deletions(-)
|
|
|
|
--- a/include/linux/nvmem-consumer.h
|
|
+++ b/include/linux/nvmem-consumer.h
|
|
@@ -18,15 +18,7 @@ struct device_node;
|
|
/* consumer cookie */
|
|
struct nvmem_cell;
|
|
struct nvmem_device;
|
|
-
|
|
-struct nvmem_cell_info {
|
|
- const char *name;
|
|
- unsigned int offset;
|
|
- unsigned int bytes;
|
|
- unsigned int bit_offset;
|
|
- unsigned int nbits;
|
|
- struct device_node *np;
|
|
-};
|
|
+struct nvmem_cell_info;
|
|
|
|
/**
|
|
* struct nvmem_cell_lookup - cell lookup entry
|
|
--- a/include/linux/nvmem-provider.h
|
|
+++ b/include/linux/nvmem-provider.h
|
|
@@ -14,7 +14,6 @@
|
|
#include <linux/gpio/consumer.h>
|
|
|
|
struct nvmem_device;
|
|
-struct nvmem_cell_info;
|
|
typedef int (*nvmem_reg_read_t)(void *priv, unsigned int offset,
|
|
void *val, size_t bytes);
|
|
typedef int (*nvmem_reg_write_t)(void *priv, unsigned int offset,
|
|
@@ -48,6 +47,24 @@ struct nvmem_keepout {
|
|
};
|
|
|
|
/**
|
|
+ * struct nvmem_cell_info - NVMEM cell description
|
|
+ * @name: Name.
|
|
+ * @offset: Offset within the NVMEM device.
|
|
+ * @bytes: Length of the cell.
|
|
+ * @bit_offset: Bit offset if cell is smaller than a byte.
|
|
+ * @nbits: Number of bits.
|
|
+ * @np: Optional device_node pointer.
|
|
+ */
|
|
+struct nvmem_cell_info {
|
|
+ const char *name;
|
|
+ unsigned int offset;
|
|
+ unsigned int bytes;
|
|
+ unsigned int bit_offset;
|
|
+ unsigned int nbits;
|
|
+ struct device_node *np;
|
|
+};
|
|
+
|
|
+/**
|
|
* struct nvmem_config - NVMEM device configuration
|
|
*
|
|
* @dev: Parent device.
|