Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[firefly-linux-kernel-4.4.55.git] / drivers / of / Kconfig

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 7bcaeec876c0c3a5ea80a01d13b13b186bb2227f..07bb3c8f191bed56c6c2293d68cefb3a6aa678ac 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -34,7 +34,11 @@ config OF_PROMTREE
 # Hardly any platforms need this.  It is safe to select, but only do so if you
 # need it.
 config OF_DYNAMIC
-       bool
+       bool "Support for dynamic device trees" if OF_UNITTEST
+       help
+         On some platforms, the device tree can be manipulated at runtime.
+         While this option is selected automatically on such platforms, you
+         can enable it manually to improve device tree unit test coverage.
 
 config OF_ADDRESS
        def_bool y
@@ -46,7 +50,7 @@ config OF_ADDRESS_PCI
 
 config OF_IRQ
        def_bool y
-       depends on !SPARC
+       depends on !SPARC && IRQ_DOMAIN
 
 config OF_NET
        depends on NETDEVICES
@@ -87,5 +91,10 @@ config OF_OVERLAY
        bool "Device Tree overlays"
        select OF_DYNAMIC
        select OF_RESOLVE
+       help
+         Overlays are a method to dynamically modify part of the kernel's
+         device tree with dynamically loaded data.
+         While this option is selected automatically when needed, you can
+         enable it manually to improve device tree unit test coverage.
 
 endmenu # OF