From: Mark Brown <broonie@kernel.org>
Date: Fri, 5 Dec 2014 11:14:37 +0000 (+0000)
Subject: Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max77693... 
X-Git-Tag: v5.15~16781^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=92d07a8ff6e2e7844d1bce4e35c98c6a773d6f17;p=mirror_ubuntu-kernels.git

Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max77693', 'regulator/topic/max77802', 'regulator/topic/power-off' and 'regulator/topic/rk808' into regulator-next
---

92d07a8ff6e2e7844d1bce4e35c98c6a773d6f17
diff --cc drivers/regulator/arizona-ldo1.c
index 559e7ea9dcf3,4c9db589f6c1,4c9db589f6c1,b1eea7f76489,4c9db589f6c1,4c9db589f6c1..d071b2119a60
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@@@@@@ -257,11 -257,9 -257,9 -259,9 -257,9 -257,9 +259,11 @@@@@@@ static int arizona_ldo1_probe(struct pl
      
      	if (IS_ENABLED(CONFIG_OF)) {
      		if (!dev_get_platdata(arizona->dev)) {
--- --			ret = arizona_ldo1_of_get_pdata(arizona, &config);
+++ ++			ret = arizona_ldo1_of_get_pdata(arizona, &config, desc);
      			if (ret < 0)
      				return ret;
 +++++
 +++++			config.ena_gpio_initialized = true;
      		}
      	}