aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-12-17 19:01:08 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 20:15:17 -0500
commitb444df2f7267e1a431989ad95169f0c13ac790e2 (patch)
tree1405349d196dc008295c0172b22b2a3087e70797
parent762a936fba7bd9225ca9a96e4860f6969b6b5670 (diff)
drivers/video/backlight/pandora_bl.c: change TWL4030_MODULE_PWM0 to TWL_MODULE_PWM
TWL_MODULE_PWM is defined as: #define TWL_MODULE_PWM TWL4030_MODULE_PWM0 Use the common module ID define here which will facilitate the upcoming twl-core cleanup. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Jingoo Han <jg1.han@samsung.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/backlight/pandora_bl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
index 4ec30748b447..633b0a22fd64 100644
--- a/drivers/video/backlight/pandora_bl.c
+++ b/drivers/video/backlight/pandora_bl.c
@@ -71,8 +71,7 @@ static int pandora_backlight_update_status(struct backlight_device *bl)
71 * set PWM duty cycle to max. TPS61161 seems to use this 71 * set PWM duty cycle to max. TPS61161 seems to use this
72 * to calibrate it's PWM sensitivity when it starts. 72 * to calibrate it's PWM sensitivity when it starts.
73 */ 73 */
74 twl_i2c_write_u8(TWL4030_MODULE_PWM0, MAX_VALUE, 74 twl_i2c_write_u8(TWL_MODULE_PWM, MAX_VALUE, TWL_PWM0_OFF);
75 TWL_PWM0_OFF);
76 75
77 /* first enable clock, then PWM0 out */ 76 /* first enable clock, then PWM0 out */
78 twl_i2c_read_u8(TWL4030_MODULE_INTBR, &r, TWL_INTBR_GPBR1); 77 twl_i2c_read_u8(TWL4030_MODULE_INTBR, &r, TWL_INTBR_GPBR1);
@@ -90,8 +89,7 @@ static int pandora_backlight_update_status(struct backlight_device *bl)
90 usleep_range(2000, 10000); 89 usleep_range(2000, 10000);
91 } 90 }
92 91
93 twl_i2c_write_u8(TWL4030_MODULE_PWM0, MIN_VALUE + brightness, 92 twl_i2c_write_u8(TWL_MODULE_PWM, MIN_VALUE + brightness, TWL_PWM0_OFF);
94 TWL_PWM0_OFF);
95 93
96done: 94done:
97 if (brightness != 0) 95 if (brightness != 0)
@@ -132,7 +130,7 @@ static int pandora_backlight_probe(struct platform_device *pdev)
132 platform_set_drvdata(pdev, bl); 130 platform_set_drvdata(pdev, bl);
133 131
134 /* 64 cycle period, ON position 0 */ 132 /* 64 cycle period, ON position 0 */
135 twl_i2c_write_u8(TWL4030_MODULE_PWM0, 0x80, TWL_PWM0_ON); 133 twl_i2c_write_u8(TWL_MODULE_PWM, 0x80, TWL_PWM0_ON);
136 134
137 bl->props.state |= PANDORABL_WAS_OFF; 135 bl->props.state |= PANDORABL_WAS_OFF;
138 bl->props.brightness = MAX_USER_VALUE; 136 bl->props.brightness = MAX_USER_VALUE;