Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rafał Miłecki and committed by
Greg Kroah-Hartman
28fc7c98 105ca419

+37 -37
+3 -3
arch/arm/configs/multi_v7_defconfig
··· 1193 1193 CONFIG_TWL4030_USB=m 1194 1194 CONFIG_RAS=y 1195 1195 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 1198 1198 CONFIG_NVMEM_SUNXI_SID=y 1199 1199 CONFIG_NVMEM_VF610_OCOTP=y 1200 - CONFIG_MESON_MX_EFUSE=m 1200 + CONFIG_NVMEM_MESON_MX_EFUSE=m 1201 1201 CONFIG_NVMEM_RMEM=m 1202 1202 CONFIG_FSI=m 1203 1203 CONFIG_FSI_MASTER_GPIO=m
+1 -1
arch/arm/configs/qcom_defconfig
··· 278 278 CONFIG_PHY_QCOM_USB_HS=y 279 279 CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y 280 280 CONFIG_PHY_QCOM_USB_HSIC=y 281 - CONFIG_QCOM_QFPROM=y 281 + CONFIG_NVMEM_QCOM_QFPROM=y 282 282 CONFIG_INTERCONNECT=y 283 283 CONFIG_INTERCONNECT_QCOM=y 284 284 CONFIG_INTERCONNECT_QCOM_MSM8974=m
+5 -5
arch/arm64/configs/defconfig
··· 1236 1236 CONFIG_HISI_PMU=y 1237 1237 CONFIG_NVMEM_IMX_OCOTP=y 1238 1238 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 1242 1242 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 1245 1245 CONFIG_NVMEM_RMEM=m 1246 1246 CONFIG_NVMEM_LAYERSCAPE_SFP=m 1247 1247 CONFIG_FPGA=y
+1 -1
arch/mips/configs/ci20_defconfig
··· 143 143 CONFIG_JZ4780_NEMC=y 144 144 CONFIG_PWM=y 145 145 CONFIG_PWM_JZ4740=m 146 - CONFIG_JZ4780_EFUSE=y 146 + CONFIG_NVMEM_JZ4780_EFUSE=y 147 147 CONFIG_JZ4770_PHY=y 148 148 CONFIG_EXT4_FS=y 149 149 # CONFIG_DNOTIFY is not set
+1 -1
drivers/cpufreq/Kconfig.arm
··· 153 153 config ARM_QCOM_CPUFREQ_NVMEM 154 154 tristate "Qualcomm nvmem based CPUFreq" 155 155 depends on ARCH_QCOM 156 - depends on QCOM_QFPROM 156 + depends on NVMEM_QCOM_QFPROM 157 157 depends on QCOM_SMEM 158 158 select PM_OPP 159 159 help
+12 -12
drivers/nvmem/Kconfig
··· 52 52 This is a driver for the SCU On-Chip OTP Controller (OCOTP) 53 53 available on i.MX8 SoCs. 54 54 55 - config JZ4780_EFUSE 55 + config NVMEM_JZ4780_EFUSE 56 56 tristate "JZ4780 EFUSE Memory Support" 57 57 depends on MACH_INGENIC || COMPILE_TEST 58 58 depends on HAS_IOMEM ··· 96 96 This driver can also be built as a module. If so, the module 97 97 will be called nvmem-mxs-ocotp. 98 98 99 - config MTK_EFUSE 99 + config NVMEM_MTK_EFUSE 100 100 tristate "Mediatek SoCs EFUSE support" 101 101 depends on ARCH_MEDIATEK || COMPILE_TEST 102 102 depends on HAS_IOMEM ··· 107 107 This driver can also be built as a module. If so, the module 108 108 will be called efuse-mtk. 109 109 110 - config MICROCHIP_OTPC 110 + config NVMEM_MICROCHIP_OTPC 111 111 tristate "Microchip OTPC support" 112 112 depends on ARCH_AT91 || COMPILE_TEST 113 113 help ··· 126 126 This driver can also be built as a module. If so, the module 127 127 will be called nvmem-nintendo-otp. 128 128 129 - config QCOM_QFPROM 129 + config NVMEM_QCOM_QFPROM 130 130 tristate "QCOM QFPROM Support" 131 131 depends on ARCH_QCOM || COMPILE_TEST 132 132 depends on HAS_IOMEM ··· 145 145 Qualcomm Technologies, Inc. PMICs. It provides the clients 146 146 an interface to read/write to the SDAM module's shared memory. 147 147 148 - config ROCKCHIP_EFUSE 148 + config NVMEM_ROCKCHIP_EFUSE 149 149 tristate "Rockchip eFuse Support" 150 150 depends on ARCH_ROCKCHIP || COMPILE_TEST 151 151 depends on HAS_IOMEM ··· 156 156 This driver can also be built as a module. If so, the module 157 157 will be called nvmem_rockchip_efuse. 158 158 159 - config ROCKCHIP_OTP 159 + config NVMEM_ROCKCHIP_OTP 160 160 tristate "Rockchip OTP controller support" 161 161 depends on ARCH_ROCKCHIP || COMPILE_TEST 162 162 depends on HAS_IOMEM ··· 199 199 This driver can also be built as a module. If so, the module 200 200 will be called nvmem_sunxi_sid. 201 201 202 - config UNIPHIER_EFUSE 202 + config NVMEM_UNIPHIER_EFUSE 203 203 tristate "UniPhier SoCs eFuse support" 204 204 depends on ARCH_UNIPHIER || COMPILE_TEST 205 205 depends on HAS_IOMEM ··· 221 221 This driver can also be build as a module. If so, the module will 222 222 be called nvmem-vf610-ocotp. 223 223 224 - config MESON_EFUSE 224 + config NVMEM_MESON_EFUSE 225 225 tristate "Amlogic Meson GX eFuse Support" 226 226 depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM 227 227 help ··· 231 231 This driver can also be built as a module. If so, the module 232 232 will be called nvmem_meson_efuse. 233 233 234 - config MESON_MX_EFUSE 234 + config NVMEM_MESON_MX_EFUSE 235 235 tristate "Amlogic Meson6/Meson8/Meson8b eFuse Support" 236 236 depends on ARCH_MESON || COMPILE_TEST 237 237 help ··· 251 251 This driver can also be built as a module. If so, the module 252 252 will be called nvmem-snvs-lpgpr. 253 253 254 - config RAVE_SP_EEPROM 254 + config NVMEM_RAVE_SP_EEPROM 255 255 tristate "Rave SP EEPROM Support" 256 256 depends on RAVE_SP_CORE 257 257 help 258 258 Say y here to enable Rave SP EEPROM support. 259 259 260 - config SC27XX_EFUSE 260 + config NVMEM_SC27XX_EFUSE 261 261 tristate "Spreadtrum SC27XX eFuse Support" 262 262 depends on MFD_SC27XX_PMIC || COMPILE_TEST 263 263 depends on HAS_IOMEM ··· 278 278 279 279 If sure, say yes. If unsure, say no. 280 280 281 - config SPRD_EFUSE 281 + config NVMEM_SPRD_EFUSE 282 282 tristate "Spreadtrum SoC eFuse Support" 283 283 depends on ARCH_SPRD || COMPILE_TEST 284 284 depends on HAS_IOMEM
+12 -12
drivers/nvmem/Makefile
··· 15 15 nvmem-imx-ocotp-y := imx-ocotp.o 16 16 obj-$(CONFIG_NVMEM_IMX_OCOTP_SCU) += nvmem-imx-ocotp-scu.o 17 17 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 19 19 nvmem_jz4780_efuse-y := jz4780-efuse.o 20 20 obj-$(CONFIG_NVMEM_LPC18XX_EEPROM) += nvmem_lpc18xx_eeprom.o 21 21 nvmem_lpc18xx_eeprom-y := lpc18xx_eeprom.o ··· 25 25 nvmem-mxs-ocotp-y := mxs-ocotp.o 26 26 obj-$(CONFIG_NVMEM_NINTENDO_OTP) += nvmem-nintendo-otp.o 27 27 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 29 29 nvmem_mtk-efuse-y := mtk-efuse.o 30 - obj-$(CONFIG_QCOM_QFPROM) += nvmem_qfprom.o 30 + obj-$(CONFIG_NVMEM_QCOM_QFPROM) += nvmem_qfprom.o 31 31 nvmem_qfprom-y := qfprom.o 32 32 obj-$(CONFIG_NVMEM_SPMI_SDAM) += nvmem_qcom-spmi-sdam.o 33 33 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 35 35 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 37 37 nvmem-rockchip-otp-y := rockchip-otp.o 38 38 obj-$(CONFIG_NVMEM_SUNXI_SID) += nvmem_sunxi_sid.o 39 39 nvmem_stm32_romem-y := stm32-romem.o 40 40 obj-$(CONFIG_NVMEM_STM32_ROMEM) += nvmem_stm32_romem.o 41 41 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 43 43 nvmem-uniphier-efuse-y := uniphier-efuse.o 44 44 obj-$(CONFIG_NVMEM_VF610_OCOTP) += nvmem-vf610-ocotp.o 45 45 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 47 47 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 49 49 nvmem_meson_mx_efuse-y := meson-mx-efuse.o 50 50 obj-$(CONFIG_NVMEM_SNVS_LPGPR) += nvmem_snvs_lpgpr.o 51 51 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 53 53 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 55 55 nvmem-sc27xx-efuse-y := sc27xx-efuse.o 56 56 obj-$(CONFIG_NVMEM_ZYNQMP) += nvmem_zynqmp_nvmem.o 57 57 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 59 59 nvmem_sprd_efuse-y := sprd-efuse.o 60 60 obj-$(CONFIG_NVMEM_RMEM) += nvmem-rmem.o 61 61 nvmem-rmem-y := rmem.o ··· 67 67 nvmem_sunplus_ocotp-y := sunplus-ocotp.o 68 68 obj-$(CONFIG_NVMEM_APPLE_EFUSES) += nvmem-apple-efuses.o 69 69 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 71 71 nvmem-microchip-otpc-y := microchip-otpc.o 72 72 obj-$(CONFIG_NVMEM_U_BOOT_ENV) += nvmem_u-boot-env.o 73 73 nvmem_u-boot-env-y := u-boot-env.o
+1 -1
drivers/soc/mediatek/Kconfig
··· 75 75 76 76 config MTK_SVS 77 77 tristate "MediaTek Smart Voltage Scaling(SVS)" 78 - depends on MTK_EFUSE && NVMEM 78 + depends on NVMEM_MTK_EFUSE && NVMEM 79 79 help 80 80 The Smart Voltage Scaling(SVS) engine is a piece of hardware 81 81 which has several controllers(banks) for calculating suitable
+1 -1
drivers/thermal/qcom/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 2 config QCOM_TSENS 3 3 tristate "Qualcomm TSENS Temperature Alarm" 4 - depends on QCOM_QFPROM 4 + depends on NVMEM_QCOM_QFPROM 5 5 depends on ARCH_QCOM || COMPILE_TEST 6 6 help 7 7 This enables the thermal sysfs driver for the TSENS device. It shows