Skip to content

Commit 28fc7c9

Browse files
Rafał Miłeckigregkh
Rafał Miłecki
authored and
gregkh
committed
nvmem: prefix all symbols with NVMEM_
This unifies all NVMEM symbols. They follow one style now. Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20220916122100.170016-8-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 105ca41 commit 28fc7c9

9 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎arch/arm/configs/multi_v7_defconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,11 +1193,11 @@ CONFIG_TI_PIPE3=y
11931193
CONFIG_TWL4030_USB=m
11941194
CONFIG_RAS=y
11951195
CONFIG_NVMEM_IMX_OCOTP=y
1196-
CONFIG_QCOM_QFPROM=y
1197-
CONFIG_ROCKCHIP_EFUSE=m
1196+
CONFIG_NVMEM_QCOM_QFPROM=y
1197+
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
11981198
CONFIG_NVMEM_SUNXI_SID=y
11991199
CONFIG_NVMEM_VF610_OCOTP=y
1200-
CONFIG_MESON_MX_EFUSE=m
1200+
CONFIG_NVMEM_MESON_MX_EFUSE=m
12011201
CONFIG_NVMEM_RMEM=m
12021202
CONFIG_FSI=m
12031203
CONFIG_FSI_MASTER_GPIO=m

‎arch/arm/configs/qcom_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ CONFIG_PHY_QCOM_QMP=y
278278
CONFIG_PHY_QCOM_USB_HS=y
279279
CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y
280280
CONFIG_PHY_QCOM_USB_HSIC=y
281-
CONFIG_QCOM_QFPROM=y
281+
CONFIG_NVMEM_QCOM_QFPROM=y
282282
CONFIG_INTERCONNECT=y
283283
CONFIG_INTERCONNECT_QCOM=y
284284
CONFIG_INTERCONNECT_QCOM_MSM8974=m

‎arch/arm64/configs/defconfig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,12 +1236,12 @@ CONFIG_QCOM_L3_PMU=y
12361236
CONFIG_HISI_PMU=y
12371237
CONFIG_NVMEM_IMX_OCOTP=y
12381238
CONFIG_NVMEM_IMX_OCOTP_SCU=y
1239-
CONFIG_MTK_EFUSE=y
1240-
CONFIG_QCOM_QFPROM=y
1241-
CONFIG_ROCKCHIP_EFUSE=y
1239+
CONFIG_NVMEM_MTK_EFUSE=y
1240+
CONFIG_NVMEM_QCOM_QFPROM=y
1241+
CONFIG_NVMEM_ROCKCHIP_EFUSE=y
12421242
CONFIG_NVMEM_SUNXI_SID=y
1243-
CONFIG_UNIPHIER_EFUSE=y
1244-
CONFIG_MESON_EFUSE=m
1243+
CONFIG_NVMEM_UNIPHIER_EFUSE=y
1244+
CONFIG_NVMEM_MESON_EFUSE=m
12451245
CONFIG_NVMEM_RMEM=m
12461246
CONFIG_NVMEM_LAYERSCAPE_SFP=m
12471247
CONFIG_FPGA=y

‎arch/mips/configs/ci20_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ CONFIG_MEMORY=y
143143
CONFIG_JZ4780_NEMC=y
144144
CONFIG_PWM=y
145145
CONFIG_PWM_JZ4740=m
146-
CONFIG_JZ4780_EFUSE=y
146+
CONFIG_NVMEM_JZ4780_EFUSE=y
147147
CONFIG_JZ4770_PHY=y
148148
CONFIG_EXT4_FS=y
149149
# CONFIG_DNOTIFY is not set

‎drivers/cpufreq/Kconfig.arm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ config ARM_OMAP2PLUS_CPUFREQ
153153
config ARM_QCOM_CPUFREQ_NVMEM
154154
tristate "Qualcomm nvmem based CPUFreq"
155155
depends on ARCH_QCOM
156-
depends on QCOM_QFPROM
156+
depends on NVMEM_QCOM_QFPROM
157157
depends on QCOM_SMEM
158158
select PM_OPP
159159
help

‎drivers/nvmem/Kconfig‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ config NVMEM_IMX_OCOTP_SCU
5252
This is a driver for the SCU On-Chip OTP Controller (OCOTP)
5353
available on i.MX8 SoCs.
5454

