diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:06:51 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:07:01 -0700 |
| commit | 79fdad2d47fe1a165b56b3066692d58340b4a4e7 (patch) | |
| tree | aaae4a80b542e6ff9bdb459cfd5cd467012606a3 | |
| parent | 828496eb80e97b7dbd4921ad64b1799ba2e5dd5b (diff) | |
| parent | a98de0fc91c3eadbc5485a90cae619b869974ccf (diff) | |
| download | olio-linux-3.10-79fdad2d47fe1a165b56b3066692d58340b4a4e7.tar.xz olio-linux-3.10-79fdad2d47fe1a165b56b3066692d58340b4a4e7.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into android-3.10-bringup
Change-Id: Ic0a04e74a94fa6a7ee1769a9bee71117961238b4
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 2 | ||||
| -rw-r--r-- | drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c | 12 | ||||
| -rw-r--r-- | drivers/leds/leds-lm3530.c | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index b107860b808..a533aa7ed63 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -2127,7 +2127,7 @@ CONFIG_LEDS_LM3530=y # CONFIG_EDAC is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_HCTOSYS=y CONFIG_RTC_SYSTOHC=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set diff --git a/drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c b/drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c index 9fe257039bb..1805e8f8fb5 100644 --- a/drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c +++ b/drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c @@ -78,8 +78,8 @@ static void st_lsm6ds3_irq_management(struct work_struct *data_work) wake_irq = last_wakeup_reason_test(cdata->irq); - if(!wake_lock_active(&cdata->wlock)) - wake_lock(&cdata->wlock); +// if(!wake_lock_active(&cdata->wlock)) +// wake_lock(&cdata->wlock); mutex_lock(&cdata->fifo_lock); cdata->tf->read(cdata, ST_LSM6DS3_6D_SRC_ADDR, 1, &d6d_src_reg, true); cdata->tf->read(cdata, ST_LSM6DS3_TAP_SRC_ADDR, 1, &tap_src_reg, true); @@ -175,9 +175,11 @@ static void st_lsm6ds3_irq_management(struct work_struct *data_work) } enable_irq(cdata->irq); - mutex_unlock(&cdata->fifo_lock); - if(wake_lock_active(&cdata->wlock)) - wake_unlock(&cdata->wlock); + mutex_unlock(&cdata->fifo_lock); + + +// if(wake_lock_active(&cdata->wlock)) +// wake_unlock(&cdata->wlock); cdata->first_irq_from_resume = 0; return; diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c index c3d4a69655f..fda0efb4f88 100644 --- a/drivers/leds/leds-lm3530.c +++ b/drivers/leds/leds-lm3530.c @@ -324,8 +324,6 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev, switch (drvdata->mode) { case LM3530_BL_MODE_MANUAL: - case LM3530_BL_MODE_SIMPLE_MANUAL: - if (!drvdata->enable) { err = lm3530_init_registers(drvdata); if (err) { @@ -334,6 +332,7 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev, break; } } + case LM3530_BL_MODE_SIMPLE_MANUAL: /* set the brightness in brightness control register*/ err = i2c_smbus_write_byte_data(drvdata->client, |