]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Davinci: serial - conditional reset via pwremu
authorCyril Chemparathy <cyril@ti.com>
Sun, 2 May 2010 18:28:14 +0000 (14:28 -0400)
committerKevin Hilman <khilman@deeprootsystems.com>
Thu, 6 May 2010 22:02:10 +0000 (15:02 -0700)
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>
arch/arm/mach-davinci/serial.c

index 81af42ca29d201d52dfc3952e527c2fd51ce6745..1875740fe27cb030cdc71db2772adfbd5cc2e788 100644 (file)
@@ -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);
        }