Latest changes to the configuration, board file, gpio pins of the tps65910, no time-out for UART3, fix for reboot issue.

Change-Id: I79ab087c8406922ea5511b72f77440d97f2d5d0c

5 files changed, 49 insertions, 39 deletions

diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig
index 866a78d904e..f32d8cd5449 100644
--- a/arch/arm/configs/omap3_h1_defconfig
+++ b/arch/arm/configs/omap3_h1_defconfig
@@ -69,7 +69,7 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ is not set
+CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 
 #
@@ -89,7 +89,9 @@ CONFIG_TINY_PREEMPT_RCU=y
 CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_STALL_COMMON is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_BOOST=y
+CONFIG_RCU_BOOST_PRIO=1
+CONFIG_RCU_BOOST_DELAY=500
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
@@ -498,6 +500,7 @@ CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
 #
@@ -1576,7 +1579,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # MODULbus GPIO expanders:
 #
-# CONFIG_GPIO_TPS65910 is not set
+CONFIG_GPIO_TPS65910=y
 
 #
 # USB GPIO expanders:
@@ -1764,8 +1767,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
 
 #
 # Frame buffer hardware drivers
@@ -1783,21 +1786,20 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_SIMPLE is not set
 CONFIG_OMAP2_VRFB=y
 CONFIG_OMAP2_DSS=y
-CONFIG_OMAP2_DSS_DEBUG=y
-CONFIG_OMAP2_DSS_DEBUGFS=y
-# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set
 CONFIG_OMAP2_DSS_DPI=y
 # CONFIG_OMAP2_DSS_RFBI is not set
 # CONFIG_OMAP2_DSS_VENC is not set
-# CONFIG_OMAP4_DSS_HDMI is not set
+CONFIG_OMAP4_DSS_HDMI=y
 # CONFIG_OMAP2_DSS_SDI is not set
 # CONFIG_OMAP2_DSS_DSI is not set
 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
-CONFIG_OMAP2_DSS_RESET=y
+# CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET is not set
+# CONFIG_OMAP2_DSS_RESET is not set
 CONFIG_FB_OMAP2=y
 CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
-CONFIG_FB_OMAP2_NUM_FBS=1
+CONFIG_FB_OMAP2_NUM_FBS=3
 
 #
 # OMAP2/3 Display Device Drivers
@@ -1825,8 +1827,8 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_PCM_OSS is not set
 # CONFIG_SND_HRTIMER is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_RAWMIDI_SEQ is not set
@@ -1834,9 +1836,14 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_UA101 is not set
@@ -1848,9 +1855,12 @@ CONFIG_SND_SOC_DMAENGINE_PCM=y
 # CONFIG_SND_DESIGNWARE_I2S is not set
 CONFIG_SND_OMAP_SOC=y
 # CONFIG_SND_OMAP_SOC_C55 is not set
-# CONFIG_SND_OMAP_SOC_OMAP3_H1 is not set
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_OMAP3_H1=y
+# CONFIG_SND_OMAP_SOC_OMAP_HDMI is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_DMIC=y
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SOUND_PRIME is not set
 
@@ -2119,8 +2129,7 @@ CONFIG_LEDS_LM3530=y
 # LED Triggers
 #
 # CONFIG_LEDS_TRIGGERS is not set
-CONFIG_SWITCH=y
-# CONFIG_SWITCH_GPIO is not set
+# CONFIG_SWITCH is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
@@ -2229,6 +2238,7 @@ CONFIG_UIO=y
 CONFIG_UIO_PDRV=y
 CONFIG_UIO_PDRV_GENIRQ=y
 # CONFIG_UIO_DMEM_GENIRQ is not set
+# CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
 
 #
@@ -2398,7 +2408,12 @@ CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_ARM_ARCH_TIMER=y
 # CONFIG_MAILBOX is not set
-# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_OF_IOMMU=y
+CONFIG_OMAP_IOMMU=y
+CONFIG_OMAP_IOVMM=y
+CONFIG_OMAP_IOMMU_DEBUG=y
 
 #
 # Remoteproc drivers
