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

Commit 7590f608 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain 



Track current nominal voltage as part of struct voltagedomain instead
of omap_vdd_info, which will soon be removed.

Also renames field from curr_volt to nominal_volt.

No functional changes.

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 5e5651be

arch/arm/mach-omap2/vc.c

+2 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm, 
	}



	*target_vsel = voltdm->pmic->uv_to_vsel(target_volt);

	*current_vsel = voltdm->pmic->uv_to_vsel(vdd->curr_volt);

	*current_vsel = voltdm->pmic->uv_to_vsel(voltdm->nominal_volt);



	/* Setting the ON voltage to the new target voltage */

	vc_cmdval = voltdm->read(vc->cmdval_reg);
@@ -145,7 +145,6 @@ void omap_vc_post_scale(struct voltagedomain *voltdm, 
			unsigned long target_volt,

			u8 target_vsel, u8 current_vsel)

{

	struct omap_vdd_info *vdd = voltdm->vdd;

	u32 smps_steps = 0, smps_delay = 0;



	smps_steps = abs(target_vsel - current_vsel);
@@ -154,7 +153,7 @@ void omap_vc_post_scale(struct voltagedomain *voltdm, 
			voltdm->pmic->slew_rate) + 2;

	udelay(smps_delay);



	vdd->curr_volt = target_volt;

	voltdm->nominal_volt = target_volt;

}



/* vc_bypass_scale - VC bypass method of voltage scaling */

arch/arm/mach-omap2/voltage.c

+1 −5
Original line number Diff line number Diff line
@@ -81,16 +81,12 @@ ovdc_out: 
 */

unsigned long omap_voltage_get_nom_volt(struct voltagedomain *voltdm)

{

	struct omap_vdd_info *vdd;



	if (!voltdm || IS_ERR(voltdm)) {

		pr_warning("%s: VDD specified does not exist!\n", __func__);

		return 0;

	}



	vdd = voltdm->vdd;



	return vdd->curr_volt;

	return voltdm->nominal_volt;

}



/**

arch/arm/mach-omap2/voltage.h

+2 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ struct omap_vfsm_instance { 
 * @sys_clk: system clock name/frequency, used for various timing calculations

 * @vdd: to be removed

 * @scale: function used to scale the voltage of the voltagedomain

 * @nominal_volt: current nominal voltage for this voltage domain

 */

struct voltagedomain {

	char *name;
@@ -85,6 +86,7 @@ struct voltagedomain { 


	int (*scale) (struct voltagedomain *voltdm,

		      unsigned long target_volt);

	u32 nominal_volt;



	struct omap_vdd_info *vdd;

};
@@ -148,11 +150,9 @@ struct omap_voltdm_pmic { 
 *

 * @volt_data		: voltage table having the distinct voltages supported

 *			  by the domain and other associated per voltage data.

 * @curr_volt		: current voltage for this vdd.

 */

struct omap_vdd_info {

	struct omap_volt_data *volt_data;

	u32 curr_volt;

};



void omap_voltage_get_volttable(struct voltagedomain *voltdm,