Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+2 −2
Original line number Diff line number Diff line
@@ -2597,7 +2597,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,
@@ -2619,7 +2619,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,

arch/arm/mach-omap2/omap_twl.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int __init omap3_twl_init(void) 
	if (!twl_sr_enable_autoinit)

		omap3_twl_set_sr_bit(true);



	voltdm = voltdm_lookup("mpu");

	voltdm = voltdm_lookup("mpu_iva");

	omap_voltage_register_pmic(voltdm, &omap3_mpu_volt_info);



	voltdm = voltdm_lookup("core");

arch/arm/mach-omap2/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void __init omap3_init_voltages(void) 
	if (!cpu_is_omap34xx())

		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);

}

arch/arm/mach-omap2/voltagedomains3xxx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static struct omap_vdd_info omap3_vdd2_info = { 
};



static struct voltagedomain omap3_voltdm_mpu = {

	.name = "mpu",

	.name = "mpu_iva",

	.vdd = &omap3_vdd1_info,

};