Merge branch 'imx-nvmem' into thermal-soc

diff --combined drivers/thermal/Kconfig
index c70f6bf,cb14f1e..315ae29
--- 1/drivers/thermal/Kconfig
--- 2/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -206,6 -206,7 +206,7 @@@ config HISI_THERMA
  config IMX_THERMAL
        tristate "Temperature sensor driver for Freescale i.MX SoCs"
        depends on (ARCH_MXC && CPU_THERMAL) || COMPILE_TEST
+       depends on NVMEM || !NVMEM
        depends on MFD_SYSCON
        depends on OF
        help
@@@ -408,7 -409,7 +409,7 @@@ config MTK_THERMA
          controller present in Mediatek SoCs
  
  menu "Broadcom thermal drivers"
 -depends on ARCH_BCM || COMPILE_TEST
 +depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
  source "drivers/thermal/broadcom/Kconfig"
  endmenu