kernel: bump 5.15 to 5.15.116

[openwrt/staging/wigyori.git] / target / linux / generic / backport-5.15 / 807-v6.1-0005-nvmem-prefix-all-symbols-with-NVMEM_.patch

From 28fc7c986f01fdcfd28af648be2597624cac0e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
Date: Fri, 16 Sep 2022 13:20:54 +0100
Subject: [PATCH] nvmem: prefix all symbols with NVMEM_
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 arch/arm/configs/multi_v7_defconfig |  6 +++---
 arch/arm/configs/qcom_defconfig     |  2 +-
 arch/arm64/configs/defconfig        | 10 +++++-----
 arch/mips/configs/ci20_defconfig    |  2 +-
 drivers/cpufreq/Kconfig.arm         |  2 +-
 drivers/nvmem/Kconfig               | 24 ++++++++++++------------
 drivers/nvmem/Makefile              | 24 ++++++++++++------------
 drivers/soc/mediatek/Kconfig        |  2 +-
 drivers/thermal/qcom/Kconfig        |  2 +-
 9 files changed, 37 insertions(+), 37 deletions(-)

--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -1124,10 +1124,10 @@ CONFIG_TI_PIPE3=y
 CONFIG_TWL4030_USB=m
 CONFIG_RAS=y
 CONFIG_NVMEM_IMX_OCOTP=y
-CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
 CONFIG_NVMEM_SUNXI_SID=y
 CONFIG_NVMEM_VF610_OCOTP=y
-CONFIG_MESON_MX_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
 CONFIG_NVMEM_RMEM=m
 CONFIG_FSI=m
 CONFIG_FSI_MASTER_GPIO=m
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -274,7 +274,7 @@ CONFIG_PHY_QCOM_USB_HS=y
 CONFIG_PHY_QCOM_USB_HSIC=y
 CONFIG_PHY_QCOM_QMP=y
 CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y
-CONFIG_QCOM_QFPROM=y
+CONFIG_NVMEM_QCOM_QFPROM=y
 CONFIG_INTERCONNECT=y
 CONFIG_INTERCONNECT_QCOM=y
 CONFIG_INTERCONNECT_QCOM_MSM8974=m
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1135,11 +1135,11 @@ CONFIG_QCOM_L3_PMU=y
 CONFIG_NVMEM_IMX_OCOTP=y
 CONFIG_NVMEM_IMX_OCOTP_SCU=y
 CONFIG_QCOM_QFPROM=y
-CONFIG_MTK_EFUSE=y
-CONFIG_ROCKCHIP_EFUSE=y
+CONFIG_NVMEM_MTK_EFUSE=y
+CONFIG_NVMEM_ROCKCHIP_EFUSE=y
 CONFIG_NVMEM_SUNXI_SID=y
-CONFIG_UNIPHIER_EFUSE=y
-CONFIG_MESON_EFUSE=m
+CONFIG_NVMEM_UNIPHIER_EFUSE=y
+CONFIG_NVMEM_MESON_EFUSE=m
 CONFIG_NVMEM_RMEM=m
 CONFIG_FPGA=y
 CONFIG_FPGA_MGR_STRATIX10_SOC=m
--- a/arch/mips/configs/ci20_defconfig
+++ b/arch/mips/configs/ci20_defconfig
@@ -137,7 +137,7 @@ CONFIG_MEMORY=y
 CONFIG_JZ4780_NEMC=y
 CONFIG_PWM=y
 CONFIG_PWM_JZ4740=m
-CONFIG_JZ4780_EFUSE=y
+CONFIG_NVMEM_JZ4780_EFUSE=y
 CONFIG_JZ4770_PHY=y
 CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -153,7 +153,7 @@ config ARM_OMAP2PLUS_CPUFREQ
 config ARM_QCOM_CPUFREQ_NVMEM
        tristate "Qualcomm nvmem based CPUFreq"
        depends on ARCH_QCOM
