target/linux/generic/backport-5.10/811-v6.1-0005-nvmem-prefix-all-symbols-with-NVMEM_.patch

   1 From 28fc7c986f01fdcfd28af648be2597624cac0e27 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Fri, 16 Sep 2022 13:20:54 +0100
   4 Subject: [PATCH] nvmem: prefix all symbols with NVMEM_
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This unifies all NVMEM symbols. They follow one style now.
  10
  11 Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
  12 Acked-by: Arnd Bergmann <arnd@arndb.de>
  13 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  14 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  15 Link: https://lore.kernel.org/r/20220916122100.170016-8-srinivas.kandagatla@linaro.org
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17 ---
  18  arch/arm/configs/multi_v7_defconfig |  6 +++---
  19  arch/arm/configs/qcom_defconfig     |  2 +-
  20  arch/arm64/configs/defconfig        | 10 +++++-----
  21  arch/mips/configs/ci20_defconfig    |  2 +-
  22  drivers/cpufreq/Kconfig.arm         |  2 +-
  23  drivers/nvmem/Kconfig               | 24 ++++++++++++------------
  24  drivers/nvmem/Makefile              | 24 ++++++++++++------------
  25  drivers/soc/mediatek/Kconfig        |  2 +-
  26  drivers/thermal/qcom/Kconfig        |  2 +-
  27  9 files changed, 37 insertions(+), 37 deletions(-)
  28
  29 --- a/arch/arm/configs/multi_v7_defconfig
  30 +++ b/arch/arm/configs/multi_v7_defconfig
  31 @@ -1085,10 +1085,10 @@ CONFIG_OMAP_USB2=y
  32  CONFIG_TI_PIPE3=y
  33  CONFIG_TWL4030_USB=m
  34  CONFIG_NVMEM_IMX_OCOTP=y
  35 -CONFIG_ROCKCHIP_EFUSE=m
  36 +CONFIG_NVMEM_ROCKCHIP_EFUSE=m
  37  CONFIG_NVMEM_SUNXI_SID=y
  38  CONFIG_NVMEM_VF610_OCOTP=y
  39 -CONFIG_MESON_MX_EFUSE=m
  40 +CONFIG_NVMEM_MESON_MX_EFUSE=m
  41  CONFIG_FSI=m
  42  CONFIG_FSI_MASTER_GPIO=m
  43  CONFIG_FSI_MASTER_HUB=m
  44 --- a/arch/arm/configs/qcom_defconfig
  45 +++ b/arch/arm/configs/qcom_defconfig
  46 @@ -257,7 +257,7 @@ CONFIG_PHY_QCOM_APQ8064_SATA=y
  47  CONFIG_PHY_QCOM_IPQ806X_SATA=y
  48  CONFIG_PHY_QCOM_USB_HS=y
  49  CONFIG_PHY_QCOM_USB_HSIC=y
  50 -CONFIG_QCOM_QFPROM=y
  51 +CONFIG_NVMEM_QCOM_QFPROM=y
  52  CONFIG_INTERCONNECT=y
  53  CONFIG_INTERCONNECT_QCOM=y
  54  CONFIG_INTERCONNECT_QCOM_MSM8974=m
  55 --- a/arch/arm64/configs/defconfig
  56 +++ b/arch/arm64/configs/defconfig
  57 @@ -1022,11 +1022,11 @@ CONFIG_QCOM_L2_PMU=y
  58  CONFIG_QCOM_L3_PMU=y
  59  CONFIG_NVMEM_IMX_OCOTP=y
  60  CONFIG_NVMEM_IMX_OCOTP_SCU=y
  61 -CONFIG_QCOM_QFPROM=y
  62 -CONFIG_ROCKCHIP_EFUSE=y
  63 +CONFIG_NVMEM_QCOM_QFPROM=y
  64 +CONFIG_NVMEM_ROCKCHIP_EFUSE=y
  65  CONFIG_NVMEM_SUNXI_SID=y
  66 -CONFIG_UNIPHIER_EFUSE=y
  67 -CONFIG_MESON_EFUSE=m
  68 +CONFIG_NVMEM_UNIPHIER_EFUSE=y
  69 +CONFIG_NVMEM_MESON_EFUSE=m
  70  CONFIG_FPGA=y
  71  CONFIG_FPGA_MGR_STRATIX10_SOC=m
  72  CONFIG_FPGA_BRIDGE=m
  73 --- a/drivers/cpufreq/Kconfig.arm
  74 +++ b/drivers/cpufreq/Kconfig.arm
  75 @@ -131,7 +131,7 @@ config ARM_OMAP2PLUS_CPUFREQ
  76  config ARM_QCOM_CPUFREQ_NVMEM
  77         tristate "Qualcomm nvmem based CPUFreq"
  78         depends on ARCH_QCOM
  79 -       depends on QCOM_QFPROM
  80 +       depends on NVMEM_QCOM_QFPROM
  81         depends on QCOM_SMEM
  82         select PM_OPP
  83         help
  84 --- a/drivers/nvmem/Kconfig
  85 +++ b/drivers/nvmem/Kconfig
  86 @@ -52,7 +52,7 @@ config NVMEM_IMX_OCOTP_SCU
  87           This is a driver for the SCU On-Chip OTP Controller (OCOTP)
  88           available on i.MX8 SoCs.
  89
  90 -config JZ4780_EFUSE
  91 +config NVMEM_JZ4780_EFUSE
  92         tristate "JZ4780 EFUSE Memory Support"
  93         depends on MACH_INGENIC || COMPILE_TEST
  94         depends on HAS_IOMEM
  95 @@ -96,7 +96,7 @@ config NVMEM_MXS_OCOTP
  96           This driver can also be built as a module. If so, the module
  97           will be called nvmem-mxs-ocotp.
  98
  99 -config MTK_EFUSE
 100 +config NVMEM_MTK_EFUSE
 101         tristate "Mediatek SoCs EFUSE support"
 102         depends on ARCH_MEDIATEK || COMPILE_TEST
 103         depends on HAS_IOMEM
 104 @@ -107,7 +107,7 @@ config MTK_EFUSE
 105           This driver can also be built as a module. If so, the module
 106           will be called efuse-mtk.
 107
 108 -config MICROCHIP_OTPC
 109 +config NVMEM_MICROCHIP_OTPC
 110         tristate "Microchip OTPC support"
 111         depends on ARCH_AT91 || COMPILE_TEST
 112         help
 113 @@ -126,7 +126,7 @@ config NVMEM_NINTENDO_OTP
 114           This driver can also be built as a module. If so, the module
 115           will be called nvmem-nintendo-otp.
 116
 117 -config QCOM_QFPROM
 118 +config NVMEM_QCOM_QFPROM
 119         tristate "QCOM QFPROM Support"
 120         depends on ARCH_QCOM || COMPILE_TEST
 121         depends on HAS_IOMEM
 122 @@ -145,7 +145,7 @@ config NVMEM_SPMI_SDAM
 123           Qualcomm Technologies, Inc. PMICs. It provides the clients
 124           an interface to read/write to the SDAM module's shared memory.
 125
 126 -config ROCKCHIP_EFUSE
 127 +config NVMEM_ROCKCHIP_EFUSE
 128         tristate "Rockchip eFuse Support"
 129         depends on ARCH_ROCKCHIP || COMPILE_TEST
 130         depends on HAS_IOMEM
 131 @@ -156,7 +156,7 @@ config ROCKCHIP_EFUSE
 132           This driver can also be built as a module. If so, the module
 133           will be called nvmem_rockchip_efuse.
 134
 135 -config ROCKCHIP_OTP
 136 +config NVMEM_ROCKCHIP_OTP
 137         tristate "Rockchip OTP controller support"
 138         depends on ARCH_ROCKCHIP || COMPILE_TEST
 139         depends on HAS_IOMEM
 140 @@ -199,7 +199,7 @@ config NVMEM_SUNXI_SID
 141           This driver can also be built as a module. If so, the module
 142           will be called nvmem_sunxi_sid.
 143
 144 -config UNIPHIER_EFUSE
 145 +config NVMEM_UNIPHIER_EFUSE
 146         tristate "UniPhier SoCs eFuse support"
 147         depends on ARCH_UNIPHIER || COMPILE_TEST
 148         depends on HAS_IOMEM
 149 @@ -221,7 +221,7 @@ config NVMEM_VF610_OCOTP
 150           This driver can also be build as a module. If so, the module will
 151           be called nvmem-vf610-ocotp.
 152
 153 -config MESON_EFUSE
 154 +config NVMEM_MESON_EFUSE
 155         tristate "Amlogic Meson GX eFuse Support"
 156         depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
 157         help
 158 @@ -231,7 +231,7 @@ config MESON_EFUSE
 159           This driver can also be built as a module. If so, the module
 160           will be called nvmem_meson_efuse.
 161
 162 -config MESON_MX_EFUSE
 163 +config NVMEM_MESON_MX_EFUSE
 164         tristate "Amlogic Meson6/Meson8/Meson8b eFuse Support"
 165         depends on ARCH_MESON || COMPILE_TEST
 166         help
 167 @@ -251,13 +251,13 @@ config NVMEM_SNVS_LPGPR
 168           This driver can also be built as a module. If so, the module
 169           will be called nvmem-snvs-lpgpr.
 170
 171 -config RAVE_SP_EEPROM
 172 +config NVMEM_RAVE_SP_EEPROM
 173         tristate "Rave SP EEPROM Support"
 174         depends on RAVE_SP_CORE
 175         help
 176           Say y here to enable Rave SP EEPROM support.
 177
 178 -config SC27XX_EFUSE
 179 +config NVMEM_SC27XX_EFUSE
 180         tristate "Spreadtrum SC27XX eFuse Support"
 181         depends on MFD_SC27XX_PMIC || COMPILE_TEST
 182         depends on HAS_IOMEM
 183 @@ -278,7 +278,7 @@ config NVMEM_ZYNQMP
 184
 185           If sure, say yes. If unsure, say no.
 186
 187 -config SPRD_EFUSE
 188 +config NVMEM_SPRD_EFUSE
 189         tristate "Spreadtrum SoC eFuse Support"
 190         depends on ARCH_SPRD || COMPILE_TEST
 191         depends on HAS_IOMEM
 192 --- a/drivers/nvmem/Makefile
 193 +++ b/drivers/nvmem/Makefile
 194 @@ -15,7 +15,7 @@ obj-$(CONFIG_NVMEM_IMX_OCOTP) += nvmem-i
 195  nvmem-imx-ocotp-y              := imx-ocotp.o
 196  obj-$(CONFIG_NVMEM_IMX_OCOTP_SCU)      += nvmem-imx-ocotp-scu.o
 197  nvmem-imx-ocotp-scu-y          := imx-ocotp-scu.o
 198 -obj-$(CONFIG_JZ4780_EFUSE)             += nvmem_jz4780_efuse.o
 199 +obj-$(CONFIG_NVMEM_JZ4780_EFUSE)               += nvmem_jz4780_efuse.o
 200  nvmem_jz4780_efuse-y           := jz4780-efuse.o
 201  obj-$(CONFIG_NVMEM_LPC18XX_EEPROM)     += nvmem_lpc18xx_eeprom.o
 202  nvmem_lpc18xx_eeprom-y := lpc18xx_eeprom.o
 203 @@ -25,37 +25,37 @@ obj-$(CONFIG_NVMEM_MXS_OCOTP)       += nvmem-m
 204  nvmem-mxs-ocotp-y              := mxs-ocotp.o
 205  obj-$(CONFIG_NVMEM_NINTENDO_OTP)       += nvmem-nintendo-otp.o
 206  nvmem-nintendo-otp-y           := nintendo-otp.o
 207 -obj-$(CONFIG_MTK_EFUSE)                += nvmem_mtk-efuse.o
 208 +obj-$(CONFIG_NVMEM_MTK_EFUSE)          += nvmem_mtk-efuse.o
 209  nvmem_mtk-efuse-y              := mtk-efuse.o
 210 -obj-$(CONFIG_QCOM_QFPROM)      += nvmem_qfprom.o
 211 +obj-$(CONFIG_NVMEM_QCOM_QFPROM)        += nvmem_qfprom.o
 212  nvmem_qfprom-y                 := qfprom.o
 213  obj-$(CONFIG_NVMEM_SPMI_SDAM)  += nvmem_qcom-spmi-sdam.o
 214  nvmem_qcom-spmi-sdam-y         += qcom-spmi-sdam.o
 215 -obj-$(CONFIG_ROCKCHIP_EFUSE)   += nvmem_rockchip_efuse.o
 216 +obj-$(CONFIG_NVMEM_ROCKCHIP_EFUSE)     += nvmem_rockchip_efuse.o
 217  nvmem_rockchip_efuse-y         := rockchip-efuse.o
 218 -obj-$(CONFIG_ROCKCHIP_OTP)     += nvmem-rockchip-otp.o
 219 +obj-$(CONFIG_NVMEM_ROCKCHIP_OTP)       += nvmem-rockchip-otp.o
 220  nvmem-rockchip-otp-y           := rockchip-otp.o
 221  obj-$(CONFIG_NVMEM_SUNXI_SID)  += nvmem_sunxi_sid.o
 222  nvmem_stm32_romem-y            := stm32-romem.o
 223  obj-$(CONFIG_NVMEM_STM32_ROMEM) += nvmem_stm32_romem.o
 224  nvmem_sunxi_sid-y              := sunxi_sid.o
 225 -obj-$(CONFIG_UNIPHIER_EFUSE)   += nvmem-uniphier-efuse.o
 226 +obj-$(CONFIG_NVMEM_UNIPHIER_EFUSE)     += nvmem-uniphier-efuse.o
 227  nvmem-uniphier-efuse-y         := uniphier-efuse.o
 228  obj-$(CONFIG_NVMEM_VF610_OCOTP)        += nvmem-vf610-ocotp.o
 229  nvmem-vf610-ocotp-y            := vf610-ocotp.o
 230 -obj-$(CONFIG_MESON_EFUSE)      += nvmem_meson_efuse.o
 231 +obj-$(CONFIG_NVMEM_MESON_EFUSE)        += nvmem_meson_efuse.o
 232  nvmem_meson_efuse-y            := meson-efuse.o
 233 -obj-$(CONFIG_MESON_MX_EFUSE)   += nvmem_meson_mx_efuse.o
 234 +obj-$(CONFIG_NVMEM_MESON_MX_EFUSE)     += nvmem_meson_mx_efuse.o
 235  nvmem_meson_mx_efuse-y         := meson-mx-efuse.o
 236  obj-$(CONFIG_NVMEM_SNVS_LPGPR) += nvmem_snvs_lpgpr.o
 237  nvmem_snvs_lpgpr-y             := snvs_lpgpr.o
 238 -obj-$(CONFIG_RAVE_SP_EEPROM)   += nvmem-rave-sp-eeprom.o
 239 +obj-$(CONFIG_NVMEM_RAVE_SP_EEPROM)     += nvmem-rave-sp-eeprom.o
 240  nvmem-rave-sp-eeprom-y         := rave-sp-eeprom.o
 241 -obj-$(CONFIG_SC27XX_EFUSE)     += nvmem-sc27xx-efuse.o
 242 +obj-$(CONFIG_NVMEM_SC27XX_EFUSE)       += nvmem-sc27xx-efuse.o
 243  nvmem-sc27xx-efuse-y           := sc27xx-efuse.o
 244  obj-$(CONFIG_NVMEM_ZYNQMP)     += nvmem_zynqmp_nvmem.o
 245  nvmem_zynqmp_nvmem-y           := zynqmp_nvmem.o
 246 -obj-$(CONFIG_SPRD_EFUSE)       += nvmem_sprd_efuse.o
 247 +obj-$(CONFIG_NVMEM_SPRD_EFUSE) += nvmem_sprd_efuse.o
 248  nvmem_sprd_efuse-y             := sprd-efuse.o
 249  obj-$(CONFIG_NVMEM_RMEM)       += nvmem-rmem.o
 250  nvmem-rmem-y                   := rmem.o
 251 @@ -67,7 +67,7 @@ obj-$(CONFIG_NVMEM_SUNPLUS_OCOTP)     += nvm
 252  nvmem_sunplus_ocotp-y          := sunplus-ocotp.o
 253  obj-$(CONFIG_NVMEM_APPLE_EFUSES)       += nvmem-apple-efuses.o
 254  nvmem-apple-efuses-y           := apple-efuses.o
 255 -obj-$(CONFIG_MICROCHIP_OTPC)   += nvmem-microchip-otpc.o
 256 +obj-$(CONFIG_NVMEM_MICROCHIP_OTPC)     += nvmem-microchip-otpc.o
 257  nvmem-microchip-otpc-y         := microchip-otpc.o
 258  obj-$(CONFIG_NVMEM_U_BOOT_ENV) += nvmem_u-boot-env.o
 259  nvmem_u-boot-env-y             := u-boot-env.o
 260 --- a/drivers/thermal/qcom/Kconfig
 261 +++ b/drivers/thermal/qcom/Kconfig
 262 @@ -1,7 +1,7 @@
 263  # SPDX-License-Identifier: GPL-2.0-only
 264  config QCOM_TSENS
 265         tristate "Qualcomm TSENS Temperature Alarm"
 266 -       depends on QCOM_QFPROM
 267 +       depends on NVMEM_QCOM_QFPROM
 268         depends on ARCH_QCOM || COMPILE_TEST
 269         help
 270           This enables the thermal sysfs driver for the TSENS device. It shows