Merge tag 'pwm/for-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[karo-tx-linux.git] / drivers / nvmem / Kconfig

diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index bc4ea585b42e72c469f6512bf2f1057b2ab723c8..ca52952d850f6b62ebd83cb572fe0078fc9f6218 100644 (file)
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -25,9 +25,19 @@ config NVMEM_IMX_OCOTP
          This driver can also be built as a module. If so, the module
          will be called nvmem-imx-ocotp.
 
+config NVMEM_LPC18XX_EEPROM
+       tristate "NXP LPC18XX EEPROM Memory Support"
+       depends on ARCH_LPC18XX || COMPILE_TEST
+       help
+         Say Y here to include support for NXP LPC18xx EEPROM memory found in
+         NXP LPC185x/3x and LPC435x/3x/2x/1x devices.
+         To compile this driver as a module, choose M here: the module
+         will be called nvmem_lpc18xx_eeprom.
+
 config NVMEM_MXS_OCOTP
        tristate "Freescale MXS On-Chip OTP Memory Support"
        depends on ARCH_MXS || COMPILE_TEST
+       depends on HAS_IOMEM
        help
          If you say Y here, you will get readonly access to the
          One Time Programmable memory pages that are stored
@@ -36,9 +46,21 @@ 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
+       tristate "Mediatek SoCs EFUSE support"
+       depends on ARCH_MEDIATEK || COMPILE_TEST
+       select REGMAP_MMIO
+       help
+         This is a driver to access hardware related data like sensor
+         calibration, HDMI impedance etc.
+
+         This driver can also be built as a module. If so, the module
+         will be called efuse-mtk.
+
 config QCOM_QFPROM
        tristate "QCOM QFPROM Support"
        depends on ARCH_QCOM || COMPILE_TEST
+       depends on HAS_IOMEM
        select REGMAP_MMIO
        help
          Say y here to enable QFPROM support. The QFPROM provides access
@@ -50,6 +72,7 @@ config QCOM_QFPROM
 config ROCKCHIP_EFUSE
        tristate "Rockchip eFuse Support"
        depends on ARCH_ROCKCHIP || COMPILE_TEST
+       depends on HAS_IOMEM
        help
          This is a simple drive to dump specified values of Rockchip SoC
          from eFuse, such as cpu-leakage.
@@ -71,6 +94,7 @@ config NVMEM_SUNXI_SID
 config NVMEM_VF610_OCOTP
        tristate "VF610 SoC OCOTP support"
        depends on SOC_VF610 || COMPILE_TEST
+       depends on HAS_IOMEM
        help
          This is a driver for the 'OCOTP' peripheral available on Vybrid
          devices like VF5xx and VF6xx.