Merge branch 'omap-3.0p' into jb-dev-41

Conflicts:
	arch/arm/mach-omap2/board-44xx-tablet-panel.c
	arch/arm/mach-omap2/emif.c
	drivers/net/usb/asix.c
	drivers/usb/otg/twl6030-usb.c
	drivers/video/omap2/displays/Kconfig
	drivers/video/omap2/displays/Makefile
	drivers/video/omap2/dss/hdmi_panel.c
	drivers/video/omap2/omaplfb/omaplfb_bv.c
	include/linux/i2c/twl.h

arch/arm/common/fiq_debugger.c

@@ -367,8 +367,7 @@ static void dump_allregs(struct fiq_debugger_state *state, unsigned *regs)
 
 static void dump_irqs(struct fiq_debugger_state *state)
 {
-	int n;
-	unsigned int cpu;
+	unsigned int n;
 
 	debug_printf(state, "irqnr       total  since-last   status  name\n");
 	for (n = 0; n < NR_IRQS; n++) {
@@ -383,15 +382,17 @@ static void dump_irqs(struct fiq_debugger_state *state)
 		state->last_irqs[n] = kstat_irqs(n);
 	}
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++) {
+#ifdef CONFIG_LOCAL_TIMERS
+	for (n = 0; n < NR_CPUS; n++) {
 
-		debug_printf(state, "LOC %d: %10u %11u\n", cpu,
-			     __IRQ_STAT(cpu, local_timer_irqs),
-			     __IRQ_STAT(cpu, local_timer_irqs) -
-			     state->last_local_timer_irqs[cpu]);
-		state->last_local_timer_irqs[cpu] =
-			__IRQ_STAT(cpu, local_timer_irqs);
+		debug_printf(state, "LOC %d: %10u %11u\n", n,
+			     __IRQ_STAT(n, local_timer_irqs),
+			     __IRQ_STAT(n, local_timer_irqs) -
+			     state->last_local_timer_irqs[n]);
+		state->last_local_timer_irqs[n] =
+			__IRQ_STAT(n, local_timer_irqs);
 	}
+#endif
 }
 
 struct stacktrace_state {

arch/arm/configs/blaze_defconfig

@@ -168,18 +168,28 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_ACT_GACT=y
 CONFIG_NET_ACT_MIRRED=y
-CONFIG_BT=y
+CONFIG_BT=m
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP=m
 # CONFIG_BT_BNEP_MC_FILTER is not set
 # CONFIG_BT_BNEP_PROTO_FILTER is not set
-CONFIG_BT_HIDP=y
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_WILINK=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+CONFIG_BT_WILINK=m
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_CAIF=y
@@ -203,6 +213,7 @@ CONFIG_UID_STAT=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=y
+CONFIG_ST_GPS=m
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
@@ -266,6 +277,7 @@ CONFIG_OMAP2_DSS_DSI=y
 CONFIG_FB_OMAP2=y
 CONFIG_FB_OMAP2_NUM_FBS=2
 CONFIG_PANEL_TAAL=y
+CONFIG_PANEL_LD089WU1=y
 CONFIG_OMAP4_HDCP=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y

arch/arm/mach-omap2/Kconfig

@@ -461,7 +461,7 @@ config OMAP4_DPLL_CASCADING
 config OMAP4_ONLY_OMAP4430_DPLL_CASCADING
        bool  "Enable DPLL Cascading for OMAP4430 only"
        depends on OMAP4_DPLL_CASCADING
-       default y
+       default n
        help
          Enables DPLL Cascading only for OMAP4430.
 	 Current DPLL cascading implementation is going to be used

arch/arm/mach-omap2/board-44xx-power.c

@@ -343,6 +343,7 @@ static struct twl4030_bci_platform_data bci_data = {
 	.max_charger_voltagemV		= 4560,
 	.max_bat_voltagemV		= 4200,
 	.low_bat_voltagemV		= 3300,
+	.max_battery_capacity		= 4000,
 	.battery_tmp_tbl		= batt_table,
 	.tblsize			= ARRAY_SIZE(batt_table),
 	.sense_resistor_mohm		= 10,
@@ -352,7 +353,6 @@ static struct twl4030_usb_data omap4_usbphy_data = {
 	.phy_init	= omap4430_phy_init,
 	.phy_exit	= omap4430_phy_exit,
 	.phy_power	= omap4430_phy_power,
-	.phy_set_clock	= omap4430_phy_set_clk,
 	.phy_suspend	= omap4430_phy_suspend,
 };
 

arch/arm/mach-omap2/board-44xx-tablet-buttons.c

@@ -146,6 +146,11 @@ int __init tablet_button_init(void)
 		tablet_gpio_leds[4].gpio = TABLET2_GREEN_LED_GPIO;
 	}
 
+	if (omap_board_uses_hsic()) {
+		tablet_gpio_leds[2].gpio = 104;
+		tablet_gpio_leds[3].gpio = 36;
+	}
+
 	platform_add_devices(tablet_devices, ARRAY_SIZE(tablet_devices));
 	return 0;