Merge source.mvista.com:/home/git/linux-omap-2.6

arch/arm/plat-omap/dma.c

@@ -1378,6 +1378,14 @@ static int __init omap_init_dma(void)
 			dma_chan_count = 16;
 		} else
 			dma_chan_count = 9;
+		if (cpu_is_omap16xx()) {
+			u16 w;
+
+			/* this would prevent OMAP sleep */
+			w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+			w &= ~(1 << 8);
+			omap_writew(w, OMAP1610_DMA_LCD_CTRL);
+		}
 	} else if (cpu_is_omap24xx()) {
 		u8 revision = omap_readb(OMAP_DMA4_REVISION);
 		printk(KERN_INFO "OMAP DMA hardware revision %d.%d\n",

arch/arm/plat-omap/sti/sti-console.c

@@ -21,7 +21,7 @@
 
 static struct tty_driver *tty_driver;
 static DEFINE_SPINLOCK(sti_console_lock);
-static unsigned int sti_console_channel;
+static unsigned int sti_console_channel = -1;
 static int sti_line_done = -1;
 
 /*
@@ -143,7 +143,11 @@ static int __init sti_console_init(void)
 		sti_console_channel = info->channel;
 	}
 
+	if (unlikely(sti_console_channel == -1))
+		return -EINVAL;
+
 	register_console(&sti_console);
+
 	return 0;
 }
 __initcall(sti_console_init);
@@ -179,7 +183,7 @@ static int __init sti_tty_init(void)
 late_initcall(sti_tty_init);
 
 module_param(sti_console_channel, uint, 0);
-MODULE_PARM_DESC(sti_console_channel, "STI console channel (default 32)");
+MODULE_PARM_DESC(sti_console_channel, "STI console channel");
 MODULE_AUTHOR("Paul Mundt");
 MODULE_DESCRIPTION("OMAP STI console support");
 MODULE_LICENSE("GPL");

drivers/cbus/tahvo-usb.c

@@ -155,6 +155,9 @@ static int omap_otg_init(void)
 		return -ENODEV;
 	}
 #endif
+	OTG_SYSCON_1_REG &= ~OTG_IDLE_EN;
+	udelay(100);
+
 	/* some of these values are board-specific... */
 	OTG_SYSCON_2_REG |= OTG_EN
 		/* for B-device: */