summary refs log tree commit diff
path: root/drivers/power/supply
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2017-05-03 17:15:29 -0700
committerSebastian Reichel <sre@kernel.org>2017-05-04 17:51:32 +0200
commit4f700a5285dc8f9dde4ad02542bc42fe9f97cfcf (patch)
tree68e5ae19563652efe777da6b802d8fb2b5f6a998 /drivers/power/supply
parent50730eb367147dc96394d25b3f55c33595663b6f (diff)
downloadlinux-4f700a5285dc8f9dde4ad02542bc42fe9f97cfcf.tar.gz
power: supply: cpcap-charger: Fix charger name
I noticed we have a different name from what Android is using.
Let's not break the /sys/class/power user space interface here
and use the same naming as Android has.

On Android we have the following for droid 4:

$ ls /sys/class/power_supply/
ac battery usb

So let's use the usb naming here for charger too.

Fixes: 0c9888e3c192 ("power: supply: cpcap-charger: Add minimal
CPCAP PMIC battery charger")
Cc: Marcel Partap <mpartap@gmx.net>
Cc: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power/supply')
-rw-r--r--drivers/power/supply/cpcap-charger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index 543a1bd21ab9..17907fcaebc3 100644
--- a/drivers/power/supply/cpcap-charger.c
+++ b/drivers/power/supply/cpcap-charger.c
@@ -566,7 +566,7 @@ out_err:
 }
 
 static const struct power_supply_desc cpcap_charger_usb_desc = {
-	.name		= "cpcap_usb",
+	.name		= "usb",
 	.type		= POWER_SUPPLY_TYPE_USB,
 	.properties	= cpcap_charger_props,
 	.num_properties	= ARRAY_SIZE(cpcap_charger_props),