-       depends on QCOM_QFPROM
+       depends on NVMEM_QCOM_QFPROM
        depends on QCOM_SMEM
        select PM_OPP
        help
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -52,7 +52,7 @@ config NVMEM_IMX_OCOTP_SCU
          This is a driver for the SCU On-Chip OTP Controller (OCOTP)
          available on i.MX8 SoCs.
 
-config JZ4780_EFUSE
+config NVMEM_JZ4780_EFUSE
        tristate "JZ4780 EFUSE Memory Support"
        depends on MACH_INGENIC || COMPILE_TEST
        depends on HAS_IOMEM
@@ -96,7 +96,7 @@ config NVMEM_MXS_OCOTP
          This driver can also be built as a module. If so, the module
          will be called nvmem-mxs-ocotp.
 
-config MTK_EFUSE
+config NVMEM_MTK_EFUSE
        tristate "Mediatek SoCs EFUSE support"
        depends on ARCH_MEDIATEK || COMPILE_TEST
        depends on HAS_IOMEM
@@ -107,7 +107,7 @@ config MTK_EFUSE
          This driver can also be built as a module. If so, the module
          will be called efuse-mtk.
 
-config MICROCHIP_OTPC
+config NVMEM_MICROCHIP_OTPC
        tristate "Microchip OTPC support"
        depends on ARCH_AT91 || COMPILE_TEST
        help
@@ -126,7 +126,7 @@ config NVMEM_NINTENDO_OTP
          This driver can also be built as a module. If so, the module
          will be called nvmem-nintendo-otp.
 
-config QCOM_QFPROM
+config NVMEM_QCOM_QFPROM
        tristate "QCOM QFPROM Support"
        depends on ARCH_QCOM || COMPILE_TEST
        depends on HAS_IOMEM
@@ -145,7 +145,7 @@ config NVMEM_SPMI_SDAM
          Qualcomm Technologies, Inc. PMICs. It provides the clients
          an interface to read/write to the SDAM module's shared memory.
 
-config ROCKCHIP_EFUSE
+config NVMEM_ROCKCHIP_EFUSE
        tristate "Rockchip eFuse Support"
        depends on ARCH_ROCKCHIP || COMPILE_TEST
        depends on HAS_IOMEM
@@ -156,7 +156,7 @@ config ROCKCHIP_EFUSE
          This driver can also be built as a module. If so, the module
          will be called nvmem_rockchip_efuse.
 
-config ROCKCHIP_OTP
+config NVMEM_ROCKCHIP_OTP
        tristate "Rockchip OTP controller support"
        depends on ARCH_ROCKCHIP || COMPILE_TEST
        depends on HAS_IOMEM
@@ -199,7 +199,7 @@ config NVMEM_SUNXI_SID
          This driver can also be built as a module. If so, the module
          will be called nvmem_sunxi_sid.
 
-config UNIPHIER_EFUSE
+config NVMEM_UNIPHIER_EFUSE
        tristate "UniPhier SoCs eFuse support"
        depends on ARCH_UNIPHIER || COMPILE_TEST
        depends on HAS_IOMEM
@@ -221,7 +221,7 @@ config NVMEM_VF610_OCOTP
          This driver can also be build as a module. If so, the module will
          be called nvmem-vf610-ocotp.
 
-config MESON_EFUSE
+config NVMEM_MESON_EFUSE
        tristate "Amlogic Meson GX eFuse Support"
        depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM
        help
@@ -231,7 +231,7 @@ config MESON_EFUSE
          This driver can also be built as a module. If so, the module
          will be called nvmem_meson_efuse.
 
-config MESON_MX_EFUSE
+config NVMEM_MESON_MX_EFUSE
        tristate "Amlogic Meson6/Meson8/Meson8b eFuse Support"
        depends on ARCH_MESON || COMPILE_TEST
        help
