diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 09:57:44 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 09:57:44 -0400 |
| commit | 801cffdae716aec1bc101f8722054b865cd67799 (patch) | |
| tree | 2c3411ee1260ff0c53e06ed4ee65019abaf009ca /arch/arm/mach-omap2/board-igep0020.c | |
| parent | 1be030ee4c589acb079c578a00686a54942d88fb (diff) | |
| parent | c4202c86cdd53c91744d652ec0e16fd28ff6d6f3 (diff) | |
Merge remote-tracking branch 'tmlind/dss2' into linaro-2.6.38
Conflicts:
arch/arm/mach-omap2/board-overo.c
Diffstat (limited to 'arch/arm/mach-omap2/board-igep0020.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-igep0020.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index d3199b4ecdb..5f8a2fd0633 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c @@ -485,8 +485,10 @@ static struct omap_dss_board_info igep2_dss_data = { .default_device = &igep2_dvi_device, }; -static struct regulator_consumer_supply igep2_vpll2_supply = - REGULATOR_SUPPLY("vdds_dsi", "omapdss"); +static struct regulator_consumer_supply igep2_vpll2_supplies[] = { + REGULATOR_SUPPLY("vdds_dsi", "omapdss"), + REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"), +}; static struct regulator_init_data igep2_vpll2 = { .constraints = { @@ -499,8 +501,8 @@ static struct regulator_init_data igep2_vpll2 = { .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = 1, - .consumer_supplies = &igep2_vpll2_supply, + .num_consumer_supplies = ARRAY_SIZE(igep2_vpll2_supplies), + .consumer_supplies = igep2_vpll2_supplies, }; static void __init igep2_display_init(void) |