Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6efab15307265cb70f6404a17433ce9562e4af0e

Authored by Linus Walleij
Committed by Russell King
1 parent ee35887e4a
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ARM: 7239/1: integrator: explicitly select the serial drivers 

The defconfig for the Integrator only include the serial drivers
for the PL010 as found in the Integrator/AP, to make sure we
don't loose the serial console we simply select both PL010 and
PL011 drivers from the Integrator Kconfig entries so they are
always included when applicable.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

arch/arm/mach-integrator/Kconfig
Diff comments   View file @ 6efab15
... ... @@ -6,6 +6,8 @@
6 6 bool "Support Integrator/AP and Integrator/PP2 platforms"
7 7 select CLKSRC_MMIO
8 8 select MIGHT_HAVE_PCI
  9 + select SERIAL_AMBA_PL010
  10 + select SERIAL_AMBA_PL010_CONSOLE
9 11 help
10 12 Include support for the ARM(R) Integrator/AP and
11 13 Integrator/PP2 platforms.
... ... @@ -15,6 +17,8 @@
15 17 select ARCH_CINTEGRATOR
16 18 select ARM_TIMER_SP804
17 19 select PLAT_VERSATILE_CLCD
  20 + select SERIAL_AMBA_PL011
  21 + select SERIAL_AMBA_PL011_CONSOLE
18 22 help
19 23 Include support for the ARM(R) Integrator CP platform.
20 24