@@ -2514,14 +2529,7 @@ CONFIG_IRQCHIP=y
 CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT23=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
+# CONFIG_EXT4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
@@ -2669,13 +2677,13 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_SECTION_MISMATCH=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_TOUCHSCREEN_DEBUG is not set
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_ON_OOPS_VALUE=1
 CONFIG_DETECT_HUNG_TASK=y
@@ -2702,7 +2710,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index fa9164322c3..d97f51f76be 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -428,8 +428,8 @@ static struct regulator_init_data tps65910_1v8 = {
     .constraints = {
         .min_uV            = 1800000,
         .max_uV            = 1800000,
-        .valid_modes_mask  = REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY,
-        .valid_ops_mask    = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, 
+        .valid_modes_mask  = REGULATOR_MODE_NORMAL | REGULATOR_MODE_IDLE |  REGULATOR_MODE_STANDBY,
+        .valid_ops_mask    = REGULATOR_CHANGE_MODE, 
         .always_on         = false,
         .apply_uV		   = true,
     },
@@ -1023,7 +1023,7 @@ static struct omap_uart_port_info omap_uart_ports[] = {
         .dma_rx_timeout   = DEFAULT_RXDMA_TIMEOUT,
         .dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,
         .autosuspend_timeout = -1,
-        .wakelock_timeout = 10000,
+        .wakelock_timeout = -1,
         .wakeup_capable = true,
     },
     {
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index ef13ad08afb..f8bc937728b 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -958,6 +958,7 @@ int __pm_runtime_resume(struct device *dev, int rpmflags)
 
 	spin_lock_irqsave(&dev->power.lock, flags);
 	retval = rpm_resume(dev, rpmflags);
+    BUG_ON (dev == NULL); /* OLIO: I get weird crashes here */
 	spin_unlock_irqrestore(&dev->power.lock, flags);
 
 	return retval;
diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c
index 06146219d9d..d64de51db97 100644
--- a/drivers/gpio/gpio-tps65910.c
+++ b/drivers/gpio/gpio-tps65910.c
@@ -82,7 +82,7 @@ static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset)
 						GPIO_CFG_MASK);
 }
 
-#ifdef CONFIG_OF
+#if 0 /* #ifdef CONFIG_OF - olio: We DO have a DT, but no tps info there. */
 static struct tps65910_board *tps65910_parse_dt_for_gpio(struct device *dev,
 		struct tps65910 *tps65910, int chip_ngpio)
 {
@@ -149,7 +149,7 @@ static int tps65910_gpio_probe(struct platform_device *pdev)
 	tps65910_gpio->gpio_chip.set	= tps65910_gpio_set;
 	tps65910_gpio->gpio_chip.get	= tps65910_gpio_get;
 	tps65910_gpio->gpio_chip.dev = &pdev->dev;
-#ifdef CONFIG_OF_GPIO
+#if 0 /* #ifdef CONFIG_OF_GPIO */
 	tps65910_gpio->gpio_chip.of_node = tps65910->dev->of_node;
 #endif
 	if (pdata && pdata->gpio_base)
diff --git a/drivers/video/omap2/displays/panel-ili9342.c b/drivers/video/omap2/displays/panel-ili9342.c
index 21bcec734d6..40a9713aa0d 100644
--- a/drivers/video/omap2/displays/panel-ili9342.c
+++ b/drivers/video/omap2/displays/panel-ili9342.c
@@ -31,6 +31,7 @@
 
 #include <video/omapdss.h>
 
+#define OLIODEBUG
 #ifdef OLIODEBUG
 #define oliodebug(...) printk ( __VA_ARGS__ )
 #else 
@@ -569,7 +570,7 @@ static int ili9342_resume(struct device *dev) {
 		return ret;
 	}
 
-    init_ili9342_hw (spi);
+	ili9342_init_seq(spi);     /* init_ili9342_hw (spi); */
 
     return 0;
 }