diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-04-03 11:19:02 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-04-03 11:19:14 -0700 |
| commit | 4db0b1e0d83be3f941605be7cb45d6b592d4554a (patch) | |
| tree | 2f21944e3ed2cd04a209b7503ef0ace3c0d89103 | |
| parent | 678d73b04a11d3cc96bbbb7461dd505b6b56934e (diff) | |
| parent | 7f6f0e8d5964a26d2c99b009d3d7cf5be687ac38 (diff) | |
| download | olio-linux-3.10-4db0b1e0d83be3f941605be7cb45d6b592d4554a.tar.xz olio-linux-3.10-4db0b1e0d83be3f941605be7cb45d6b592d4554a.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into mattis_dev
Change-Id: I554ea3a26ab4cbeb6f3e4640c20b48e421bdf566
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/imu/inv_mpu/olio_specials.h | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index ff4de235e20..ef85cf0722f 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -685,7 +685,7 @@ static irqreturn_t acc_irq_handler_thr(int irq, void * omap3h1_d) { */ send_wake_signal(); - wake_lock_timeout (&acc_wake.lock, msecs_to_jiffies (10 * OLIO_ONE_SECOND)); + wake_lock_timeout (&acc_wake.lock, msecs_to_jiffies (2 * OLIO_ONE_SECOND)); previous = 0; } else { diff --git a/drivers/staging/iio/imu/inv_mpu/olio_specials.h b/drivers/staging/iio/imu/inv_mpu/olio_specials.h new file mode 100644 index 00000000000..8ed976d17bc --- /dev/null +++ b/drivers/staging/iio/imu/inv_mpu/olio_specials.h @@ -0,0 +1,17 @@ +/* olio_specials.h - header specific to Olio Devices */ + +/* + * Description: + * ============ + * This file holds a couple of #defines needed by the Olio H1 to set the + * low power states the way we want them. + */ + +/* + * Modification History: + * ===================== + * 01a, 20150331, mfj Created + */ + +#define OLIO_DEF_FREQ 0x03 +#define OLIO_DEF_THRES 0xb0 /* 176 */ |