All of lore.kernel.org
 help / color / mirror / Atom feed
From: NeilBrown <neil@brown.name>
To: Sebastian Reichel <sre@kernel.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
	linux-pm@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
	David Woodhouse <dwmw2@infradead.org>,
	linux-kernel@vger.kernel.org,
	real GTA04 owners <gta04-owner@goldelico.com>,
	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
	Pavel Machek <pavel@ucw.cz>,
	linux-omap@vger.kernel.org, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 08/13] twl4030_charger: allow max_current to be managed via sysfs.
Date: Thu, 30 Jul 2015 10:11:24 +1000	[thread overview]
Message-ID: <20150730001124.4012.15657.stgit@noble> (raw)
In-Reply-To: <20150730001113.4012.18086.stgit@noble>

'max_current' sysfs attributes are created which allow the
max to be set.
Whenever a current source changes, the default is restored.
This will be followed by a uevent, so user-space can decide to
update again.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: NeilBrown <neil@brown.name>
---
 .../ABI/testing/sysfs-class-power-twl4030          |   15 ++++
 drivers/power/twl4030_charger.c                    |   72 ++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 Documentation/ABI/testing/sysfs-class-power-twl4030

diff --git a/Documentation/ABI/testing/sysfs-class-power-twl4030 b/Documentation/ABI/testing/sysfs-class-power-twl4030
new file mode 100644
index 000000000000..0331bba4605d
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-power-twl4030
@@ -0,0 +1,15 @@
+What: /sys/class/power_supply/twl4030_ac/max_current
+      /sys/class/power_supply/twl4030_usb/max_current
+Description:
+	Read/Write limit on current which may
+	be drawn from the ac (Accessory Charger) or
+	USB port.
+
+	Value is in micro-Amps.
+
+	Value is set automatically to an appropriate
+	value when a cable is plugged or unplugged.
+
+	Value can the set by writing to the attribute.
+	The change will only persist until the next
+	plug event.  These event are reported via udev.
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 982675df21b7..b0a50adebfda 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -482,6 +482,8 @@ static irqreturn_t twl4030_charger_interrupt(int irq, void *arg)
 	struct twl4030_bci *bci = arg;
 
 	dev_dbg(bci->dev, "CHG_PRES irq\n");
+	/* reset current on each 'plug' event */
+	bci->ac_cur = 500000;
 	twl4030_charger_update_current(bci);
 	power_supply_changed(bci->ac);
 	power_supply_changed(bci->usb);
@@ -536,6 +538,63 @@ static irqreturn_t twl4030_bci_interrupt(int irq, void *arg)
 	return IRQ_HANDLED;
 }
 
