diff options
| author | Lokesh Vutla | 2015-09-19 15:00:16 +0530 |
|---|---|---|
| committer | Tom Rini | 2015-10-22 14:19:49 -0400 |
| commit | 8c80b1937b1b2a06acae5786e8e7c005fe28fd71 (patch) | |
| tree | 4c54102324e06b9e951a7f6b52ae9fa112314807 /arch/arm/mach-keystone | |
| parent | 0b06932cc3411a61ebd9c601101c5fb3e4e70a84 (diff) | |
ARM: keystone2: Fix serial port init
With CONFIG_DM_SERIAL is enabled NS16550_init() cannot be
called directly. Driver probe should be taking care of this.
So call this function only when DM_SERIAL is not enabled.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'arch/arm/mach-keystone')
| -rw-r--r-- | arch/arm/mach-keystone/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c index a9a7d411601..678afb16e12 100644 --- a/arch/arm/mach-keystone/init.c +++ b/arch/arm/mach-keystone/init.c @@ -122,8 +122,10 @@ int arch_cpu_init(void) * UART register PWREMU_MGMT is initialized. Linux UART * driver doesn't handle this. */ +#ifndef CONFIG_DM_SERIAL NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM2), CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); +#endif return 0; } |