Merge remote-tracking branches 'regulator/fix/anatop', 'regulator/fix/gpio', 'regulat...
authorMark Brown <broonie@kernel.org>
Mon, 21 Sep 2015 21:16:09 +0000 (14:16 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 21 Sep 2015 21:16:09 +0000 (14:16 -0700)
1  2  3  4  5  6 
drivers/regulator/pbias-regulator.c

index 4fa7bcaf454e85e9c4d239c5b6214e340f873c19,4fa7bcaf454e85e9c4d239c5b6214e340f873c19,4fa7bcaf454e85e9c4d239c5b6214e340f873c19,c21cedbdf4512f9d23d841c3ab6505cebb12cd68,4fa7bcaf454e85e9c4d239c5b6214e340f873c19,4fa7bcaf454e85e9c4d239c5b6214e340f873c19..f9d74d63be7c7e6bb88d7cfeb8d4d4046d919002
@@@@@@@ -158,12 -158,12 -158,12 -198,11 -158,12 -158,12 +202,12 @@@@@@@ static int pbias_regulator_probe(struc
                drvdata[data_idx].desc.volt_table = pbias_volt_table;
                drvdata[data_idx].desc.n_voltages = 2;
                drvdata[data_idx].desc.enable_time = info->enable_time;
--- --          drvdata[data_idx].desc.vsel_reg = res->start;
+++ ++          drvdata[data_idx].desc.vsel_reg = offset;
                drvdata[data_idx].desc.vsel_mask = info->vmode;
--- --          drvdata[data_idx].desc.enable_reg = res->start;
+++ ++          drvdata[data_idx].desc.enable_reg = offset;
                drvdata[data_idx].desc.enable_mask = info->enable_mask;
                drvdata[data_idx].desc.enable_val = info->enable;
   +            drvdata[data_idx].desc.disable_val = info->disable_val;
      
                cfg.init_data = pbias_matches[idx].init_data;
                cfg.driver_data = &drvdata[data_idx];