summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorMark Brown2018-05-30 16:15:20 +0200
committerMark Brown2018-05-30 16:17:03 +0200
commitab4d11e2c2329cf7cb7be31ff22489aae4dee5dc (patch)
treeadf82bf82855955ac9e128952de57ae2c3a9e324 /include/linux/mfd
parentregulator: max77686: Fix shared GPIOs (diff)
downloadkernel-qcow2-linux-ab4d11e2c2329cf7cb7be31ff22489aae4dee5dc.tar.gz
kernel-qcow2-linux-ab4d11e2c2329cf7cb7be31ff22489aae4dee5dc.tar.xz
kernel-qcow2-linux-ab4d11e2c2329cf7cb7be31ff22489aae4dee5dc.zip
regulator: wm8994: Fix shared GPIOs
This reverts commit 3c6b38d45fa51c7c51 "regulator: wm8994: Pass descriptor instead of GPIO number" as it has problems with shared GPIOs similar to that on s2mps11. Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/wm8994/pdata.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index fca67bd194e2..90c60524a496 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -20,6 +20,9 @@
#define WM8994_NUM_AIF 3
struct wm8994_ldo_pdata {
+ /** GPIOs to enable regulator, 0 or less if not available */
+ int enable;
+
const struct regulator_init_data *init_data;
};