regulator: Fix check of unsigned return value and transmit errors in wm831x_gp_ldo_ge...

[safe/jmp/linux-2.6] / drivers / ssb / driver_chipcommon_pmu.c

diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index 4aaddee..64abd11 100644 (file)
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct ssb_chipcommon *cc,
        chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
 }
 
+static void ssb_chipco_regctl_maskset(struct ssb_chipcommon *cc,
+                                  u32 offset, u32 mask, u32 set)
+{
+       u32 value;
+
+       chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
+       chipco_write32(cc, SSB_CHIPCO_REGCTL_ADDR, offset);
+       chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
+       value = chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
+       value &= mask;
+       value |= set;
+       chipco_write32(cc, SSB_CHIPCO_REGCTL_DATA, value);
+       chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
+}
+
 struct pmu0_plltab_entry {
        u16 freq;       /* Crystal frequency in kHz.*/
        u8 xf;          /* Crystal frequency value for PMU control */
@@ -506,3 +521,82 @@ void ssb_pmu_init(struct ssb_chipcommon *cc)
        ssb_pmu_pll_init(cc);
        ssb_pmu_resources_init(cc);
 }
+
+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
+                            enum ssb_pmu_ldo_volt_id id, u32 voltage)
+{
+       struct ssb_bus *bus = cc->dev->bus;
+       u32 addr, shift, mask;
+
+       switch (bus->chip_id) {
+       case 0x4328:
+       case 0x5354:
+               switch (id) {
+               case LDO_VOLT1:
+                       addr = 2;
+                       shift = 25;
+                       mask = 0xF;
+                       break;
+               case LDO_VOLT2:
+                       addr = 3;
+                       shift = 1;
+                       mask = 0xF;
+                       break;
+               case LDO_VOLT3:
+                       addr = 3;
+                       shift = 9;
+                       mask = 0xF;
+                       break;
+               case LDO_PAREF:
+                       addr = 3;
+                       shift = 17;
+                       mask = 0x3F;
+                       break;
+               default:
+                       SSB_WARN_ON(1);
+                       return;
+               }
+               break;
+       case 0x4312:
+               if (SSB_WARN_ON(id != LDO_PAREF))
+                       return;
+               addr = 0;
+               shift = 21;
+               mask = 0x3F;
+               break;
+       default:
+               return;
+       }
+
+       ssb_chipco_regctl_maskset(cc, addr, ~(mask << shift),
+                                 (voltage & mask) << shift);
+}
+
+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on)
+{
+       struct ssb_bus *bus = cc->dev->bus;
+       int ldo;
+
+       switch (bus->chip_id) {
+       case 0x4312:
+               ldo = SSB_PMURES_4312_PA_REF_LDO;
+               break;
+       case 0x4328:
+               ldo = SSB_PMURES_4328_PA_REF_LDO;
+               break;
+       case 0x5354:
+               ldo = SSB_PMURES_5354_PA_REF_LDO;
+               break;
+       default:
+               return;
+       }
+
+       if (on)
+               chipco_set32(cc, SSB_CHIPCO_PMU_MINRES_MSK, 1 << ldo);
+       else
+               chipco_mask32(cc, SSB_CHIPCO_PMU_MINRES_MSK, ~(1 << ldo));
+       chipco_read32(cc, SSB_CHIPCO_PMU_MINRES_MSK); //SPEC FIXME found via mmiotrace - dummy read?
+}
+
+EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
+EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);