From: Linus Walleij <linus.wall...@linaro.org>

[ Upstream commit d2854bbe5f5c4b4bec8061caf4f2e603d8819446 ]

The CMA and DMA_CMA Kconfig options need to be selected
by the Integrator in order to produce boot console on some
Integrator systems.

The REGULATOR and REGULATOR_FIXED_VOLTAGE need to be
selected in order to boot the system from an external
MMC card when using MMCI/PL181 from the device tree
probe path.

Select these things directly from the Kconfig so we are
sure to be able to bring the systems up with console
from any device tree.

Signed-off-by: Linus Walleij <linus.wall...@linaro.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 arch/arm/mach-integrator/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 982eabc36163..2406cab73835 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -4,6 +4,8 @@ menuconfig ARCH_INTEGRATOR
        depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6
        select ARM_AMBA
        select COMMON_CLK_VERSATILE
+       select CMA
+       select DMA_CMA
        select HAVE_TCM
        select ICST
        select MFD_SYSCON
@@ -35,14 +37,13 @@ config INTEGRATOR_IMPD1
        select ARM_VIC
        select GPIO_PL061
        select GPIOLIB
+       select REGULATOR
+       select REGULATOR_FIXED_VOLTAGE
        help
          The IM-PD1 is an add-on logic module for the Integrator which
          allows ARM(R) Ltd PrimeCells to be developed and evaluated.
          The IM-PD1 can be found on the Integrator/PP2 platform.
 
-         To compile this driver as a module, choose M here: the
-         module will be called impd1.
-
 config INTEGRATOR_CM7TDMI
        bool "Integrator/CM7TDMI core module"
        depends on ARCH_INTEGRATOR_AP
-- 
2.25.1

Reply via email to