diff options
| author | Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> | 2011-08-30 19:29:34 +0530 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:54:42 +0200 |
| commit | 570b94366e733fa981fe7df612fce48d2350d56e (patch) | |
| tree | cff8594dfefd40c52ec23ee6aa60dde8f5258e5f /arch | |
| parent | 0af43d204635eb405a14dead20146008ac9fde94 (diff) | |
mach-ux500:mcde:Kernel 3.0 migration
Add the platform data to merge into kernel 3.0 migration
ST-Ericsson ID: 352334
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Change-Id: Ia060a4e35453d43ed1dbb970ecadad9084d03237
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29762
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-mcde.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mcde.h b/arch/arm/mach-ux500/board-mop500-mcde.h index f84b70cc568..38094b81b34 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.h +++ b/arch/arm/mach-ux500/board-mop500-mcde.h @@ -13,6 +13,10 @@ #include <video/mcde_display.h> +#ifdef CONFIG_DISPLAY_AB8500_TERTIARY +extern struct mcde_display_device tvout_ab8500_display; +#endif + #ifdef CONFIG_DISPLAY_AV8100_TERTIARY extern struct mcde_display_device av8100_hdmi; #endif diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index f8368b7edf0..4d51d16e784 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -119,7 +119,7 @@ static pin_cfg_t mop500_pins_hrefv60[] = { GPIO32_GPIO | PIN_INPUT_PULLDOWN, /* Magnetometer DRDY */ /* Display Interface */ - GPIO65_GPIO | PIN_OUTPUT_LOW, /* DISP1 RST */ + GPIO65_GPIO | PIN_OUTPUT_HIGH, /* DISP1 NO RST */ GPIO66_GPIO | PIN_OUTPUT_LOW, /* DISP2 RST */ /* Touch screen INTERFACE */ diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index afea7315432..9d3f5d82d4d 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -241,11 +241,6 @@ static struct mcde_port port2 = { }; struct mcde_display_hdmi_platform_data av8100_hdmi_pdata = { - .reset_gpio = 0, - .reset_delay = 1, - .regulator_id = NULL, - .cvbs_regulator_id = "v-av8100-AV-switch", - .ddb_id = 1, .rgb_2_yCbCr_transform = &rgb_2_yCbCr_transform, }; |