kernel: 5.10: update nvmem subsystem to the 5.15 state
[openwrt/staging/hauke.git] / target / linux / generic / backport-5.10 / 804-v5.14-0007-nvmem-add-NVMEM_TYPE_FRAM.patch
1 From: Rafał Miłecki <rafal@milecki.pl>
2 Subject: [PATCH] nvmem: add NVMEM_TYPE_FRAM
3
4 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
5 ---
6
7 --- a/drivers/nvmem/core.c
8 +++ b/drivers/nvmem/core.c
9 @@ -180,6 +180,7 @@ static const char * const nvmem_type_str
10 [NVMEM_TYPE_EEPROM] = "EEPROM",
11 [NVMEM_TYPE_OTP] = "OTP",
12 [NVMEM_TYPE_BATTERY_BACKED] = "Battery backed",
13 + [NVMEM_TYPE_FRAM] = "FRAM",
14 };
15
16 #ifdef CONFIG_DEBUG_LOCK_ALLOC
17 @@ -361,6 +362,9 @@ static int nvmem_sysfs_setup_compat(stru
18 if (!config->base_dev)
19 return -EINVAL;
20
21 + if (config->type == NVMEM_TYPE_FRAM)
22 + bin_attr_nvmem_eeprom_compat.attr.name = "fram";
23 +
24 nvmem->eeprom = bin_attr_nvmem_eeprom_compat;
25 nvmem->eeprom.attr.mode = nvmem_bin_attr_get_umode(nvmem);
26 nvmem->eeprom.size = nvmem->size;
27 --- a/include/linux/nvmem-provider.h
28 +++ b/include/linux/nvmem-provider.h
29 @@ -25,6 +25,7 @@ enum nvmem_type {
30 NVMEM_TYPE_EEPROM,
31 NVMEM_TYPE_OTP,
32 NVMEM_TYPE_BATTERY_BACKED,
33 + NVMEM_TYPE_FRAM,
34 };
35
36 #define NVMEM_DEVID_NONE (-1)