diff options
| author | Cyril Chemparathy <cyril@ti.com> | 2010-05-02 14:28:14 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-05-06 15:02:10 -0700 |
| commit | e2800007f3b9aab51c1fe866034db576d3a9fd83 (patch) | |
| tree | abc5d208b12b7cb02e6d440e3165e9163f4621a8 /arch/arm | |
| parent | 9ee1acefa86083c6acf4112983b88a0057eb7785 (diff) | |
| download | blackbird-op-linux-e2800007f3b9aab51c1fe866034db576d3a9fd83.tar.gz blackbird-op-linux-e2800007f3b9aab51c1fe866034db576d3a9fd83.zip | |
Davinci: serial - conditional reset via pwremu
With this patch, AR7 type uart ports are not reset via pwremu registers. This
allows davinci_serial_init() reuse on tnetv107x soc.
Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-davinci/serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c index 81af42ca29d2..1875740fe27c 100644 --- a/arch/arm/mach-davinci/serial.c +++ b/arch/arm/mach-davinci/serial.c @@ -107,7 +107,7 @@ int __init davinci_serial_init(struct davinci_uart_config *info) pr_err("uart regs ioremap failed\n"); } - if (p->membase) + if (p->membase && p->type != PORT_AR7) davinci_serial_reset(p); } |
