From: Mark Brown <broonie@kernel.org>
Date: Mon, 21 Sep 2015 21:16:09 +0000 (-0700)
Subject: Merge remote-tracking branches 'regulator/fix/anatop', 'regulator/fix/gpio', 'regulat... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=16651fc2f30dfe14dcdd59cf0ccb4e1ccdba4dc7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'regulator/fix/anatop', 'regulator/fix/gpio', 'regulator/fix/pbias', 'regulator/fix/tpx65218' and 'regulator/fix/vexpress' into regulator-linus
---

16651fc2f30dfe14dcdd59cf0ccb4e1ccdba4dc7
diff --cc drivers/regulator/pbias-regulator.c
index 4fa7bcaf454e,4fa7bcaf454e,4fa7bcaf454e,c21cedbdf451,4fa7bcaf454e,4fa7bcaf454e..f9d74d63be7c
--- a/drivers/regulator/pbias-regulator.c
+++ b/drivers/regulator/pbias-regulator.c
@@@@@@@ -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];