[PATCH 0/2] minor changes to power_supply

[PATCH 0/2] minor changes to power_supply

[Krogerus Heikki (EXT-Teleca/Helsinki)]

From: Heikki Krogerus <ext-heikki.krogerus@nokia.com>

Both of them only concern USB charging.


Heikki Krogerus (2):
  power_supply: add types for USB chargers
  power_supply: Introduce maximum current property

 drivers/power/power_supply_sysfs.c |    4 +++-
 include/linux/power_supply.h       |    6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

[PATCH 1/2] power_supply: add types for USB chargers

[Krogerus Heikki (EXT-Teleca/Helsinki)]

From: Heikki Krogerus <ext-heikki.krogerus@nokia.com>

This adds power supply types for USB chargers defined in
Battery Charging Specification 1.1.

Signed-off-by: Heikki Krogerus <ext-heikki.krogerus@nokia.com>
---
 drivers/power/power_supply_sysfs.c |    3 ++-
 include/linux/power_supply.h       |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 9d30eeb..88f5e43 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -42,7 +42,8 @@ static ssize_t power_supply_show_property(struct device *dev,
 					  struct device_attribute *attr,
 					  char *buf) {
 	static char *type_text[] = {
-		"Battery", "UPS", "Mains", "USB"
+		"Battery", "UPS", "Mains", "USB",
+		"USB_DCP", "USB_CDP", "USB_ACA"
 	};
 	static char *status_text[] = {
 		"Unknown", "Charging", "Discharging", "Not charging", "Full"
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 30083a8..d37fef6 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -125,7 +125,10 @@ enum power_supply_type {
 	POWER_SUPPLY_TYPE_BATTERY = 0,
 	POWER_SUPPLY_TYPE_UPS,
 	POWER_SUPPLY_TYPE_MAINS,
-	POWER_SUPPLY_TYPE_USB,
+	POWER_SUPPLY_TYPE_USB,		/* Standard Downstream Port */
+	POWER_SUPPLY_TYPE_USB_DCP,	/* Dedicated Charging Port */
+	POWER_SUPPLY_TYPE_USB_CDP,	/* Charging Downstream Port */
+	POWER_SUPPLY_TYPE_USB_ACA,	/* Accessory Charger Adapters */
 };
 
 union power_supply_propval {
-- 
1.7.0.4

[PATCH 2/2] power_supply: Introduce maximum current property

[Krogerus Heikki (EXT-Teleca/Helsinki)]

From: Heikki Krogerus <ext-heikki.krogerus@nokia.com>

USB only gives the maximum current allowed to draw.

Signed-off-by: Heikki Krogerus <ext-heikki.krogerus@nokia.com>
---
 drivers/power/power_supply_sysfs.c |    1 +
 include/linux/power_supply.h       |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 88f5e43..cd1f907 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -139,6 +139,7 @@ static struct device_attribute power_supply_attrs[] = {
 	POWER_SUPPLY_ATTR(voltage_min_design),
 	POWER_SUPPLY_ATTR(voltage_now),
 	POWER_SUPPLY_ATTR(voltage_avg),
+	POWER_SUPPLY_ATTR(current_max),
 	POWER_SUPPLY_ATTR(current_now),
 	POWER_SUPPLY_ATTR(current_avg),
 	POWER_SUPPLY_ATTR(power_now),
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index d37fef6..7d73256 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -89,6 +89,7 @@ enum power_supply_property {
 	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
 	POWER_SUPPLY_PROP_VOLTAGE_NOW,
 	POWER_SUPPLY_PROP_VOLTAGE_AVG,
+	POWER_SUPPLY_PROP_CURRENT_MAX,
 	POWER_SUPPLY_PROP_CURRENT_NOW,
 	POWER_SUPPLY_PROP_CURRENT_AVG,
 	POWER_SUPPLY_PROP_POWER_NOW,
-- 
1.7.0.4

Re: [PATCH 0/2] minor changes to power_supply

[Heikki Krogerus]

On Mon, Oct 04, 2010 at 09:51:36AM +0200, Krogerus Heikki (EXT-Teleca/Helsinki) wrote:
> Both of them only concern USB charging.
> 
> Heikki Krogerus (2):
>   power_supply: add types for USB chargers
>   power_supply: Introduce maximum current property
> 
>  drivers/power/power_supply_sysfs.c |    4 +++-
>  include/linux/power_supply.h       |    6 +++++-
>  2 files changed, 8 insertions(+), 2 deletions(-)

Anton, ping. Any comments on these?

-- 
heikki

Re: [PATCH 0/2] minor changes to power_supply

[Anton Vorontsov]

On Mon, Oct 04, 2010 at 10:51:36AM +0300, Krogerus Heikki (EXT-Teleca/Helsinki) wrote:
> From: Heikki Krogerus <ext-heikki.krogerus@nokia.com>
> 
> Both of them only concern USB charging.
> 
> 
> Heikki Krogerus (2):
>   power_supply: add types for USB chargers
>   power_supply: Introduce maximum current property
> 
>  drivers/power/power_supply_sysfs.c |    4 +++-
>  include/linux/power_supply.h       |    6 +++++-
>  2 files changed, 8 insertions(+), 2 deletions(-)

Both applied, thanks!

-- 
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2