aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/serial.c
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@iki.fi>2009-08-28 13:51:31 -0400
committerTony Lindgren <tony@atomide.com>2009-08-28 13:51:31 -0400
commit15ac408ee5a509053a765b816e9179515329369f (patch)
treee3c95e9d8ede539755df390be3647aa8ebaa7a80 /arch/arm/mach-omap2/serial.c
parent987cadcf3ccf9e5bde7a31d9be392f9de5f88833 (diff)
OMAP: UART: drop OMAP_TAG_UART, enable all UARTs, auto-disabled on idle
OMAP tags are deprecrated so drop them. Drop UART config data which decides which UARTs to enable during boot. This is no longer necessary since serial core code disables clocks after inactivity. Background: with new UART idle code, all on-chip UARTs are idled using a configurable inactivity timer (default 5 seconds.) After the inactivity timer, UART clocks are disabled automatically. Signed-off-by: Kalle Valo <kalle.valo@iki.fi> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
-rw-r--r--arch/arm/mach-omap2/serial.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 42449002f60..409b03309af 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -555,7 +555,6 @@ static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = {
555void __init omap_serial_init(void) 555void __init omap_serial_init(void)
556{ 556{
557 int i; 557 int i;
558 const struct omap_uart_config *info;
559 char name[16]; 558 char name[16];
560 559
561 /* 560 /*
@@ -564,23 +563,12 @@ void __init omap_serial_init(void)
564 * if not needed. 563 * if not needed.
565 */ 564 */
566 565
567 info = omap_get_config(OMAP_TAG_UART, struct omap_uart_config);
568
569 if (info == NULL)
570 return;
571
572 for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { 566 for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
573 struct omap_uart_state *uart = &omap_uart[i]; 567 struct omap_uart_state *uart = &omap_uart[i];
574 struct platform_device *pdev = &uart->pdev; 568 struct platform_device *pdev = &uart->pdev;
575 struct device *dev = &pdev->dev; 569 struct device *dev = &pdev->dev;
576 struct plat_serial8250_port *p = dev->platform_data; 570 struct plat_serial8250_port *p = dev->platform_data;
577 571
578 if (!(info->enabled_uarts & (1 << i))) {
579 p->membase = NULL;
580 p->mapbase = 0;
581 continue;
582 }
583
584 sprintf(name, "uart%d_ick", i+1); 572 sprintf(name, "uart%d_ick", i+1);
585 uart->ick = clk_get(NULL, name); 573 uart->ick = clk_get(NULL, name);
586 if (IS_ERR(uart->ick)) { 574 if (IS_ERR(uart->ick)) {