diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 00:32:26 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 00:32:26 +0200 |
| commit | 107088033cbc7dc228cedba3acb63607cf557d0b (patch) | |
| tree | 01520b572e6570a0cc72bce663ab145878530b04 | |
| parent | a19e67bf730e0c6ed12a2a98277525c52c931565 (diff) | |
| download | kernel_goldelico_gta04-107088033cbc7dc228cedba3acb63607cf557d0b.zip kernel_goldelico_gta04-107088033cbc7dc228cedba3acb63607cf557d0b.tar.gz kernel_goldelico_gta04-107088033cbc7dc228cedba3acb63607cf557d0b.tar.bz2 | |
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3gta04.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3gta04.c b/arch/arm/mach-omap2/board-omap3gta04.c index 2975f21..daf791f 100644 --- a/arch/arm/mach-omap2/board-omap3gta04.c +++ b/arch/arm/mach-omap2/board-omap3gta04.c @@ -299,10 +299,10 @@ static int gta04_panel_enable_tv(struct omap_dss_device *dssdev) #define OMAP2_TVACEN (1 << 11) #define OMAP2_TVOUTBYPASS (1 << 18) - twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, + twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, ENABLE_VDAC_DEDICATED, TWL4030_VDAC_DEDICATED); - twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, + twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, ENABLE_VDAC_DEV_GRP, TWL4030_VDAC_DEV_GRP); /* taken from https://e2e.ti.com/support/dsp/omap_applications_processors/f/447/p/94072/343691.aspx */ @@ -323,9 +323,9 @@ static void gta04_panel_disable_tv(struct omap_dss_device *dssdev) { gpio_set_value(23, 0); // disable output driver (and re-enable microphone) - twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00, + twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0x00, TWL4030_VDAC_DEDICATED); - twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00, + twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0x00, TWL4030_VDAC_DEV_GRP); } |