55-
config JZ4780_EFUSE
55+
config NVMEM_JZ4780_EFUSE
5656
tristate "JZ4780 EFUSE Memory Support"
5757
depends on MACH_INGENIC || COMPILE_TEST
5858
depends on HAS_IOMEM
@@ -96,7 +96,7 @@ config NVMEM_MXS_OCOTP
9696
This driver can also be built as a module. If so, the module
9797
will be called nvmem-mxs-ocotp.
9898

99-
config MTK_EFUSE
99+
config NVMEM_MTK_EFUSE
100100
tristate "Mediatek SoCs EFUSE support"
101101
depends on ARCH_MEDIATEK || COMPILE_TEST
102102
depends on HAS_IOMEM
@@ -107,7 +107,7 @@ config MTK_EFUSE
107107
This driver can also be built as a module. If so, the module
108108
will be called efuse-mtk.
109109

110-
config MICROCHIP_OTPC
110+
config NVMEM_MICROCHIP_OTPC
111111
tristate "Microchip OTPC support"
112112
depends on ARCH_AT91 || COMPILE_TEST
113113
help
@@ -126,7 +126,7 @@ config NVMEM_NINTENDO_OTP
126126
This driver can also be built as a module. If so, the module
127127
will be called nvmem-nintendo-otp.
128128

129-
config QCOM_QFPROM
129+
config NVMEM_QCOM_QFPROM
130130
tristate "QCOM QFPROM Support"
131131
depends on ARCH_QCOM || COMPILE_TEST
132132
depends on HAS_IOMEM
@@ -145,7 +145,7 @@ config NVMEM_SPMI_SDAM
145145
Qualcomm Technologies, Inc. PMICs. It provides the clients
146146
an interface to read/write to the SDAM module's shared memory.
147147

148-
config ROCKCHIP_EFUSE
148+
config NVMEM_ROCKCHIP_EFUSE
149149
tristate "Rockchip eFuse Support"
150150
depends on ARCH_ROCKCHIP || COMPILE_TEST
151151
depends on HAS_IOMEM
@@ -156,7 +156,7 @@ config ROCKCHIP_EFUSE
156156
This driver can also be built as a module. If so, the module
157157
will be called nvmem_rockchip_efuse.
158158

159-
config ROCKCHIP_OTP
159+
config NVMEM_ROCKCHIP_OTP
160160
tristate "Rockchip OTP controller support"
161161
depends on ARCH_ROCKCHIP || COMPILE_TEST
162162
depends on HAS_IOMEM
@@ -199,7 +199,7 @@ config NVMEM_SUNXI_SID
199199
This driver can also be built as a module. If so, the module
200200
will be called nvmem_sunxi_sid.
201201

202-
config UNIPHIER_EFUSE
202+
config NVMEM_UNIPHIER_EFUSE
203203
tristate "UniPhier SoCs eFuse support"
204204
depends on ARCH_UNIPHIER || COMPILE_TEST
205205
depends on HAS_IOMEM
@@ -221,7 +221,7 @@ config NVMEM_VF610_OCOTP
221221
This driver can also be build as a module. If so, the module will
222222
be called nvmem-vf610-ocotp.
223223

224-
config MESON_EFUSE
224+
config NVMEM_MESON_EFUSE
225225
tristate "Amlogic Meson GX eFuse Support"
226226
depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
227227
help
@@ -231,7 +231,7 @@ config MESON_EFUSE
231231
This driver can also be built as a module. If so, the module
232232
will be called nvmem_meson_efuse.
233233

234-
config MESON_MX_EFUSE
234+
config NVMEM_MESON_MX_EFUSE
235235
tristate "Amlogic Meson6/Meson8/Meson8b eFuse Support"
236236
depends on ARCH_MESON || COMPILE_TEST
237237
help
@@ -251,13 +251,13 @@ config NVMEM_SNVS_LPGPR
251251
This driver can also be built as a module. If so, the module
252252
will be called nvmem-snvs-lpgpr.
253253

