diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 16:57:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 16:57:49 -0800 |
| commit | b5c96f89177b460ef89ecd777d5f2fefd4534d3f (patch) | |
| tree | 0cbb456cf76c98d5adfc25b65f0fca4b08d38695 /drivers/video/omap/lcd_omap2evm.c | |
| parent | e82b1dae2a8730c89e2a30c5c28562ef066f39d9 (diff) | |
| parent | f2eeeae06a41d4f9c90f8382cc0ef1d35888d09a (diff) | |
| download | kernel_samsung_smdk4412-b5c96f89177b460ef89ecd777d5f2fefd4534d3f.zip kernel_samsung_smdk4412-b5c96f89177b460ef89ecd777d5f2fefd4534d3f.tar.gz kernel_samsung_smdk4412-b5c96f89177b460ef89ecd777d5f2fefd4534d3f.tar.bz2 | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP3: serial - fix bug introduced in
mfd: twl: fix twl4030 rename for remaining driver, board files
USB ehci: replace mach header with plat
omap3: Allow EHCI to be built on OMAP3
Diffstat (limited to 'drivers/video/omap/lcd_omap2evm.c')
| -rw-r--r-- | drivers/video/omap/lcd_omap2evm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/omap/lcd_omap2evm.c b/drivers/video/omap/lcd_omap2evm.c index 006c2fe..7e7a65c 100644 --- a/drivers/video/omap/lcd_omap2evm.c +++ b/drivers/video/omap/lcd_omap2evm.c @@ -24,7 +24,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/gpio.h> -#include <linux/i2c/twl4030.h> +#include <linux/i2c/twl.h> #include <plat/mux.h> #include <asm/mach-types.h> @@ -61,9 +61,9 @@ static int omap2evm_panel_init(struct lcd_panel *panel, gpio_direction_output(LCD_PANEL_LR, 1); gpio_direction_output(LCD_PANEL_UD, 1); - twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN); - twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON); - twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF); + twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN); + twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON); + twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF); bklight_level = 100; return 0; @@ -101,7 +101,7 @@ static int omap2evm_bklight_setlevel(struct lcd_panel *panel, u8 c; if ((level >= 0) && (level <= 100)) { c = (125 * (100 - level)) / 100 + 2; - twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF); + twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF); bklight_level = level; } return 0; |