Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346395
b: refs/heads/master
c: b444df2
h: refs/heads/master
i:
  346393: f24bcdf
  346391: 0b8e85a
v: v3
  • Loading branch information
Peter Ujfalusi authored and Linus Torvalds committed Dec 18, 2012
1 parent 24d0eab commit e7f9acf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 762a936fba7bd9225ca9a96e4860f6969b6b5670
refs/heads/master: b444df2f7267e1a431989ad95169f0c13ac790e2
8 changes: 3 additions & 5 deletions trunk/drivers/video/backlight/pandora_bl.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ static int pandora_backlight_update_status(struct backlight_device *bl)
* set PWM duty cycle to max. TPS61161 seems to use this
* to calibrate it's PWM sensitivity when it starts.
*/
twl_i2c_write_u8(TWL4030_MODULE_PWM0, MAX_VALUE,
TWL_PWM0_OFF);
twl_i2c_write_u8(TWL_MODULE_PWM, MAX_VALUE, TWL_PWM0_OFF);

/* first enable clock, then PWM0 out */
twl_i2c_read_u8(TWL4030_MODULE_INTBR, &r, TWL_INTBR_GPBR1);
Expand All @@ -90,8 +89,7 @@ static int pandora_backlight_update_status(struct backlight_device *bl)
usleep_range(2000, 10000);
}

twl_i2c_write_u8(TWL4030_MODULE_PWM0, MIN_VALUE + brightness,
TWL_PWM0_OFF);
twl_i2c_write_u8(TWL_MODULE_PWM, MIN_VALUE + brightness, TWL_PWM0_OFF);

done:
if (brightness != 0)
Expand Down Expand Up @@ -132,7 +130,7 @@ static int pandora_backlight_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, bl);

/* 64 cycle period, ON position 0 */
twl_i2c_write_u8(TWL4030_MODULE_PWM0, 0x80, TWL_PWM0_ON);
twl_i2c_write_u8(TWL_MODULE_PWM, 0x80, TWL_PWM0_ON);

bl->props.state |= PANDORABL_WAS_OFF;
bl->props.brightness = MAX_USER_VALUE;
Expand Down

0 comments on commit e7f9acf

Please sign in to comment.