]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
regulator: Don't increment use_count for boot_on regulators
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 16 Mar 2009 19:36:33 +0000 (19:36 +0000)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Tue, 31 Mar 2009 08:56:29 +0000 (09:56 +0100)
Don't set use_count for regulators that are enabled at boot since this
stops the supply being disabled by well-behaved consumers which do
balanced enables and disabled. Any consumers which don't do disables
which are not matched by enables are unable to share regulators - shared
regulators are the common case so the API should facilitate them.

Consumers that want to disable regulators that are enabled when they
start have two options:

 - Do a regulator_enable() prior to the disable to bring the use count
   in sync with the hardware state; this will ensure that if the
   regulator was enabled by another driver then this consumer will play
   nicely with it.
 - Use regulator_force_disable(); this explicitly bypasses any checks
   done by the core and documents the inability of the driver to share
   the supply.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
drivers/regulator/core.c

index 944887578d66e68c7a671dff7a0482c346102aa7..8588a2490e0a9a6af08fd6314c4f2ce2154ab99c 100644 (file)
@@ -814,7 +814,6 @@ static int set_machine_constraints(struct regulator_dev *rdev,
                        rdev->constraints = NULL;
                        goto out;
                }
-               rdev->use_count = 1;
        }
 
        print_constraints(rdev);