Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 78614e0f8f32dca52beebaadfb53c2a3acf1604a

Authored by Kevin Hilman
1 parent e4e021c549
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

OMAP3+: VC bypass: use fields from VC struct instead of PMIC info 

The PMIC configurable variables should be isolated to VC initialization.
The rest of the VC functions (like VC bypass) should use the i2c slave address
and voltage register address fields from struct omap_vc_channel.

Signed-off-by: Kevin Hilman <khilman@ti.com>

Showing 1 changed file with 2 additions and 5 deletions Side-by-side Diff

arch/arm/mach-omap2/vc.c
Diff comments   View file @ 78614e0
... ... @@ -100,7 +100,6 @@
100 100 unsigned long target_volt)
101 101 {
102 102 struct omap_vc_channel *vc = voltdm->vc;
103   - struct omap_vdd_info *vdd = voltdm->vdd;
104 103 u32 loop_cnt = 0, retries_cnt = 0;
105 104 u32 vc_valid, vc_bypass_val_reg, vc_bypass_value;
106 105 u8 target_vsel, current_vsel;
... ... @@ -113,10 +112,8 @@
113 112 vc_valid = vc->common->valid;
114 113 vc_bypass_val_reg = vc->common->bypass_val_reg;
115 114 vc_bypass_value = (target_vsel << vc->common->data_shift) |
116   - (vdd->pmic_info->volt_reg_addr <<
117   - vc->common->regaddr_shift) |
118   - (vdd->pmic_info->i2c_slave_addr <<
119   - vc->common->slaveaddr_shift);
  115 + (vc->volt_reg_addr << vc->common->regaddr_shift) |
  116 + (vc->i2c_slave_addr << vc->common->slaveaddr_shift);
120 117  
121 118 voltdm->write(vc_bypass_value, vc_bypass_val_reg);
122 119 voltdm->write(vc_bypass_value | vc_valid, vc_bypass_val_reg);