aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyril Chemparathy <cyril@ti.com>2010-05-02 14:28:14 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-05-06 18:02:10 -0400
commite2800007f3b9aab51c1fe866034db576d3a9fd83 (patch)
treeabc5d208b12b7cb02e6d440e3165e9163f4621a8
parent9ee1acefa86083c6acf4112983b88a0057eb7785 (diff)
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>
-rw-r--r--arch/arm/mach-davinci/serial.c2
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)
107 pr_err("uart regs ioremap failed\n"); 107 pr_err("uart regs ioremap failed\n");
108 } 108 }
109 109
110 if (p->membase) 110 if (p->membase && p->type != PORT_AR7)
111 davinci_serial_reset(p); 111 davinci_serial_reset(p);
112 } 112 }
113 113