diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-07-04 17:34:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 17:34:34 +0100 |
| commit | 0ed4513c9a32a479b4dc41685be68edf1e99c139 (patch) | |
| tree | 56e2cab31df315ec4cf37f064a8df3404b3ea753 /include/linux/regulator/driver.h | |
| parent | Merge branch 'regulator-5.3' into regulator-next (diff) | |
| parent | regulator: core: Expose some of core functions needed by couplers (diff) | |
| download | linux-dev-0ed4513c9a32a479b4dc41685be68edf1e99c139.tar.xz linux-dev-0ed4513c9a32a479b4dc41685be68edf1e99c139.zip | |
Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next
Diffstat (limited to 'include/linux/regulator/driver.h')
| -rw-r--r-- | include/linux/regulator/driver.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 08259a75fecd..9a911bb5fb61 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -12,8 +12,6 @@ #ifndef __LINUX_REGULATOR_DRIVER_H_ #define __LINUX_REGULATOR_DRIVER_H_ -#define MAX_COUPLED 2 - #include <linux/device.h> #include <linux/notifier.h> #include <linux/regulator/consumer.h> @@ -429,7 +427,8 @@ struct regulator_config { * incremented. */ struct coupling_desc { - struct regulator_dev *coupled_rdevs[MAX_COUPLED]; + struct regulator_dev **coupled_rdevs; + struct regulator_coupler *coupler; int n_resolved; int n_coupled; }; @@ -555,4 +554,5 @@ void regulator_unlock(struct regulator_dev *rdev); */ int regulator_desc_list_voltage_linear_range(const struct regulator_desc *desc, unsigned int selector); + #endif |