Merge remote-tracking branch 'regulator/topic/core' into regulator-next

diff --git a/MAINTAINERS b/MAINTAINERS
index a727d99..fce0ba5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11997,7 +11997,9 @@ L:      linux-kernel@vger.kernel.org
 W:     http://www.slimlogic.co.uk/?p=48
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
 S:     Supported
+F:     Documentation/devicetree/bindings/regulator/
 F:     drivers/regulator/
+F:     include/dt-bindings/regulator/
 F:     include/linux/regulator/
 
 VRF

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 0cbfd3f..aa98f11 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -808,8 +808,6 @@ static int suspend_set_state(struct regulator_dev *rdev,
 /* locks held by caller */
 static int suspend_prepare(struct regulator_dev *rdev, suspend_state_t state)
 {
-       lockdep_assert_held_once(&rdev->mutex);
-
        if (!rdev->constraints)
                return -EINVAL;
 
@@ -1539,7 +1537,7 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
        }
 
        /* Cascade always-on state to supply */
-       if (_regulator_is_enabled(rdev) && rdev->supply) {
+       if (_regulator_is_enabled(rdev)) {
                ret = regulator_enable(rdev->supply);
                if (ret < 0) {
                        _regulator_put(rdev->supply);

diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index cd271e8..9ac3f98 100644 (file)
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -292,7 +292,7 @@ struct regulator_desc {
                            const struct regulator_desc *,
                            struct regulator_config *);
        int id;
-       bool continuous_voltage_range;
+       unsigned int continuous_voltage_range:1;
        unsigned n_voltages;
        const struct regulator_ops *ops;
        int irq;