summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Wilson <evan@oliodevices.com>2015-07-25 17:00:00 -0700
committerEvan Wilson <evan@oliodevices.com>2015-07-25 17:00:00 -0700
commit93ea70523c1af608008961f079b6ccc364db1079 (patch)
tree728d3317b32f1d0f6137c17c0be870e28d5db727
parentbb39f055aa4ca296019f355633060974c85928d9 (diff)
downloadolio-linux-3.10-93ea70523c1af608008961f079b6ccc364db1079.tar.xz
olio-linux-3.10-93ea70523c1af608008961f079b6ccc364db1079.zip
New touch sleep settings.
After integrating the latest Atmel driver we will now use deep sleep instead of turning off the Touch/Disp reglator This should fix the touch wake-up issue (where the touch doesn't work when waking from sleep) It should also increase the wake time. Change-Id: Id12c8f95722260897191f9e9fefb08a0af0d65a9
-rw-r--r--arch/arm/boot/dts/omap3_h1.dts2
-rw-r--r--arch/arm/mach-omap2/board-omap3h1.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index 94f566db142..e01633412a5 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -389,7 +389,7 @@
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
- ti,regulator-ext-sleep-control = <8>;
+ /*ti,regulator-ext-sleep-control = <8>;*/
};
};
};
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 145efe4da76..7eaceb7fd10 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -31,7 +31,7 @@
#include <linux/usb/phy.h>
#include <linux/usb/nop-usb-xceiv.h>
-#include <linux/i2c/atmel_mxt_ts.h>
+#include <linux/platform_data/atmel_mxt_ts.h>
#include <linux/gpio.h>
#include <linux/regulator/machine.h>
@@ -217,6 +217,7 @@ static struct lm3530_platform_data omap3h1_backlight_platform_data = {
static struct mxt_platform_data mxt_data = {
.irqflags = IRQF_TRIGGER_FALLING,
+ .suspend_mode = MXT_SUSPEND_DEEP_SLEEP
};