regulator: add userspace-consumer driver
PATCH 1/2 regulator: move regulator_consumer_supply from machine.h to consumer.h
In reply to Mike Rapoport--- include/linux/regulator/consumer.h | 13 +++++++++++++ include/linux/regulator/machine.h | 14 +------------- 2 files changed, 14 insertions(+), 13 deletions(-)
include/linux/regulator/consumer.h +13 -0
@@ -120,6 +120,19 @@ struct regulator_bulk_data {struct regulator *consumer; }; +/** +* struct regulator_consumer_supply - supply -> device mapping +* +* This maps a supply name to a device. +* +* @dev: Device structure for the consumer. +* @supply: Name for the supply. +*/ +struct regulator_consumer_supply { +struct device *dev;/* consumer */ +const char *supply;/* consumer supply - e.g. "vcc" */ +}; +#if defined(CONFIG_REGULATOR )/* regulator get and put */
include/linux/regulator/machine.h +1 -13
@@ -19,6 +19,7 @@#include <linux/suspend.h> struct regulator ; +struct regulator_consumer_supply ;/* * Regulator operation constraint flags. These flags are used to enable
@@ -124,19 +125,6 @@ struct regulation_constraints { };/** -* struct regulator_consumer_supply - supply -> device mapping -* -* This maps a supply name to a device. -* -* @dev: Device structure for the consumer. -* @supply: Name for the supply. -*/ -struct regulator_consumer_supply { -struct device *dev;/* consumer */ -const char *supply;/* consumer supply - e.g. "vcc" */ -}; - -/** * struct regulator_init_data - regulator platform initialisation data. * * Initialisation constraints, our supply and consumers supplies.
Signature · 1 line
1.5.6.4
PATCH 2/2 regulator: add userspace-consumer driver
In reply to Mike RapoportThe userspace-consumer driver allows control of voltage and current regulator state from userspace. This is required for fine-grained power management of devices that are completely controller by userspace applications, e.g. a GPS transciever connected to a serial port.
--- drivers/regulator/Kconfig | 10 ++ drivers/regulator/Makefile | 1 + drivers/regulator/userspace-consumer.c | 213 ++++++++++++++++++++++++++ include/linux/regulator/userspace-consumer.h | 25 +++ 4 files changed, 249 insertions(+), 0 deletions(-) create mode 100644 drivers/regulator/userspace-consumer.c create mode 100644 include/linux/regulator/userspace-consumer.h
drivers/regulator/Kconfig +10 -0
@@ -47,6 +47,16 @@ config REGULATOR_VIRTUAL_CONSUMER If unsure, say no. +config REGULATOR_USERSPACE_CONSUMER + tristate "Userspace regulator consumer support" + default n + help + There are some classes of devices that are controlled entirely + from user space. Usersapce consumer driver provides ability to + control power supplies for such devices. + + If unsure, say no. + config REGULATOR_BQ24022 tristate "TI bq24022 Dual Input 1-Cell Li-Ion Charger IC" default n
drivers/regulator/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_REGULATOR) += core.o obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o +obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o
drivers/regulator/userspace-consumer.c new file +213 -0
213 lines not on this page · raw message
include/linux/regulator/userspace-consumer.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef __REGULATOR_PLATFORM_CONSUMER_H_ +#define __REGULATOR_PLATFORM_CONSUMER_H_ + +struct regulator_consumer_supply ; + +/** +* struct regulator_userspace_consumer_data - line consumer +* initialisation data. +* +* @name: Name for the consumer line +* @num_supplies: Number of supplies feeding the line +* @supplies: Supplies configuration. +* @init_on: Set if the regulators supplying the line should be +* enabled during initialisation +*/ +struct regulator_userspace_consumer_data { +const char *name; + +int num_supplies; +struct regulator_consumer_supply *supplies; + +bool init_on; +}; + +#endif /* __REGULATOR_PLATFORM_CONSUMER_H_ */
Signature · 1 line
1.5.6.4
cover regulator: add userspace-consumer driver
The userspace-consumer driver allows control of voltage and current regulator state from userspace. This is required for fine-grained power management of devices that are completely controller by userspace applications, e.g. a GPS transciever connected to a serial port.
The first patch in the serie reorginases the way structs are defined in the regulator framework headers so that regulator_consumer_supply can be used without need to include include/linux/regulator/machine.h
The second patch is actully userspace-consumer driver implementation.
Mike Rapoport (2):
regulator: move regulator_consumer_supply from machine.h to
consumer.h
regulator: add userspace-consumer driver
drivers/regulator/Kconfig | 10 ++ drivers/regulator/Makefile | 1 + drivers/regulator/userspace-consumer.c | 213 ++++++++++++++++++++++++++ include/linux/regulator/consumer.h | 13 ++ include/linux/regulator/machine.h | 14 +-- include/linux/regulator/userspace-consumer.h | 25 +++ 6 files changed, 263 insertions(+), 13 deletions(-) create mode 100644 drivers/regulator/userspace-consumer.c create mode 100644 include/linux/regulator/userspace-consumer.h
Quoted 2 lines · Mike Rapoport
+/*
+ *line-consumer.c
Bitrot.
Quoted 2 lines
drivers/regulator/userspace-consumer.c new file +2
-0+for (i =0 ; i < drvdata->num_supplies; i++) + drvdata->supplies[i].supply = pdata->supplies[i].supply;
...
include/linux/regulator/userspace-consumer.h line 20
Quoted 5 lines
include/linux/regulator/userspace-consumer.h new file +5
-0+struct regulator_userspace_consumer_data { +const char *name; + +int num_supplies; +struct regulator_consumer_supply *supplies;
Why are you using a regulator_consumer_supply here? All that's being used here is the name and I can't see why you'd want the device.
Quoted 6 lines · Mark Brown
Quoted 2 lines · Mike Rapoport
+/*
+ *line-consumer.cBitrot.
Thanks, I'll fix it.
Quoted 6 lines
Quoted 3 lines
drivers/regulator/userspace-consumer.c new file +2
-0+for (i =0 ; i < drvdata->num_supplies; i++) + drvdata->supplies[i].supply = pdata->supplies[i].supply;...
Quoted 8 lines
include/linux/regulator/userspace-consumer.h line 20
Quoted 5 lines
include/linux/regulator/userspace-consumer.h new file +5
-0+struct regulator_userspace_consumer_data { +const char *name; + +int num_supplies; +struct regulator_consumer_supply *supplies;Why are you using a
regulator_consumer_supplyhere? All that's being used here is the name and I can't see why you'd want the device.
For upwards compatibility :)
Well, seriously, I think using 'struct regulator_consumer_supply *supplies' rather than 'char *supplies' makes the platform code that registers the userspace-consumer device clearer.
Quoted 6 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
Sincerely yours, Mike.
Quoted 9 lines · Mike Rapoport
Quoted 2 lines · Mark Brown
Why are you using a
regulator_consumer_supplyhere? All that's being used here is the name and I can't see why you'd want the device.For upwards compatibility :)
Well, seriously, I think using 'structregulator_consumer_supply*supplies' rather than 'char *supplies' makes the platform code that registers the userspace-consumer device clearer.
On the other hand it merges the consumer and machine APIs, which we really want to keep separate, and I can't see having the struct device in there doing anything except confuse people. If you're going to pick an existing structure to use I'd be more inclined to use the bulk consumer structure (which the driver needs to allocate anyway).
Quoted 11 lines · Mark Brown
Quoted 9 lines · Mike Rapoport
Quoted 2 lines · Mark Brown
Why are you using a
regulator_consumer_supplyhere? All that's being used here is the name and I can't see why you'd want the device.For upwards compatibility :)
Well, seriously, I think using 'structregulator_consumer_supply*supplies' rather than 'char *supplies' makes the platform code that registers the userspace-consumer device clearer.
Quoted 5 lines
On the other hand it merges the consumer and machine APIs, which we really want to keep separate, and I can't see having the struct device in there doing anything except confuse people. If you're going to pick an existing structure to use I'd be more inclined to use the bulk consumer structure (which the driver needs to allocate anyway).
Ok, I'll use bulk consumer and then apparently I can avoid it's allocation...
Signature · 2 lines
Sincerely yours, Mike.
PATCH 1/1 regulator: add userspace-consumer driver
In reply to Mark BrownThe userspace-consumer driver allows control of voltage and current regulator state from userspace. This is required for fine-grained power management of devices that are completely controller by userspace applications, e.g. a GPS transciever connected to a serial port.
--- drivers/regulator/Kconfig | 10 ++ drivers/regulator/Makefile | 1 + drivers/regulator/userspace-consumer.c | 200 ++++++++++++++++++++++++++ include/linux/regulator/userspace-consumer.h | 25 ++++ 4 files changed, 236 insertions(+), 0 deletions(-) create mode 100644 drivers/regulator/userspace-consumer.c create mode 100644 include/linux/regulator/userspace-consumer.h
drivers/regulator/Kconfig +10 -0
@@ -47,6 +47,16 @@ config REGULATOR_VIRTUAL_CONSUMER If unsure, say no. +config REGULATOR_USERSPACE_CONSUMER + tristate "Userspace regulator consumer support" + default n + help + There are some classes of devices that are controlled entirely + from user space. Usersapce consumer driver provides ability to + control power supplies for such devices. + + If unsure, say no. + config REGULATOR_BQ24022 tristate "TI bq24022 Dual Input 1-Cell Li-Ion Charger IC" default n
drivers/regulator/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_REGULATOR) += core.o obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o +obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o
drivers/regulator/userspace-consumer.c new file +200 -0
200 lines not on this page · raw message
include/linux/regulator/userspace-consumer.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef __REGULATOR_PLATFORM_CONSUMER_H_ +#define __REGULATOR_PLATFORM_CONSUMER_H_ + +struct regulator_consumer_supply ; + +/** +* struct regulator_userspace_consumer_data - line consumer +* initialisation data. +* +* @name: Name for the consumer line +* @num_supplies: Number of supplies feeding the line +* @supplies: Supplies configuration. +* @init_on: Set if the regulators supplying the line should be +* enabled during initialisation +*/ +struct regulator_userspace_consumer_data { +const char *name; + +int num_supplies; +struct regulator_bulk_data *supplies; + +bool init_on; +}; + +#endif /* __REGULATOR_PLATFORM_CONSUMER_H_ */
Signature · 1 line
1.5.6.4
Quoted 6 lines · Mike Rapoport
The userspace-consumer driver allows control of voltage and current regulator state from userspace. This is required for fine-grained power management of devices that are completely controller by userspace applications, e.g. a GPS transciever connected to a serial port.
Signed-off-by Mike Rapoport <[email protected]>
Looks good, though the probe() and remove() could have __devinit and __devexit annotations.
Liam Girdwood
AppliedQuoted 6 lines · Mike Rapoport
The userspace-consumer driver allows control of voltage and current regulator state from userspace. This is required for fine-grained power management of devices that are completely controller by userspace applications, e.g. a GPS transciever connected to a serial port.
Signed-off-by Mike Rapoport <[email protected]>
Applied.
Thanks
Liam
Quoted 6 lines · Mark Brown
Quoted 4 lines · Mike Rapoport
The userspace-consumer driver allows control of voltage and current regulator state from userspace. This is required for fine-grained power management of devices that are completely controller by userspace applications, e.g. a GPS transciever connected to a serial port.
Quoted 6 lines
Quoted 1 line
Signed-off-by Mike Rapoport <[email protected]>Looks good, though the
probe()andremove()could have__devinitand__devexitannotations.Acked-by Mark Brown <[email protected]>
Heh, just acked in time. Was about to hit enter on my keyboard ;)
Liam