From: Mark Brown <broonie@linaro.org>
Date: Wed, 26 Mar 2014 16:58:11 +0000 (+0000)
Subject: Merge remote-tracking branches 'regulator/topic/max8973', 'regulator/topic/max8997... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b836485d4712267b06c825a6e06d04ec510b38e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'regulator/topic/max8973', 'regulator/topic/max8997', 'regulator/topic/max8998', 'regulator/topic/mc13xxx', 'regulator/topic/pfuze100', 'regulator/topic/rc5t583' and 'regulator/topic/s2mps11' into regulator-next
---

7b836485d4712267b06c825a6e06d04ec510b38e
diff --cc drivers/regulator/s2mps11.c
index 89966213315c,d9e557990577,d9e557990577,d9e557990577,d9e557990577,d9e557990577,d9e557990577,1f6fd4c45006..68fd54702edb
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@@@@@@@@ -438,10 -438,9 -438,9 -438,9 -438,9 -438,9 -438,9 -632,12 +632,12 @@@@@@@@@ common_reg
        	config.dev = &pdev->dev;
        	config.regmap = iodev->regmap_pmic;
        	config.driver_data = s2mps11;
------- 	for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
+++++++ 	for (i = 0; i < s2mps11->rdev_num; i++) {
+++++++ 		struct regulator_dev *regulator;
+++++++ 
        		if (!reg_np) {
        			config.init_data = pdata->regulators[i].initdata;
 ++++++ 			config.of_node = pdata->regulators[i].reg_node;
        		} else {
        			config.init_data = rdata[i].init_data;
        			config.of_node = rdata[i].of_node;