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

Pull regulator updates from Mark Brown:
 "The biggest chunk of the regulator changes for this release outside of
  the new drivers is the conversion of the fixed regulator to use the
  GPIO descriptor API, there's a small addition to the GPIO API plus a
  bunch of updates to board files to implement it. This is some really
  welcome work from Linus Walleij that's had a bunch of review and has
  been sitting in -next for a while so I'm fairly happy there's no major
  issues.

   - Helpers for overlapping linear ranges.

   - Display opmode and consumer requested load in the regualtor_summary
     file in debugfs, plus a fix there.

   - Support for the fun and entertaining power off mechanism that the
     pfuze100 hardware implements.

   - Conversion of the fixed regulator API to use GPIO descriptors,
     including pulling in a bunch of patches to a bunch of board files.

   - New drivers for Cirrus Logic Lochnagar, Qualcomm PMS405, Rohm
     BD71847, ST PMIC1, and TI LM363x devices"

* tag 'regulator-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (36 commits)
  regulator: lochnagar: Use a consisent comment style for SPDX header
  regulator: bd718x7: Remove struct bd718xx_pmic
  regulator: Fetch enable gpiods nonexclusive
  regulator/gpio: Allow nonexclusive GPIO access
  regulator: lochnagar: Add support for the Cirrus Logic Lochnagar
  regulator: stpmic1: Return REGULATOR_MODE_INVALID for invalid mode
  regulator: stpmic1: add stpmic1 regulator driver
  dt-bindings: regulator: document stpmic1 pmic regulators
  regulator: axp20x: Mark expected switch fall-throughs
  regulator: bd718xx: fix build warning on x86_64
  regulator: fixed: Default enable high on DT regulators
  regulator: bd718xx: rename bd71837 to 718xx
  regulator: bd718XX use pickable ranges
  regulator/mfd: bd718xx: rename bd71837/bd71847 common instances
  regulator: Support regulators where voltage ranges are selectable
  mfd: dt bindings: add BD71847 device-tree binding documentation
  regulator: dt bindings: add BD71847 device-tree binding documentation
  regulator/mfd: Support ROHM BD71847 power management IC
  regulator: da905{2,5}: Remove unnecessary array check
  regulator: qcom: Add PMS405 regulators
  ...

diff --combined arch/arm/mach-pxa/em-x270.c
index c30d20e1fb7a1ca60c7d58c8fa61feccbd76deac,b14c47a6ee6b79d92c3615499ee45ddd00c57059..67e37df637f5ca23e7038d1c866d26ab50a40746
--- 1/arch/arm/mach-pxa/em-x270.c
--- 2/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@@ -15,7 -15,8 +15,7 @@@
  
  #include <linux/dm9000.h>
  #include <linux/platform_data/rtc-v3020.h>
 -#include <linux/mtd/rawnand.h>
 -#include <linux/mtd/partitions.h>
 +#include <linux/mtd/platnand.h>
  #include <linux/mtd/physmap.h>
  #include <linux/input.h>
  #include <linux/gpio_keys.h>
@@@ -284,10 -285,11 +284,10 @@@ static void nand_cs_off(void
  }
  
  /* hardware specific access to control-lines */
 -static void em_x270_nand_cmd_ctl(struct mtd_info *mtd, int dat,
 +static void em_x270_nand_cmd_ctl(struct nand_chip *this, int dat,
                                 unsigned int ctrl)
  {
 -      struct nand_chip *this = mtd_to_nand(mtd);
 -      unsigned long nandaddr = (unsigned long)this->IO_ADDR_W;
 +      unsigned long nandaddr = (unsigned long)this->legacy.IO_ADDR_W;
  
        dsb();
  
@@@ -307,15 -309,15 +307,15 @@@
        }
  
        dsb();
 -      this->IO_ADDR_W = (void __iomem *)nandaddr;
 +      this->legacy.IO_ADDR_W = (void __iomem *)nandaddr;
        if (dat != NAND_CMD_NONE)
 -              writel(dat, this->IO_ADDR_W);
 +              writel(dat, this->legacy.IO_ADDR_W);
  
        dsb();
  }
  
  /* read device ready pin */
 -static int em_x270_nand_device_ready(struct mtd_info *mtd)
 +static int em_x270_nand_device_ready(struct nand_chip *this)
  {
        dsb();
  
@@@ -984,7 -986,6 +984,6 @@@ static struct fixed_voltage_config came
        .supply_name            = "camera_vdd",
        .input_supply           = "vcc cam",
        .microvolts             = 2800000,
-       .gpio                   = -1,
        .enable_high            = 0,
        .init_data              = &camera_dummy_initdata,
  };