Merge remote-tracking branches 'regulator/topic/db8500', 'regulator/topic/gpio',...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

diff --cc drivers/regulator/gpio-regulator.c
index 234960d,04406a9,49fe20f,04406a9,04406a9,04406a9,04406a9,98a98ff,04406a9,234960d..c0a1d00
--- 1/drivers/regulator/gpio-regulator.c
--- 2/drivers/regulator/gpio-regulator.c
--- 3/drivers/regulator/gpio-regulator.c
--- 4/drivers/regulator/gpio-regulator.c
--- 5/drivers/regulator/gpio-regulator.c
--- 6/drivers/regulator/gpio-regulator.c
--- 7/drivers/regulator/gpio-regulator.c
--- 8/drivers/regulator/gpio-regulator.c
--- 9/drivers/regulator/gpio-regulator.c
--- 10/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@@@@@@@@@@ -203,17 -202,13 -203,18 -202,13 -202,13 -202,13 -202,13 -202,13 -202,13 -203,17 +203,18 @@@@@@@@@@@ of_get_gpio_regulator_config(struct dev
                }
                config->nr_states = i;
          
 - ------       of_property_read_string(np, "regulator-type", &regtype);
 - ------ 
 - ------       if (!strncmp("voltage", regtype, 7))
 - ------               config->type = REGULATOR_VOLTAGE;
 - ------       else if (!strncmp("current", regtype, 7))
 - ------               config->type = REGULATOR_CURRENT;
++ +++++++      config->type = REGULATOR_VOLTAGE;
 + ++++++       ret = of_property_read_string(np, "regulator-type", &regtype);
-        -      if (ret < 0) {
-        -              dev_err(dev, "Missing 'regulator-type' property\n");
-        -              return ERR_PTR(-EINVAL);
++ +++++++      if (ret >= 0) {
++ +++++++              if (!strncmp("voltage", regtype, 7))
++ +++++++                      config->type = REGULATOR_VOLTAGE;
++ +++++++              else if (!strncmp("current", regtype, 7))
++ +++++++                      config->type = REGULATOR_CURRENT;
++ +++++++              else
++ +++++++                      dev_warn(dev, "Unknown regulator-type '%s'\n",
++ +++++++                               regtype);
 + ++++++       }
          
-        -      if (!strncmp("voltage", regtype, 7))
-        -              config->type = REGULATOR_VOLTAGE;
-        -      else if (!strncmp("current", regtype, 7))
-        -              config->type = REGULATOR_CURRENT;
-        -
                return config;
          }
          

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

diff --cc drivers/regulator/pfuze100-regulator.c
index c31e048,ba67b2c,ba67b2c,ba67b2c,ba67b2c,ba67b2c,ba67b2c,ba67b2c,ba67b2c,f68e5d5..ab174f2
--- 1/drivers/regulator/pfuze100-regulator.c
--- 2/drivers/regulator/pfuze100-regulator.c
--- 3/drivers/regulator/pfuze100-regulator.c
--- 4/drivers/regulator/pfuze100-regulator.c
--- 5/drivers/regulator/pfuze100-regulator.c
--- 6/drivers/regulator/pfuze100-regulator.c
--- 7/drivers/regulator/pfuze100-regulator.c
--- 8/drivers/regulator/pfuze100-regulator.c
--- 9/drivers/regulator/pfuze100-regulator.c
--- 10/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@@@@@@@@@@ -308,15 -308,9 -308,9 -308,9 -308,9 -308,9 -308,9 -308,9 -308,9 -308,18 +308,18 @@@@@@@@@@@ static int pfuze_identify(struct pfuze_
                if (ret)
                        return ret;
          
 --------       if (value & 0x0f) {
 ++++++++       switch (value & 0x0f) {
-                       /* Freescale misprogrammed 1-3% of parts prior to week 8 of 2013 as ID=8 */
-                       case 0x8:
-                               dev_info(pfuze_chip->dev, "Assuming misprogrammed ID=0x8");
-                       case 0x0:
-                               break;
-                       default:
-                               dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value);
-                               return -ENODEV;
+++++++++       /*
+++++++++        * Freescale misprogrammed 1-3% of parts prior to week 8 of 2013
+++++++++        * as ID=8
+++++++++        */
+++++++++       case 0x8:
+++++++++               dev_info(pfuze_chip->dev, "Assuming misprogrammed ID=0x8");
+++++++++       case 0x0:
+++++++++               break;
+++++++++       default:
+                       dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value);
+                       return -ENODEV;
                }
          
                ret = regmap_read(pfuze_chip->regmap, PFUZE100_REVID, &value);