diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:14:33 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:14:33 -0700 |
| commit | 23618f7faa8fdac93d4823d0372f4101d642b8b1 (patch) | |
| tree | 9cdc7fb633ec7c0f24eee93a968bb799f45608e2 /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
| parent | ceb1c532ba6220900e61ec7073a9234661efa450 (diff) | |
| parent | ee7fbba63e334481049a7939b8071160824447d3 (diff) | |
| download | blackbird-op-linux-23618f7faa8fdac93d4823d0372f4101d642b8b1.tar.gz blackbird-op-linux-23618f7faa8fdac93d4823d0372f4101d642b8b1.zip | |
Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap-pm into voltage
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index ab35acbc2d1d..e787731cf3dc 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -2542,7 +2542,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = { .name = "sr1_hwmod", .class = &omap34xx_smartreflex_hwmod_class, .main_clk = "sr1_fck", - .vdd_name = "mpu", + .vdd_name = "mpu_iva", .prcm = { .omap2 = { .prcm_reg_id = 1, @@ -2561,7 +2561,7 @@ static struct omap_hwmod omap36xx_sr1_hwmod = { .name = "sr1_hwmod", .class = &omap36xx_smartreflex_hwmod_class, .main_clk = "sr1_fck", - .vdd_name = "mpu", + .vdd_name = "mpu_iva", .prcm = { .omap2 = { .prcm_reg_id = 1, |
