summaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
Commit message (Collapse)AuthorAgeFilesLines
...
| |
| \
*-. \ Merge remote-tracking branches 'regulator/topic/abb', ↵Mark Brown2016-05-131-0/+2
|\ \ \ | | |/ | |/| | | | 'regulator/topic/act8865', 'regulator/topic/as3722' and 'regulator/topic/axp20x' into regulator-next
| | * regulator: act8865: Pass of_node via act8865_regulator_dataMaarten ter Huurne2016-03-281-0/+2
| |/ | | | | | | | | | | | | | | This makes the code easier to read and it avoids a dynamic memory allocation. Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> Signed-off-by: Mark Brown <broonie@kernel.org>
* / regulator: core: Use a bitfield for continuous_voltage_rangeMark Brown2016-04-201-1/+1
|/ | | | | | | | Using a bitfield enables the compiler to lay out the structure more efficiently when we have other boolean flags since multiple values can be included in a single byte. Signed-off-by: Mark Brown <broonie@kernel.org>
*-----. Merge remote-tracking branches 'regulator/topic/discharge', ↵Mark Brown2016-03-133-0/+34
|\ \ \ \ | | | | | | | | | | | | | | | 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next
| | | | * regulator: lp872x: Add enable GPIO pin supportPaul Kocialkowski2016-02-051-0/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | LP872x regulators are made active via the EN pin, which might be hooked to a GPIO. This adds support for driving the GPIO high when the driver is in use. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Signed-off-by: Mark Brown <broonie@kernel.org>
| * | | regulator: helper: Add helper to configure active-discharge using regmapLaxman Dewangan2016-03-021-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper function to set the state of active-discharge of regulator using regmap. The HW regulator driver can directly use this by providing the necessary information in the regulator descriptor. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| * | | regulator: core: Add support for active-discharge configurationLaxman Dewangan2016-03-022-0/+15
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add support to enable/disable active discharge of regulator via machine constraints. This configuration is done when setting machine constraint during regulator register and if regulator driver implemented the callback ops. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* / | regulator: act8865: Rename platform_data field to init_dataMaarten ter Huurne2016-02-291-2/+2
|/ / | | | | | | | | | | | | Make the field name match its type. Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> Signed-off-by: Mark Brown <broonie@kernel.org>
| |
| \
*-. \ Merge remote-tracking branches 'regulator/topic/pv88090', ↵Mark Brown2016-01-121-0/+2
|\ \ \ | | |/ | |/| | | | 'regulator/topic/qcom-smd', 'regulator/topic/tps6105x', 'regulator/topic/tps65086' and 'regulator/topic/tps65218' into regulator-next
| | * regulator: tps65218: add support for LS3 current regulatorNikita Kiryanov2015-11-251-0/+2
| |/ | | | | | | | | | | | | | | Add support for TPS65218 LS3 current regulator, which is capable of 4 current input limit modes: 100, 200, 500, and 1000 uA. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Mark Brown <broonie@kernel.org>
* / regulator: Make bulk API support optional suppliesBjorn Andersson2015-11-171-0/+3
|/ | | | | | | | Make it possible to use the bulk API with optional supplies, by allowing the consumer to marking supplies as optional in the regulator_bulk_data. Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* regulator: introduce min_dropout_uVSascha Hauer2015-10-161-0/+2
| | | | | | | | | | | Many voltage Regulators need a input voltage that is higher than the output voltage. Allow to specify a minimum dropout voltage which will be used later to find the best input voltage for regulators. [Changed uv to uV for consistency and legibility -- broonie] Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mark Brown <broonie@kernel.org>
*-----. Merge remote-tracking branches 'regulator/topic/qcom-smd', ↵Mark Brown2015-08-301-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next
| | | | * regulator: core: Define regulator_set_voltage_triplet()Viresh Kumar2015-08-171-0/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Voltage tolerance isn't necessarily same on both sides of the target voltage and regulator_set_voltage_tol() wouldn't be suitable in such cases. Add another routine regulator_set_voltage_triplet(), which accepts target, min and max voltages as arguments. This first tries to set the voltage between the target voltage and the upper limit, then fall back on the full range. The idea behind this is to set regulator's voltage as close to the target voltage, as possible. Based on regulator_set_voltage_tol(). Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
| | | * regulator: Add missing dummy definition for regulator_list_voltageSuzuki K. Poulose2015-07-101-0/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a build break when CONFIG_REGULATOR is not selected. e.g, on linux-next - 07102015: drivers/clk/tegra/clk-dfll.c: In function ‘find_lut_index_for_rate’: drivers/clk/tegra/clk-dfll.c:691:3: error: implicit declaration of function ‘regulator_list_voltage’ [-Werror=implicit-function-declaration] if (regulator_list_voltage(td->vdd_reg, td->i2c_lut[i]) == uv) ^ CC drivers/clocksource/mmio.o CC fs/proc/softirqs.o cc1: some warnings being treated as errors make[3]: *** [drivers/clk/tegra/clk-dfll.o] Error 1 make[2]: *** [drivers/clk/tegra] Error 2 make[1]: *** [drivers/clk] Error 2 make[1]: *** Waiting for unfinished jobs.... This should be pushed to 4.2 as we have the issue in 4.2-rc1, just that nobody uses it without the REGULATOR(yet). Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | |
| \ \
| \ \
| \ \
*---. | | Merge remote-tracking branches 'regulator/topic/mt6311', ↵Mark Brown2015-08-303-0/+31
|\ \ \| | | | | |/ | | |/| | | | | 'regulator/topic/ocp', 'regulator/topic/owner', 'regulator/topic/pfuze100' and 'regulator/topic/pwm' into regulator-next
| | * | regulator: Add over current protection (OCP) supportStephen Boyd2015-07-242-0/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Some regulators can automatically shut down when they detect an over current event. Add an op (set_over_current_protection) and a DT property + constraint to support this capability. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
| * / regulator: mt6311: Add support for mt6311 regulatorHenry Chen2015-07-241-0/+29
| |/ | | | | | | | | | | | | | | | | | | | | | | Add regulator support for mt6311. It has 2 regulaotrs - Buck and LDO, provide the related buck/ldo voltage data to the driver, and creates the regulator_desc table. Supported operations for Buck are enabled/disabled and voltage change, only enabled/disabled for LDO. Signed-off-by: Henry Chen <henryc.chen@mediatek.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* / regulator: da9211: support da9215James Ban2015-07-131-9/+10
|/ | | | | | | This is a patch for supporting da9215 buck converter. Signed-off-by: James Ban <james.ban.opensource@diasemi.com> Signed-off-by: Mark Brown <broonie@kernel.org>
*-. Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', ↵Mark Brown2015-06-222-0/+2
|\ \ | | | | | | | | | 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next
| | * regulator: Add docbook for soft startStephen Boyd2015-06-152-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docbook for these members is missing. Add them. Warning(include/linux/regulator/machine.h:147): No description found for parameter 'soft_start' Warning(include/linux/regulator/driver.h:197): No description found for parameter 'set_soft_start' Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'regulator/topic/lp8755', ↵Mark Brown2015-06-221-0/+4
|\ \ \ \ | | |/ / | |/| | | | | | 'regulator/topic/max14577', 'regulator/topic/max77693', 'regulator/topic/max77843' and 'regulator/topic/max8973' into regulator-next
| | * | regulator: max8973: add mechanism to enable/disable through GPIOLaxman Dewangan2015-05-221-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | MAX8973 supports the voltage output enable/disable through its EN pin. This EN pin can be connected through GPIO from host processor. Add support to provide GPIO number from platform/DT and if it is valid GPIO then enable external control default. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* | / regulator: Add input current limit supportStephen Boyd2015-06-122-0/+5
| |/ |/| | | | | | | | | | | | | | | Some regulators can limit their input current (typically annotated as ilim). Add an op (set_input_current_limit) and a DT property + constraint to support this. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
* | regulator: Add soft start supportStephen Boyd2015-06-122-0/+3
| | | | | | | | | | | | | | | | | | Some regulators support a "soft start" feature where the voltage ramps up slowly when the regulator is enabled. Add an op (set_soft_start) and a DT property + constraint to support this. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
* | regulator: Add pull down supportStephen Boyd2015-06-122-0/+7
| | | | | | | | | | | | | | | | | | Some regulators need to be configured to pull down a resistor when the regulator is disabled. Add an op (set_pull_down) and a DT property + constraint to support this. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
* | regulator: Add system_load constraintStephen Boyd2015-06-121-0/+3
|/ | | | | | | | | Some regulators have a fixed load that isn't captured by consumers that the kernel knows about. Add a constraint to support this. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
*-----. Merge remote-tracking branches 'regulator/topic/mode', ↵Mark Brown2015-04-101-3/+18
|\ \ \ \ | | | | | | | | | | | | | | | 'regulator/topic/notifier', 'regulator/topic/palmas', 'regulator/topic/qcom' and 'regulator/topic/stw481x' into regulator-next
| | * | | regulator: core: Add devres versions of notifier registrationCharles Keepax2015-03-051-0/+16
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add devm_regulator_register_notifier, this adds the resource against the device for the consumer supply we are registering the notifier for. There seem to be few use-cases where this wouldn't be the users intention and this ensures the notifiers will always be removed at the correct time. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| * | | regulator: Drop temporary regulator_set_optimum_mode wrapperBjorn Andersson2015-03-091-7/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| * | | regulator: Rename regulator_set_optimum_modeBjorn Andersson2015-03-091-3/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | Rename the regulator_set_optimum_mode() function regulator_set_load() to better represent what's going on. Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'regulator/topic/dbx500', ↵Mark Brown2015-04-101-0/+3
|\ \ \ \ | | |/ / | |/| / | | |/ 'regulator/topic/load-op', 'regulator/topic/max77693' and 'regulator/topic/max8660' into regulator-next
| | * regulator: core: Introduce set_load opBjorn Andersson2015-02-231-0/+3
| |/ | | | | | | | | | | | | | | Expose the requested load directly to the regulator implementation for hardware that does not support the normal enum based set_mode(). Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| |
| \
| \
| \
*---. | Merge remote-tracking branches 'regulator/topic/act8865', ↵Mark Brown2015-04-101-0/+14
|\ \ \| | | | | | | | | | | | | 'regulator/topic/arizona-ldo1', 'regulator/topic/arizona-micsupp' and 'regulator/topic/da9211' into regulator-next
| * | | regulator: act8865: Add act8600 supportZubair Lutfullah Kakakhel2015-03-061-0/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds act8600 support to the act8865 driver. VBUS and USB charger supported by this chip can be added later Tested on MIPS Creator CI20 Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* | | Merge remote-tracking branch 'regulator/topic/core' into regulator-nextMark Brown2015-04-102-1/+2
|\ \ \
| * | | regulator: Defer lookup of supply to regulator_getBjorn Andersson2015-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of resolving regulator supplies during registration move this to the time of a consumer retrieving a handle. The benefit is that it's possible for one driver to register regulators with internal dependencies out of order. Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| * | | regulator: core: Fix space before TABGeert Uytterhoeven2015-02-241-1/+1
| |/ / | | | | | | | | | | | | Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Mark Brown <broonie@kernel.org>
* / / regulator: Fix documentation for regmap in the configAxel Lin2015-03-181-1/+1
|/ / | | | | | | | | | | | | dev_get_regulator() does not exist, fix the typo. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| |
| \
| \
| \
*---. \ Merge remote-tracking branches 'regulator/topic/max8649', ↵Mark Brown2015-02-082-0/+63
|\ \ \ \ | | |_|/ | |/| | | | | | 'regulator/topic/mode', 'regulator/topic/mt6397', 'regulator/topic/pfuze100' and 'regulator/topic/qcom-rpm' into regulator-next
| | | * regulator: pfuze100-regulator: add pfuze3000 supportRobin Gong2015-01-091-0/+14
| | |/ | |/| | | | | | | | | | | | | | | | Add pfuze3000 chip support. Signed-off-by: Robin Gong <b38343@freescale.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * regulator: mt6397: Add support for MT6397 regulatorFlora Fu2014-12-241-0/+49
| |/ | | | | | | | | | | | | Add MT6397 regulator driver. Signed-off-by: Flora Fu <flora.fu@mediatek.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| |
| \
*-. \ Merge remote-tracking branches 'regulator/topic/axp20x', ↵Mark Brown2015-02-081-0/+2
|\ \ \ | | |/ | |/| | | | 'regulator/topic/da9211' and 'regulator/topic/fan53555' into regulator-next
| | * regulator: da9211: Add gpio control for enable/disable of buckJames Ban2015-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | This is a patch for adding gpio control about enable/disable of buck. Signed-off-by: James Ban <james.ban.opensource@diasemi.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| | * regulator: da9211: fix unmatched of_nodeJames Ban2015-01-161-0/+1
| |/ | | | | | | | | | | | | This is a patch for fixing unmatched of_node. Signed-off-by: James Ban <james.ban.opensource@diasemi.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* | Merge remote-tracking branch 'regulator/topic/dt-cb' into regulator-nextMark Brown2015-02-081-0/+13
|\ \
| * | regulator: Allow parsing custom properties when using simplified DT parsingKrzysztof Kozlowski2015-01-081-0/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When drivers use simplified DT parsing method (they provide 'regulator_desc.of_match') they still may want to parse custom properties for some of the regulators. For example some of the regulators support GPIO enable control. Add a driver-supplied callback for such case. This way the regulator core parses common bindings offloading a lot of code from drivers and still custom properties may be used. The callback, called for each parsed regulator, may modify the 'regulator_config' initially passed to regulator_register(). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
* / regulator: Fix build breakage on !REGULATORKrzysztof Kozlowski2015-02-041-3/+10
|/ | | | | | | | | | | | | | | | | Add missing stubs for regulator_suspend_prepare() and regulator_suspend_finish() to fix exynos_defconfig build without REGULATOR: arch/arm/mach-exynos/built-in.o: In function `exynos_suspend_finish': arch/arm/mach-exynos/suspend.c:537: undefined reference to `regulator_suspend_finish' arch/arm/mach-exynos/built-in.o: In function `exynos_suspend_prepare': arch/arm/mach-exynos/suspend.c:520: undefined reference to `regulator_suspend_prepare' make: *** [vmlinux] Error 1 Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reported-by: Joerg Roedel <joro@8bytes.org> Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
*-. Merge remote-tracking branches 'regulator/topic/sky81452' and ↵Mark Brown2014-12-051-1/+1
|\ \ | | | | | | | | | 'regulator/topic/stub' into regulator-next
| | * regulator: Return an error from stubbed regulator_get_exclusive()Mark Brown2014-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The user hasn't got a regulator and shouldn't be mislead into thinking they have one; really we should probably remove this stub entirely (and may well before the next merge window). Signed-off-by: Mark Brown <broonie@kernel.org>
OpenPOWER on IntegriCloud