aboutsummaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorLinus Walleij <[email protected]>2018-05-14 10:06:22 +0200
committerMark Brown <[email protected]>2018-05-29 15:53:17 +0100
commit6059577cb28d8b15d2b7dad51eb90d885f1ed9ab (patch)
treef84df9c39410203cb50963369b09a569a19c75d5 /include/linux/regulator
parent37fa23dbccbd97663acc085bd79246f427e603a1 (diff)
regulator: fixed: Convert to use GPIO descriptor only
As we augmented the regulator core to accept a GPIO descriptor instead of a GPIO number, we can augment the fixed GPIO regulator to look up and pass that descriptor directly from device tree or board GPIO descriptor look up tables. Some boards just auto-enumerate their fixed regulator platform devices and I have assumed they get names like "fixed-regulator.0" but it's pretty hard to guess this. I need some testing from board maintainers to be sure. Other boards are straight forward, using just plain "fixed-regulator" (ID -1) or "fixed-regulator.1" hammering down the device ID. The OMAP didn't have proper label names on its GPIO chips so I have fixed this with a separate patch to the GPIO tree, see commit 088413bc0bd5f5fb66ca22a19d66a49d7154ba4c "gpio: omap: Give unique labels to each GPIO bank/chip" It seems the da9055 and da9211 has never got around to actually passing any enable gpio into its platform data (not the in-tree code anyway) so we can just decide to simply pass a descriptor instead. The fixed GPIO-controlled regulator in mach-pxa/ezx.c was confusingly named "*_dummy_supply_device" while it is a very real device backed by a GPIO line. There is nothing dummy about it at all, so I renamed it with the infix *_regulator_* as part of this patch set. For the patch hunk hitting arch/blackfin I would say I do not expect testing, review or ACKs anymore so if it works, it works. The hunk hitting the x86 BCM43xx driver is especially tricky as the number comes out of SFI which is a mystery to me. I definately need someone to look at this. (Hi Andy.) Cc: Andy Shevchenko <[email protected]> # Check the x86 BCM stuff Cc: Alexander Shiyan <[email protected]> # i.MX boards user Cc: Haojian Zhuang <[email protected]> # MMP2 maintainer Cc: Aaro Koskinen <[email protected]> # OMAP1 maintainer Cc: Tony Lindgren <[email protected]> # OMAP1,2,3 maintainer Cc: Mike Rapoport <[email protected]> # EM-X270 maintainer Cc: Robert Jarzmik <[email protected]> # EZX maintainer Cc: Philipp Zabel <[email protected]> # Magician maintainer Cc: Daniel Mack <[email protected]> # Raumfeld maintainer Cc: Marc Zyngier <[email protected]> # Zeus maintainer Cc: Geert Uytterhoeven <[email protected]> # SuperH pinctrl/GPIO maintainer Cc: Russell King <[email protected]> # SA1100 Signed-off-by: Linus Walleij <[email protected]> Acked-by: Andy Shevchenko <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Mark Brown <[email protected]>
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/fixed.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h
index 48918be649d4..1a4340ed8e2b 100644
--- a/include/linux/regulator/fixed.h
+++ b/include/linux/regulator/fixed.h
@@ -24,8 +24,6 @@ struct regulator_init_data;
* @supply_name: Name of the regulator supply
* @input_supply: Name of the input regulator supply
* @microvolts: Output voltage of regulator
- * @gpio: GPIO to use for enable control
- * set to -EINVAL if not used
* @startup_delay: Start-up time in microseconds
* @gpio_is_open_drain: Gpio pin is open drain or normal type.
* If it is open drain type then HIGH will be set
@@ -49,7 +47,6 @@ struct fixed_voltage_config {
const char *supply_name;
const char *input_supply;
int microvolts;
- int gpio;
unsigned startup_delay;
unsigned gpio_is_open_drain:1;
unsigned enable_high:1;