254-
config RAVE_SP_EEPROM
254+
config NVMEM_RAVE_SP_EEPROM
255255
tristate "Rave SP EEPROM Support"
256256
depends on RAVE_SP_CORE
257257
help
258258
Say y here to enable Rave SP EEPROM support.
259259

260-
config SC27XX_EFUSE
260+
config NVMEM_SC27XX_EFUSE
261261
tristate "Spreadtrum SC27XX eFuse Support"
262262
depends on MFD_SC27XX_PMIC || COMPILE_TEST
263263
depends on HAS_IOMEM
@@ -278,7 +278,7 @@ config NVMEM_ZYNQMP
278278

279279
If sure, say yes. If unsure, say no.
280280

281-
config SPRD_EFUSE
281+
config NVMEM_SPRD_EFUSE
282282
tristate "Spreadtrum SoC eFuse Support"
283283
depends on ARCH_SPRD || COMPILE_TEST
284284
depends on HAS_IOMEM

‎drivers/nvmem/Makefile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ obj-$(CONFIG_NVMEM_IMX_OCOTP) += nvmem-imx-ocotp.o
1515
nvmem-imx-ocotp-y := imx-ocotp.o
1616
obj-$(CONFIG_NVMEM_IMX_OCOTP_SCU) += nvmem-imx-ocotp-scu.o
1717
nvmem-imx-ocotp-scu-y := imx-ocotp-scu.o
18-
obj-$(CONFIG_JZ4780_EFUSE) += nvmem_jz4780_efuse.o
18+
obj-$(CONFIG_NVMEM_JZ4780_EFUSE) += nvmem_jz4780_efuse.o
1919
nvmem_jz4780_efuse-y := jz4780-efuse.o
2020
obj-$(CONFIG_NVMEM_LPC18XX_EEPROM) += nvmem_lpc18xx_eeprom.o
2121
nvmem_lpc18xx_eeprom-y := lpc18xx_eeprom.o
@@ -25,37 +25,37 @@ obj-$(CONFIG_NVMEM_MXS_OCOTP) += nvmem-mxs-ocotp.o
2525
nvmem-mxs-ocotp-y := mxs-ocotp.o
2626
obj-$(CONFIG_NVMEM_NINTENDO_OTP) += nvmem-nintendo-otp.o
2727
nvmem-nintendo-otp-y := nintendo-otp.o
28-
obj-$(CONFIG_MTK_EFUSE) += nvmem_mtk-efuse.o
28+
obj-$(CONFIG_NVMEM_MTK_EFUSE) += nvmem_mtk-efuse.o
2929
nvmem_mtk-efuse-y := mtk-efuse.o
30-
obj-$(CONFIG_QCOM_QFPROM) += nvmem_qfprom.o
30+
obj-$(CONFIG_NVMEM_QCOM_QFPROM) += nvmem_qfprom.o
3131
nvmem_qfprom-y := qfprom.o
3232
obj-$(CONFIG_NVMEM_SPMI_SDAM) += nvmem_qcom-spmi-sdam.o
3333
nvmem_qcom-spmi-sdam-y += qcom-spmi-sdam.o
34-
obj-$(CONFIG_ROCKCHIP_EFUSE) += nvmem_rockchip_efuse.o
34+
obj-$(CONFIG_NVMEM_ROCKCHIP_EFUSE) += nvmem_rockchip_efuse.o
3535
nvmem_rockchip_efuse-y := rockchip-efuse.o
36-
obj-$(CONFIG_ROCKCHIP_OTP) += nvmem-rockchip-otp.o
36+
obj-$(CONFIG_NVMEM_ROCKCHIP_OTP) += nvmem-rockchip-otp.o
3737
nvmem-rockchip-otp-y := rockchip-otp.o
3838
obj-$(CONFIG_NVMEM_SUNXI_SID) += nvmem_sunxi_sid.o
3939
nvmem_stm32_romem-y := stm32-romem.o
4040
obj-$(CONFIG_NVMEM_STM32_ROMEM) += nvmem_stm32_romem.o
4141
nvmem_sunxi_sid-y := sunxi_sid.o
42-
obj-$(CONFIG_UNIPHIER_EFUSE) += nvmem-uniphier-efuse.o
42+
obj-$(CONFIG_NVMEM_UNIPHIER_EFUSE) += nvmem-uniphier-efuse.o
4343
nvmem-uniphier-efuse-y := uniphier-efuse.o
4444
obj-$(CONFIG_NVMEM_VF610_OCOTP) += nvmem-vf610-ocotp.o
4545
nvmem-vf610-ocotp-y := vf610-ocotp.o
46-
obj-$(CONFIG_MESON_EFUSE) += nvmem_meson_efuse.o
46+
obj-$(CONFIG_NVMEM_MESON_EFUSE) += nvmem_meson_efuse.o
4747
nvmem_meson_efuse-y := meson-efuse.o
48-
obj-$(CONFIG_MESON_MX_EFUSE) += nvmem_meson_mx_efuse.o
48+
obj-$(CONFIG_NVMEM_MESON_MX_EFUSE) += nvmem_meson_mx_efuse.o
4949
nvmem_meson_mx_efuse-y := meson-mx-efuse.o
5050
obj-$(CONFIG_NVMEM_SNVS_LPGPR) += nvmem_snvs_lpgpr.o
5151
nvmem_snvs_lpgpr-y := snvs_lpgpr.o
52-
obj-$(CONFIG_RAVE_SP_EEPROM) += nvmem-rave-sp-eeprom.o
52+
obj-$(CONFIG_NVMEM_RAVE_SP_EEPROM) += nvmem-rave-sp-eeprom.o
5353
nvmem-rave-sp-eeprom-y := rave-sp-eeprom.o
54-
obj-$(CONFIG_SC27XX_EFUSE) += nvmem-sc27xx-efuse.o
54+
obj-$(CONFIG_NVMEM_SC27XX_EFUSE) += nvmem-sc27xx-efuse.o
5555
nvmem-sc27xx-efuse-y := sc27xx-efuse.o
5656
obj-$(CONFIG_NVMEM_ZYNQMP) += nvmem_zynqmp_nvmem.o
5757
nvmem_zynqmp_nvmem-y := zynqmp_nvmem.o
58-
obj-$(CONFIG_SPRD_EFUSE) += nvmem_sprd_efuse.o
58+
obj-$(CONFIG_NVMEM_SPRD_EFUSE) += nvmem_sprd_efuse.o
5959
nvmem_sprd_efuse-y := sprd-efuse.o
6060
obj-$(CONFIG_NVMEM_RMEM) += nvmem-rmem.o
6161
nvmem-rmem-y := rmem.o
@@ -67,7 +67,7 @@ obj-$(CONFIG_NVMEM_SUNPLUS_OCOTP) += nvmem_sunplus_ocotp.o
6767
nvmem_sunplus_ocotp-y := sunplus-ocotp.o
6868
obj-$(CONFIG_NVMEM_APPLE_EFUSES) += nvmem-apple-efuses.o
6969
nvmem-apple-efuses-y := apple-efuses.o
70-
obj-$(CONFIG_MICROCHIP_OTPC) += nvmem-microchip-otpc.o
70+
obj-$(CONFIG_NVMEM_MICROCHIP_OTPC) += nvmem-microchip-otpc.o
7171
nvmem-microchip-otpc-y := microchip-otpc.o
7272
obj-$(CONFIG_NVMEM_U_BOOT_ENV) += nvmem_u-boot-env.o
7373
nvmem_u-boot-env-y := u-boot-env.o

‎drivers/soc/mediatek/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ config MTK_MMSYS
7575

7676
config MTK_SVS
7777
tristate "MediaTek Smart Voltage Scaling(SVS)"
78-
depends on MTK_EFUSE && NVMEM
78+
depends on NVMEM_MTK_EFUSE && NVMEM
7979
help
8080
The Smart Voltage Scaling(SVS) engine is a piece of hardware
8181
which has several controllers(banks) for calculating suitable

‎drivers/thermal/qcom/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config QCOM_TSENS
33
tristate "Qualcomm TSENS Temperature Alarm"
4-
depends on QCOM_QFPROM
4+
depends on NVMEM_QCOM_QFPROM
55
depends on ARCH_QCOM || COMPILE_TEST
66
help
77
This enables the thermal sysfs driver for the TSENS device. It shows

0 commit comments

Comments
 (0)