+/*
+ * Provide "max_current" attribute in sysfs.
+ */
+static ssize_t
+twl4030_bci_max_current_store(struct device *dev, struct device_attribute *attr,
+	const char *buf, size_t n)
+{
+	struct twl4030_bci *bci = dev_get_drvdata(dev->parent);
+	int cur = 0;
+	int status = 0;
+	status = kstrtoint(buf, 10, &cur);
+	if (status)
+		return status;
+	if (cur < 0)
+		return -EINVAL;
+	if (dev == &bci->ac->dev)
+		bci->ac_cur = cur;
+	else
+		bci->usb_cur = cur;
+
+	twl4030_charger_update_current(bci);
+	return n;
+}
+
+/*
+ * sysfs max_current show
+ */
+static ssize_t twl4030_bci_max_current_show(struct device *dev,
+	struct device_attribute *attr, char *buf)
+{
+	int status = 0;
+	int cur = -1;
+	u8 bcictl1;
+	struct twl4030_bci *bci = dev_get_drvdata(dev->parent);
+
+	if (dev == &bci->ac->dev) {
+		if (!bci->ac_is_active)
+			cur = bci->ac_cur;
+	} else {
+		if (bci->ac_is_active)
+			cur = bci->usb_cur;
+	}
+	if (cur < 0) {
+		cur = twl4030bci_read_adc_val(TWL4030_BCIIREF1);
+		if (cur < 0)
+			return cur;
+		status = twl4030_bci_read(TWL4030_BCICTL1, &bcictl1);
+		if (status < 0)
+			return status;
+		cur = regval2ua(cur, bcictl1 & TWL4030_CGAIN);
+	}
+	return scnprintf(buf, PAGE_SIZE, "%u\n", cur);
+}
+
+static DEVICE_ATTR(max_current, 0644, twl4030_bci_max_current_show,
+			twl4030_bci_max_current_store);
+
 static void twl4030_bci_usb_work(struct work_struct *data)
 {
 	struct twl4030_bci *bci = container_of(data, struct twl4030_bci, work);
@@ -558,6 +617,12 @@ static int twl4030_bci_usb_ncb(struct notifier_block *nb, unsigned long val,
 
 	dev_dbg(bci->dev, "OTG notify %lu\n", val);
 
+	/* reset current on each 'plug' event */
+	if (allow_usb)
+		bci->usb_cur = 500000;
+	else
+		bci->usb_cur = 100000;
+
 	bci->event = val;
 	schedule_work(&bci->work);
 
@@ -831,6 +896,11 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 		dev_warn(&pdev->dev, "failed to unmask interrupts: %d\n", ret);
 
 	twl4030_charger_update_current(bci);
+	if (device_create_file(&bci->usb->dev, &dev_attr_max_current))
+		dev_warn(&pdev->dev, "could not create sysfs file\n");
+	if (device_create_file(&bci->ac->dev, &dev_attr_max_current))
+		dev_warn(&pdev->dev, "could not create sysfs file\n");
+
 	twl4030_charger_enable_ac(true);
 	if (!IS_ERR_OR_NULL(bci->transceiver))
 		twl4030_bci_usb_ncb(&bci->usb_nb,
@@ -855,6 +925,8 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
 	twl4030_charger_enable_usb(bci, false);
 	twl4030_charger_enable_backup(0, 0);
 
+	device_remove_file(&bci->usb->dev, &dev_attr_max_current);
+	device_remove_file(&bci->ac->dev, &dev_attr_max_current);
 	/* mask interrupts */
 	twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff,
 			 TWL4030_INTERRUPTS_BCIIMR1A);



  parent reply	other threads:[~2015-07-30  0:26 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-30  0:11 [PATCH 00/13] Enhance twl4030_charger functionality. - V3 NeilBrown
2015-07-30  0:11 ` [PATCH 07/13] twl4030_charger: distinguish between USB current and 'AC' current NeilBrown
2015-08-07  3:11   ` Tony Lindgren
2015-08-07  3:45     ` NeilBrown
2015-08-07  4:21       ` Tony Lindgren
2015-08-07  5:13       ` Sebastian Reichel
2015-08-07  5:29         ` NeilBrown
2015-07-30  0:11 ` [PATCH 09/13] twl4030_charger: enable manual enable/disable of usb charging NeilBrown
2015-07-30  0:11 ` [PATCH 01/13] twl4030_charger: use runtime_pm to keep usb phy active while charging NeilBrown
2015-09-15 11:29   ` Pavel Machek
2015-07-30  0:11 ` [PATCH 04/13] twl4030_charger: trust phy to determine when USB power is available NeilBrown
2015-09-15 11:30   ` Pavel Machek
2015-07-30  0:11 ` [PATCH 11/13] twl4030_charger: add ac/mode to match usb/mode NeilBrown
2015-07-30  0:11   ` NeilBrown
2015-07-30  0:11 ` [PATCH 12/13] twl4030_charger: Increase current carefully while watching voltage NeilBrown
2015-07-30  0:11 ` [PATCH 05/13] twl4030_charger: split uA calculation into a function NeilBrown
2015-07-30  0:11 ` [PATCH 02/13] twl4030_charger: convert to module_platform_driver instead of ..._probe NeilBrown
2015-07-30  0:11 ` NeilBrown [this message]
2015-07-30  0:11 ` [PATCH 06/13] twl4030_charger: allow fine control of charger current NeilBrown
2015-07-30  0:11 ` [PATCH 03/13] twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node NeilBrown
2015-08-18  8:07   ` Tony Lindgren
2015-08-19  0:28     ` NeilBrown
2015-08-19  6:25       ` Tony Lindgren
2015-08-27 20:51   ` Kevin Hilman
2015-09-02  3:25     ` Kevin Hilman
2015-09-02  6:19       ` Neil Brown
2015-09-02  6:19         ` Neil Brown
2015-09-02 13:07         ` Tony Lindgren
2015-09-08 18:32           ` Kevin Hilman
2015-09-08 20:14             ` Tony Lindgren
2015-09-10  8:08               ` Sebastian Reichel
2015-09-10 20:27                 ` Sebastian Reichel
2015-09-10 20:43                   ` Tony Lindgren
2015-07-30  0:11 ` [PATCH 10/13] twl4030_charger: add software controlled linear charging mode NeilBrown
2015-09-15 11:28   ` Pavel Machek
2015-09-15 12:08     ` [Gta04-owner] " Christ van Willegen
2015-09-15 12:08       ` Christ van Willegen
2015-10-01  6:14     ` Neil Brown
2015-10-06 14:34       ` Pavel Machek
2015-10-29 16:20         ` [Gta04-owner] " Andreas Kemnade
2015-10-29 16:20           ` Andreas Kemnade
2015-11-14 18:12           ` Pavel Machek
2015-11-14 18:12             ` Pavel Machek
2015-11-24 22:31             ` Andreas Kemnade
2015-11-24 22:31               ` Andreas Kemnade
2015-07-30  0:11 ` [PATCH 13/13] twl4030_charger: assume a 'charger' can supply maximum current NeilBrown
2015-08-05  3:35 ` [PATCH 00/13] Enhance twl4030_charger functionality. - V3 Sebastian Reichel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150730001124.4012.15657.stgit@noble \
    --to=neil@brown.name \
    --cc=dbaryshkov@gmail.com \
    --cc=dwmw2@infradead.org \
    --cc=gta04-owner@goldelico.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=sameo@linux.intel.com \
    --cc=sre@kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.