diff options
Diffstat (limited to 'drivers/nvmem')
| -rw-r--r-- | drivers/nvmem/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/nvmem/Makefile | 2 | ||||
| -rw-r--r-- | drivers/nvmem/bsec.c | 24 | ||||
| -rw-r--r-- | drivers/nvmem/core.c | 2 | ||||
| -rw-r--r-- | drivers/nvmem/eeprom_93xx46.c | 2 | ||||
| -rw-r--r-- | drivers/nvmem/ocotp.c | 2 | ||||
| -rw-r--r-- | drivers/nvmem/partition.c | 2 | ||||
| -rw-r--r-- | drivers/nvmem/regmap.c | 2 | ||||
| -rw-r--r-- | drivers/nvmem/rmem.c | 2 | ||||
| -rw-r--r-- | drivers/nvmem/snvs_lpgpr.c | 2 | ||||
| -rw-r--r-- | drivers/nvmem/starfive-otp.c | 2 |
11 files changed, 42 insertions, 16 deletions
diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig index 07320101b8..7b1ebe1d68 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only menuconfig NVMEM bool "NVMEM Support" help @@ -63,8 +63,18 @@ config STM32_BSEC depends on ARCH_STM32MP depends on OFDEVICE help - This adds support for the STM32 OTP controller. Reads and writes - to will go to the shadow RAM, not the OTP fuses themselvers. + This adds support for the STM32 OTP controller. + +config STM32_BSEC_WRITE + bool + prompt "Enable write support of STM32 CPUs OTP fuses" + depends on STM32_BSEC + help + This adds write support to STM32 On-Chip OTP registers. Example of set + MAC to 12:34:56:78:9A:BC: + bsec0.permanent_write_enable=1 + mw -l -d /dev/stm32-bsec 0x000000e4+4 0x78563412 + mw -l -d /dev/stm32-bsec 0x000000e8+4 0x0000bc9a config STARFIVE_OTP tristate "Starfive OTP Supprot" diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile index cd970aaea1..5865919612 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # # Makefile for nvmem drivers. # diff --git a/drivers/nvmem/bsec.c b/drivers/nvmem/bsec.c index a31eff7358..86b943a45d 100644 --- a/drivers/nvmem/bsec.c +++ b/drivers/nvmem/bsec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Copyright (c) 2019 Ahmad Fatoum, Pengutronix @@ -21,8 +21,10 @@ #define BSEC_OTP_SERIAL 13 struct bsec_priv { + struct device_d dev; u32 svc_id; struct regmap_config map_config; + int permanent_write_enable; }; struct stm32_bsec_data { @@ -59,13 +61,18 @@ static int stm32_bsec_read_shadow(void *ctx, unsigned reg, unsigned *val) return bsec_smc(ctx, BSEC_SMC_READ_SHADOW, reg, 0, val); } -static int stm32_bsec_reg_write_shadow(void *ctx, unsigned reg, unsigned val) +static int stm32_bsec_reg_write(void *ctx, unsigned reg, unsigned val) { - return bsec_smc(ctx, BSEC_SMC_WRITE_SHADOW, reg, val, NULL); + struct bsec_priv *priv = ctx; + + if (priv->permanent_write_enable) + return bsec_smc(ctx, BSEC_SMC_PROG_OTP, reg, val, NULL); + else + return bsec_smc(ctx, BSEC_SMC_WRITE_SHADOW, reg, val, NULL); } static struct regmap_bus stm32_bsec_regmap_bus = { - .reg_write = stm32_bsec_reg_write_shadow, + .reg_write = stm32_bsec_reg_write, .reg_read = stm32_bsec_read_shadow, }; @@ -150,6 +157,10 @@ static int stm32_bsec_probe(struct device_d *dev) priv->svc_id = data->svc_id; + dev_set_name(&priv->dev, "bsec"); + priv->dev.parent = dev; + register_device(&priv->dev); + priv->map_config.reg_bits = 32; priv->map_config.val_bits = 32; priv->map_config.reg_stride = 4; @@ -159,6 +170,11 @@ static int stm32_bsec_probe(struct device_d *dev) if (IS_ERR(map)) return PTR_ERR(map); + if (IS_ENABLED(CONFIG_STM32_BSEC_WRITE)) { + dev_add_param_bool(&priv->dev, "permanent_write_enable", + NULL, NULL, &priv->permanent_write_enable, NULL); + } + nvmem = nvmem_regmap_register(map, "stm32-bsec"); if (IS_ERR(nvmem)) return PTR_ERR(nvmem); diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index c9d072f364..fed387c43a 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * nvmem framework core. * diff --git a/drivers/nvmem/eeprom_93xx46.c b/drivers/nvmem/eeprom_93xx46.c index 73d775b53e..2f598fbc97 100644 --- a/drivers/nvmem/eeprom_93xx46.c +++ b/drivers/nvmem/eeprom_93xx46.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Driver for 93xx46 EEPROMs * diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c index 9dba8a758a..1f99a8012f 100644 --- a/drivers/nvmem/ocotp.c +++ b/drivers/nvmem/ocotp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * ocotp.c - i.MX6 ocotp fusebox driver * diff --git a/drivers/nvmem/partition.c b/drivers/nvmem/partition.c index 3f0bdc58de..a034c6c4d5 100644 --- a/drivers/nvmem/partition.c +++ b/drivers/nvmem/partition.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <driver.h> #include <malloc.h> diff --git a/drivers/nvmem/regmap.c b/drivers/nvmem/regmap.c index 641e6413ba..56611819a2 100644 --- a/drivers/nvmem/regmap.c +++ b/drivers/nvmem/regmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <driver.h> #include <malloc.h> diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c index e103cec448..cd735e5ef3 100644 --- a/drivers/nvmem/rmem.c +++ b/drivers/nvmem/rmem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de> */ diff --git a/drivers/nvmem/snvs_lpgpr.c b/drivers/nvmem/snvs_lpgpr.c index 88ca1a9dfd..ddfc15e147 100644 --- a/drivers/nvmem/snvs_lpgpr.c +++ b/drivers/nvmem/snvs_lpgpr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2015 Pengutronix, Steffen Trumtrar <kernel@pengutronix.de> * Copyright (c) 2017 Pengutronix, Oleksij Rempel <kernel@pengutronix.de> diff --git a/drivers/nvmem/starfive-otp.c b/drivers/nvmem/starfive-otp.c index 8583be2178..52c5292839 100644 --- a/drivers/nvmem/starfive-otp.c +++ b/drivers/nvmem/starfive-otp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright 2021 StarFive, Inc */ |