@@ -251,13 +251,13 @@ config NVMEM_SNVS_LPGPR
          This driver can also be built as a module. If so, the module
          will be called nvmem-snvs-lpgpr.
 
-config RAVE_SP_EEPROM
+config NVMEM_RAVE_SP_EEPROM
        tristate "Rave SP EEPROM Support"
        depends on RAVE_SP_CORE
        help
          Say y here to enable Rave SP EEPROM support.
 
-config SC27XX_EFUSE
+config NVMEM_SC27XX_EFUSE
        tristate "Spreadtrum SC27XX eFuse Support"
        depends on MFD_SC27XX_PMIC || COMPILE_TEST
        depends on HAS_IOMEM
@@ -278,7 +278,7 @@ config NVMEM_ZYNQMP
 
          If sure, say yes. If unsure, say no.
 
-config SPRD_EFUSE
+config NVMEM_SPRD_EFUSE
        tristate "Spreadtrum SoC eFuse Support"
        depends on ARCH_SPRD || COMPILE_TEST
        depends on HAS_IOMEM
--- a/drivers/nvmem/Makefile
+++ b/drivers/nvmem/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_NVMEM_IMX_OCOTP) += nvmem-i
 nvmem-imx-ocotp-y              := imx-ocotp.o
 obj-$(CONFIG_NVMEM_IMX_OCOTP_SCU)      += nvmem-imx-ocotp-scu.o
 nvmem-imx-ocotp-scu-y          := imx-ocotp-scu.o
-obj-$(CONFIG_JZ4780_EFUSE)             += nvmem_jz4780_efuse.o
+obj-$(CONFIG_NVMEM_JZ4780_EFUSE)               += nvmem_jz4780_efuse.o
 nvmem_jz4780_efuse-y           := jz4780-efuse.o
 obj-$(CONFIG_NVMEM_LPC18XX_EEPROM)     += nvmem_lpc18xx_eeprom.o
 nvmem_lpc18xx_eeprom-y := lpc18xx_eeprom.o
@@ -25,37 +25,37 @@ obj-$(CONFIG_NVMEM_MXS_OCOTP)       += nvmem-m
 nvmem-mxs-ocotp-y              := mxs-ocotp.o
 obj-$(CONFIG_NVMEM_NINTENDO_OTP)       += nvmem-nintendo-otp.o
 nvmem-nintendo-otp-y           := nintendo-otp.o
-obj-$(CONFIG_MTK_EFUSE)                += nvmem_mtk-efuse.o
+obj-$(CONFIG_NVMEM_MTK_EFUSE)          += nvmem_mtk-efuse.o
 nvmem_mtk-efuse-y              := mtk-efuse.o
-obj-$(CONFIG_QCOM_QFPROM)      += nvmem_qfprom.o
+obj-$(CONFIG_NVMEM_QCOM_QFPROM)        += nvmem_qfprom.o
 nvmem_qfprom-y                 := qfprom.o
 obj-$(CONFIG_NVMEM_SPMI_SDAM)  += nvmem_qcom-spmi-sdam.o
 nvmem_qcom-spmi-sdam-y         += qcom-spmi-sdam.o
-obj-$(CONFIG_ROCKCHIP_EFUSE)   += nvmem_rockchip_efuse.o
+obj-$(CONFIG_NVMEM_ROCKCHIP_EFUSE)     += nvmem_rockchip_efuse.o
 nvmem_rockchip_efuse-y         := rockchip-efuse.o
-obj-$(CONFIG_ROCKCHIP_OTP)     += nvmem-rockchip-otp.o
+obj-$(CONFIG_NVMEM_ROCKCHIP_OTP)       += nvmem-rockchip-otp.o
 nvmem-rockchip-otp-y           := rockchip-otp.o
 obj-$(CONFIG_NVMEM_SUNXI_SID)  += nvmem_sunxi_sid.o
 nvmem_stm32_romem-y            := stm32-romem.o
 obj-$(CONFIG_NVMEM_STM32_ROMEM) += nvmem_stm32_romem.o
 nvmem_sunxi_sid-y              := sunxi_sid.o
