diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-04 17:19:21 +0200 |
|---|---|---|
| committer | Henrik Aberg <henrik.aberg@stericsson.com> | 2011-05-18 09:39:42 +0200 |
| commit | 23f6c253be0e9603c4eeff4b09f1060d9d52c932 (patch) | |
| tree | 43ee573db37452789e8c6a252f8ab2bca4939a72 /include | |
| parent | 3b713126d50c464d556da323a2dc814aac1568ca (diff) | |
drivers: video: add regulator for CVBS out
- Adds a regulator that is used for CVBS TV out by AB8500 DENC and
AV8100 DENC. The regulator is for the switch at the AV connector that
switches between video out and mic in.
ST-Ericsson ID: AP 322391
Linux-next: ST-Ericsson ID: ER 282779
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ie7a821b8d3965aa65384b4393e3083ef406c8282
Signed-off-by: Marcel Tunnissen <Marcel.Tuennissen@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16819
Tested-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
Reviewed-by: Robert FEKETE <robert.fekete@stericsson.com>
Conflicts:
arch/arm/mach-ux500/board-mop500-regulators.c
arch/arm/mach-ux500/board-pdp-mcde.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/mcde_display-ab8500.h | 3 | ||||
| -rw-r--r-- | include/video/mcde_display-av8100.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/video/mcde_display-ab8500.h b/include/video/mcde_display-ab8500.h index ce0633313f1..336fe441f42 100644 --- a/include/video/mcde_display-ab8500.h +++ b/include/video/mcde_display-ab8500.h @@ -15,8 +15,9 @@ struct ab8500_display_platform_data { /* Platform info */ - const char *denc_regulator_id; struct mcde_col_convert rgb_2_yCbCr_transform; + int nr_regulators; + const char *regulator_id[]; }; #endif /* __DISPLAY_AB8500__H__*/ diff --git a/include/video/mcde_display-av8100.h b/include/video/mcde_display-av8100.h index 79e806a8391..c508ebf1f17 100644 --- a/include/video/mcde_display-av8100.h +++ b/include/video/mcde_display-av8100.h @@ -26,6 +26,7 @@ struct mcde_display_hdmi_platform_data { int reset_gpio; bool reset_high; const char *regulator_id; + const char *cvbs_regulator_id; int reset_delay; /* ms */ u32 ddb_id; struct mcde_col_convert rgb_2_yCbCr_transform; |