diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-06-11 06:09:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | d5d16dd5d85cd65569fe141cffb0733a9148938a (patch) | |
| tree | 86a4abde877db7dd44083679036cb953cb3fb556 | |
| parent | 7fed74111196ceb982ce56a2dcec2db18e8f32ea (diff) | |
| parent | 9492208cde3a1b53175b4620ad47b53653a6bc58 (diff) | |
| download | olio-linux-3.10-d5d16dd5d85cd65569fe141cffb0733a9148938a.tar.xz olio-linux-3.10-d5d16dd5d85cd65569fe141cffb0733a9148938a.zip | |
Merge "Removing the occasional white screen on wake-up. 85% confident." into android-3.10-bringup
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 31 | ||||
| -rw-r--r-- | drivers/video/omap2/displays/panel-ili9342.c | 5 |
2 files changed, 32 insertions, 4 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index fd9226100e1..b28833d6827 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -908,13 +908,37 @@ CONFIG_BQL=y # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -# CONFIG_BT is not set +CONFIG_BT=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +# CONFIG_BT_BNEP is not set +# CONFIG_BT_HIDP is not set + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIBTUSB is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIUART_ATH3K is not set +# CONFIG_BT_HCIUART_LL is not set +# CONFIG_BT_HCIUART_3WIRE 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_AF_RXRPC is not set CONFIG_FIB_RULES=y # CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set +CONFIG_RFKILL=y +# CONFIG_RFKILL_PM is not set +CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL_REGULATOR is not set +CONFIG_RFKILL_GPIO=y +# CONFIG_RFKILL_WL18XX is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set @@ -1214,6 +1238,7 @@ CONFIG_SLHC=y # CONFIG_USB_RTL8150 is not set # CONFIG_USB_RTL8152 is not set # CONFIG_USB_USBNET is not set +# CONFIG_USB_HSO is not set # CONFIG_USB_IPHETH is not set # CONFIG_WLAN is not set @@ -1774,7 +1799,7 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 CONFIG_OMAP2_DSS_RESET=y CONFIG_FB_OMAP2=y CONFIG_FB_OMAP2_DEBUG_SUPPORT=y -CONFIG_FB_OMAP2_NUM_FBS=3 +CONFIG_FB_OMAP2_NUM_FBS=2 # # OMAP2/3 Display Device Drivers diff --git a/drivers/video/omap2/displays/panel-ili9342.c b/drivers/video/omap2/displays/panel-ili9342.c index c9890b8a653..42f23fdb4ff 100644 --- a/drivers/video/omap2/displays/panel-ili9342.c +++ b/drivers/video/omap2/displays/panel-ili9342.c @@ -76,6 +76,8 @@ static struct panel_config ili9342_panels[] = { .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE, }, .name = "olio_h1_panel", + .power_on_delay = 25, + .power_off_delay = 25, }, }; @@ -593,7 +595,8 @@ static int ili9342_resume(struct device *dev) { return ret; } - ili9342_init_seq(spi); /* init_ili9342_hw (spi); */ + /* ili9342_init_seq(spi); */ + init_ili9342_hw (spi); return 0; } |