Skip to content

Commit f6c052a

Browse files
Christophe Kerellogregkh
authored andcommitted
nvmem: core: Fix a conflict between MTD and NVMEM on wp-gpios property
Wp-gpios property can be used on NVMEM nodes and the same property can be also used on MTD NAND nodes. In case of the wp-gpios property is defined at NAND level node, the GPIO management is done at NAND driver level. Write protect is disabled when the driver is probed or resumed and is enabled when the driver is released or suspended. When no partitions are defined in the NAND DT node, then the NAND DT node will be passed to NVMEM framework. If wp-gpios property is defined in this node, the GPIO resource is taken twice and the NAND controller driver fails to probe. It would be possible to set config->wp_gpio at MTD level before calling nvmem_register function but NVMEM framework will toggle this GPIO on each write when this GPIO should only be controlled at NAND level driver to ensure that the Write Protect has not been enabled. A way to fix this conflict is to add a new boolean flag in nvmem_config named ignore_wp. In case ignore_wp is set, the GPIO resource will be managed by the provider. Fixes: 2a127da ("nvmem: add support for the write-protect pin") Cc: stable@vger.kernel.org Signed-off-by: Christophe Kerello <christophe.kerello@foss.st.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20220220151432.16605-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent efe8a1e commit f6c052a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/nvmem/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
771771

772772
if (config->wp_gpio)
773773
nvmem->wp_gpio = config->wp_gpio;
774-
else
774+
else if (!config->ignore_wp)
775775
nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp",
776776
GPIOD_OUT_HIGH);
777777
if (IS_ERR(nvmem->wp_gpio)) {

include/linux/nvmem-provider.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ struct nvmem_keepout {
7070
* @word_size: Minimum read/write access granularity.
7171
* @stride: Minimum read/write access stride.
7272
* @priv: User context passed to read/write callbacks.
73-
* @wp-gpio: Write protect pin
73+
* @wp-gpio: Write protect pin
74+
* @ignore_wp: Write Protect pin is managed by the provider.
7475
*
7576
* Note: A default "nvmem<id>" name will be assigned to the device if
7677
* no name is specified in its configuration. In such case "<id>" is
@@ -92,6 +93,7 @@ struct nvmem_config {
9293
enum nvmem_type type;
9394
bool read_only;
9495
bool root_only;
96+
bool ignore_wp;
9597
struct device_node *of_node;
9698
bool no_of_node;
9799
nvmem_reg_read_t reg_read;

0 commit comments

Comments
 (0)