-obj-$(CONFIG_UNIPHIER_EFUSE)   += nvmem-uniphier-efuse.o
+obj-$(CONFIG_NVMEM_UNIPHIER_EFUSE)     += nvmem-uniphier-efuse.o
 nvmem-uniphier-efuse-y         := uniphier-efuse.o
 obj-$(CONFIG_NVMEM_VF610_OCOTP)        += nvmem-vf610-ocotp.o
 nvmem-vf610-ocotp-y            := vf610-ocotp.o
-obj-$(CONFIG_MESON_EFUSE)      += nvmem_meson_efuse.o
+obj-$(CONFIG_NVMEM_MESON_EFUSE)        += nvmem_meson_efuse.o
 nvmem_meson_efuse-y            := meson-efuse.o
-obj-$(CONFIG_MESON_MX_EFUSE)   += nvmem_meson_mx_efuse.o
+obj-$(CONFIG_NVMEM_MESON_MX_EFUSE)     += nvmem_meson_mx_efuse.o
 nvmem_meson_mx_efuse-y         := meson-mx-efuse.o
 obj-$(CONFIG_NVMEM_SNVS_LPGPR) += nvmem_snvs_lpgpr.o
 nvmem_snvs_lpgpr-y             := snvs_lpgpr.o
-obj-$(CONFIG_RAVE_SP_EEPROM)   += nvmem-rave-sp-eeprom.o
+obj-$(CONFIG_NVMEM_RAVE_SP_EEPROM)     += nvmem-rave-sp-eeprom.o
 nvmem-rave-sp-eeprom-y         := rave-sp-eeprom.o
-obj-$(CONFIG_SC27XX_EFUSE)     += nvmem-sc27xx-efuse.o
+obj-$(CONFIG_NVMEM_SC27XX_EFUSE)       += nvmem-sc27xx-efuse.o
 nvmem-sc27xx-efuse-y           := sc27xx-efuse.o
 obj-$(CONFIG_NVMEM_ZYNQMP)     += nvmem_zynqmp_nvmem.o
 nvmem_zynqmp_nvmem-y           := zynqmp_nvmem.o
-obj-$(CONFIG_SPRD_EFUSE)       += nvmem_sprd_efuse.o
+obj-$(CONFIG_NVMEM_SPRD_EFUSE) += nvmem_sprd_efuse.o
 nvmem_sprd_efuse-y             := sprd-efuse.o
 obj-$(CONFIG_NVMEM_RMEM)       += nvmem-rmem.o
 nvmem-rmem-y                   := rmem.o
@@ -67,7 +67,7 @@ obj-$(CONFIG_NVMEM_SUNPLUS_OCOTP)     += nvm
 nvmem_sunplus_ocotp-y          := sunplus-ocotp.o
 obj-$(CONFIG_NVMEM_APPLE_EFUSES)       += nvmem-apple-efuses.o
 nvmem-apple-efuses-y           := apple-efuses.o
-obj-$(CONFIG_MICROCHIP_OTPC)   += nvmem-microchip-otpc.o
+obj-$(CONFIG_NVMEM_MICROCHIP_OTPC)     += nvmem-microchip-otpc.o
 nvmem-microchip-otpc-y         := microchip-otpc.o
 obj-$(CONFIG_NVMEM_U_BOOT_ENV) += nvmem_u-boot-env.o
 nvmem_u-boot-env-y             := u-boot-env.o
--- a/drivers/thermal/qcom/Kconfig
+++ b/drivers/thermal/qcom/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config QCOM_TSENS
        tristate "Qualcomm TSENS Temperature Alarm"
-       depends on QCOM_QFPROM
+       depends on NVMEM_QCOM_QFPROM
        depends on ARCH_QCOM || COMPILE_TEST
        help
          This enables the thermal sysfs driver for the TSENS device. It shows