Merge tag 'v3.16-rc5' into timers/core

[sfrench/cifs-2.6.git] / drivers / mtd / lpddr / Kconfig

diff --git a/drivers/mtd/lpddr/Kconfig b/drivers/mtd/lpddr/Kconfig
index 265f969817e3c69bf48e6fc8b33dea304f8eed98..3a19cbee24d7012c96b22d4c5fa94aaa713777f0 100644 (file)
--- a/drivers/mtd/lpddr/Kconfig
+++ b/drivers/mtd/lpddr/Kconfig
@@ -1,5 +1,5 @@
-menu "LPDDR flash memory drivers"
-       depends on MTD!=n
+menu "LPDDR & LPDDR2 PCM memory drivers"
+       depends on MTD
 
 config MTD_LPDDR
        tristate "Support for LPDDR flash chips"
@@ -17,4 +17,13 @@ config MTD_QINFO_PROBE
            Window QINFO interface, permits software to be used for entire
            families of devices. This serves similar purpose of CFI on legacy
            Flash products
+
+config MTD_LPDDR2_NVM
+       # ARM dependency is only for writel_relaxed()
+       depends on MTD && ARM
+       tristate "Support for LPDDR2-NVM flash chips"
+       help
+         This option enables support of PCM memories with a LPDDR2-NVM
+         (Low power double data rate 2) interface.
+
 endmenu