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

Commit 2ceec7b2 authored by Tero Kristo's avatar Tero Kristo Committed by Kevin Hilman
Browse files

ARM: OMAP4: vc: fix channel configuration 



RACEN bit should only be set if the voltage and command register addresses
are the same.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent d3965191

arch/arm/mach-omap2/vc.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -592,9 +592,12 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm) 
		voltdm->rmw(vc->smps_cmdra_mask,

		voltdm->rmw(vc->smps_cmdra_mask,

			    vc->cmd_reg_addr << __ffs(vc->smps_cmdra_mask),

			    vc->cmd_reg_addr << __ffs(vc->smps_cmdra_mask),

			    vc->smps_cmdra_reg);

			    vc->smps_cmdra_reg);

		vc->cfg_channel |= vc_cfg_bits->rac | vc_cfg_bits->racen;

		vc->cfg_channel |= vc_cfg_bits->rac;

	}

	}





	if (vc->cmd_reg_addr == vc->volt_reg_addr)

		vc->cfg_channel |= vc_cfg_bits->racen;



	/* Set up the on, inactive, retention and off voltage */

	/* Set up the on, inactive, retention and off voltage */

	on_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->on);

	on_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->on);

	onlp_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->onlp);

	onlp_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->onlp);