Merge tag 'regulator-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Pull regulator updates from Mark Brown:
 "There's one API update here, a new API factoring out a common pattern
  for reference voltage supplies. These are supplies used as a reference
  by analogue circuits where the consumer requests and enables the
  supply, reads the voltage to calibrate the user and then never touches
  it again. This is factored out into a single operation which just
  returns the voltage and uses devm_ to manage the request and enable
  portion.

  Otherwise this has been a very quiet release, we've got some new
  device support, some small fixes, housekeeping and cleanup work but
  nothing substantial.

  There's also some non-regulator changes in here, a number of users for
  the new reference voltage API were merged along with it and some MFD
  changes were pulled in as dependencies for new driver work.

  Highlights:

   - Add a new API for single operation handling of reference voltages

   - Support for Allwinner AXP717 and D1, and NXP PCA9561A"

* tag 'regulator-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (33 commits)
  regulator: sun20i: Add Allwinner D1 LDOs driver
  regulator: dt-bindings: Add Allwinner D1 system LDOs
  regulator: Mention regulator id in error message about dummy supplies
  staging: iio: impedance-analyzer: ad5933: Use devm_regulator_get_enable_read_voltage()
  iio: frequency: admv1013: Use devm_regulator_get_enable_read_voltage()
  iio: addac: ad74115: Use devm_regulator_get_enable_read_voltage()
  hwmon: (adc128d818) simplify final return in probe
  regulator: devres: fix devm_regulator_get_enable_read_voltage() return
  hwmon: (da9052) Use devm_regulator_get_enable_read_voltage()
  hwmon: (adc128d818) Use devm_regulator_get_enable_read_voltage()
  regulator: devres: add API for reference voltage supplies
  regulator: rtq2208: Fix LDO discharge register and add vsel setting
  regulator: dt-bindings: fixed-regulator: Add a preferred node name
  regulator: axp20x: add support for the AXP717
  mfd: axp20x: Add support for AXP717 PMIC
  dt-bindings: mfd: x-powers,axp152: Document AXP717
  regulator: axp20x: fix typo-ed identifier
  dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM7250B compatible
  regulator: pca9450: add pca9451a support
  regulator: dt-bindings: pca9450: add pca9451a support
  ...

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/regulator/rtq2208-regulator.c
Simple merge

diff --cc include/linux/regulator/consumer.h
index ed180ca419dad94d6e7db7eae820a26f8dcc5e48,6f41a11c92e79e8e4abbaa59ca51bc41fe2815e2..59d0b9a79e6e049c34e22246c3a12471e7b38295
--- 1/include/linux/regulator/consumer.h
--- 2/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@@ -326,9 -327,15 +327,15 @@@ static inline int devm_regulator_get_en
  static inline int devm_regulator_get_enable_optional(struct device *dev,
                                                     const char *id)
  {
 -      return -ENODEV;
 +      return 0;
  }
  
+ static inline int devm_regulator_get_enable_read_voltage(struct device *dev,
+                                                        const char *id)
+ {
+       return -ENODEV;
+ }
+ 
  static inline struct regulator *__must_check
  regulator_get_optional(struct device *dev, const char *id)
  {