Commit 280a7275 authored by Kevin Hilman's avatar Kevin Hilman

OMAP3: voltage: rename "mpu" voltagedomain to "mpu_iva"

This voltage domain (a.k.a. VDD1) contains both the MPU and the IVA, so
rename appropriately.

Also fixup any users of the "mpu" name to use "mpu_iva"
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 81a60482
...@@ -2597,7 +2597,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = { ...@@ -2597,7 +2597,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = {
.name = "sr1_hwmod", .name = "sr1_hwmod",
.class = &omap34xx_smartreflex_hwmod_class, .class = &omap34xx_smartreflex_hwmod_class,
.main_clk = "sr1_fck", .main_clk = "sr1_fck",
.vdd_name = "mpu", .vdd_name = "mpu_iva",
.prcm = { .prcm = {
.omap2 = { .omap2 = {
.prcm_reg_id = 1, .prcm_reg_id = 1,
...@@ -2619,7 +2619,7 @@ static struct omap_hwmod omap36xx_sr1_hwmod = { ...@@ -2619,7 +2619,7 @@ static struct omap_hwmod omap36xx_sr1_hwmod = {
.name = "sr1_hwmod", .name = "sr1_hwmod",
.class = &omap36xx_smartreflex_hwmod_class, .class = &omap36xx_smartreflex_hwmod_class,
.main_clk = "sr1_fck", .main_clk = "sr1_fck",
.vdd_name = "mpu", .vdd_name = "mpu_iva",
.prcm = { .prcm = {
.omap2 = { .omap2 = {
.prcm_reg_id = 1, .prcm_reg_id = 1,
......
...@@ -288,7 +288,7 @@ int __init omap3_twl_init(void) ...@@ -288,7 +288,7 @@ int __init omap3_twl_init(void)
if (!twl_sr_enable_autoinit) if (!twl_sr_enable_autoinit)
omap3_twl_set_sr_bit(true); omap3_twl_set_sr_bit(true);
voltdm = voltdm_lookup("mpu"); voltdm = voltdm_lookup("mpu_iva");
omap_voltage_register_pmic(voltdm, &omap3_mpu_volt_info); omap_voltage_register_pmic(voltdm, &omap3_mpu_volt_info);
voltdm = voltdm_lookup("core"); voltdm = voltdm_lookup("core");
......
...@@ -226,7 +226,7 @@ static void __init omap3_init_voltages(void) ...@@ -226,7 +226,7 @@ static void __init omap3_init_voltages(void)
if (!cpu_is_omap34xx()) if (!cpu_is_omap34xx())
return; return;
omap2_set_init_voltage("mpu", "dpll1_ck", mpu_dev); omap2_set_init_voltage("mpu_iva", "dpll1_ck", mpu_dev);
omap2_set_init_voltage("core", "l3_ick", l3_dev); omap2_set_init_voltage("core", "l3_ick", l3_dev);
} }
......
...@@ -60,7 +60,7 @@ static struct omap_vdd_info omap3_vdd2_info = { ...@@ -60,7 +60,7 @@ static struct omap_vdd_info omap3_vdd2_info = {
}; };
static struct voltagedomain omap3_voltdm_mpu = { static struct voltagedomain omap3_voltdm_mpu = {
.name = "mpu", .name = "mpu_iva",
.vdd = &omap3_vdd1_info, .vdd = &omap3_vdd1_info,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment