| From 0191f89faa03102bf15c3c1030cc6a2b141c4d09 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Feb 2020 15:27:54 +0100 |
| Subject: ARM: integrator: Add some Kconfig selections |
| |
| From: Linus Walleij <linus.walleij@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.walleij@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@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 cefe44f6889bd..ba124f8704fac 100644 |
| --- a/arch/arm/mach-integrator/Kconfig |
| +++ b/arch/arm/mach-integrator/Kconfig |
| @@ -3,6 +3,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 |
| @@ -34,14 +36,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 |
| |