diff options
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 3 |
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 }; |