Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[cascardo/linux.git] / drivers / staging / android / ion / Kconfig

diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig
index 19c1572..c8fb413 100644 (file)
--- a/drivers/staging/android/ion/Kconfig
+++ b/drivers/staging/android/ion/Kconfig
@@ -36,7 +36,19 @@ config ION_TEGRA
 config ION_HISI
        tristate "Ion for Hisilicon"
        depends on ARCH_HISI && ION
+       select ION_OF
        help
          Choose this option if you wish to use ion on Hisilicon Platform.
 
 source "drivers/staging/android/ion/hisilicon/Kconfig"
+
+config ION_OF
+       bool "Devicetree support for Ion"
+       depends on ION && OF_ADDRESS
+       help
+         Provides base support for defining Ion heaps in devicetree
+         and setting them up. Also includes functions for platforms
+         to parse the devicetree and expand for their own custom
+         extensions
+
+         If using Ion and devicetree, you should say Y here