summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorLinus Walleij2018-05-14 10:06:34 +0200
committerMark Brown2018-05-17 09:22:33 +0200
commit3c6b38d45fa51c7c51c5e2347fc1a6bef6a46525 (patch)
tree894fdb9fc16319e80fc79a4aeee6873fe4980ef3 /include/linux/mfd
parentregulator: core: Change voltage setting path (diff)
downloadkernel-qcow2-linux-3c6b38d45fa51c7c51c5e2347fc1a6bef6a46525.tar.gz
kernel-qcow2-linux-3c6b38d45fa51c7c51c5e2347fc1a6bef6a46525.tar.xz
kernel-qcow2-linux-3c6b38d45fa51c7c51c5e2347fc1a6bef6a46525.zip
regulator: wm8994: Pass descriptor instead of GPIO number
Instead of passing a global GPIO number for the enable GPIO, pass a descriptor looked up from the device tree node or the board file decriptor table for the regulator. There is a single board file passing the GPIOs for LDO1 and LDO2 through platform data, so augment this to pass descriptors associated with the i2c device as well. The special GPIO enable DT property for the enable GPIO is nonstandard but this was accomodated in commit 6a537d48461deacc57c07ed86d9915e5aa4b3539 "gpio: of: Support regulator nonstandard GPIO properties". Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Acked-by: Lee Jones <lee.jones@linaro.org> 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, 0 insertions, 3 deletions
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 90c60524a496..fca67bd194e2 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -20,9 +20,6 @@
#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;
};