From: NeilBrown <neilb@suse.de>
To: Samuel Ortiz <sameo@linux.intel.com>,
Tony Lindgren <tony@atomide.com>,
Lee Jones <lee.jones@linaro.org>,
Sebastian Reichel <sre@kernel.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>
Cc: GTA04 owners <gta04-owner@goldelico.com>,
linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org
Subject: [PATCH 09/15] twl4030_charger: allow max_current to be managed via sysfs.
Date: Tue, 24 Feb 2015 15:33:52 +1100 [thread overview]
Message-ID: <20150224043351.4243.46323.stgit@notabene.brown> (raw)
In-Reply-To: <20150224043341.4243.23291.stgit@notabene.brown>
'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.
Signed-off-by: NeilBrown <neilb@suse.de>
---
drivers/power/twl4030_charger.c | 76 +++++++++++++++++++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index bfc9b808301e..b0242786d047 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -473,6 +473,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);
@@ -527,6 +529,67 @@ static irqreturn_t twl4030_bci_interrupt(int irq, void *arg)
return IRQ_HANDLED;
}
+/*
+ * sysfs max_current store
+ */
+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) {
+ if (bci->ac_cur == cur)
+ return n;
+ bci->ac_cur = cur;
+ } else {
+ if (bci->usb_cur == cur)
+ return n;
+ bci->usb_cur = cur;
+ }
+ twl4030_charger_update_current(bci);
+ return (status == 0) ? n : status;
+}
+
+/*
+ * 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);
@@ -549,6 +612,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);
@@ -809,6 +878,11 @@ static int __init 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,
@@ -836,6 +910,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);
next prev parent reply other threads:[~2015-02-24 4:33 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 4:33 [PATCH 00/15] Enhance twl4030_charger functionality NeilBrown
2015-02-24 4:33 ` [PATCH 03/15] twl4030_charger: use devres for power_supply_register and kzalloc NeilBrown
2015-03-07 20:25 ` Sebastian Reichel
2015-02-24 4:33 ` [PATCH 02/15] twl4030_charger: use devm_request_threaded_irq NeilBrown
2015-02-24 4:33 ` [PATCH 01/15] power_supply core: support use of devres to register/unregister a power supply NeilBrown
2015-02-26 2:25 ` Sebastian Reichel
2015-02-24 4:33 ` [PATCH 07/15] twl4030_charger: allow fine control of charger current NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-03-04 6:47 ` NeilBrown
2015-03-04 10:24 ` Pavel Machek
2015-03-07 20:32 ` Sebastian Reichel
2015-02-24 4:33 ` [PATCH 08/15] twl4030_charger: distinguish between USB current and 'AC' current NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-03-04 6:53 ` NeilBrown
2015-02-24 4:33 ` [PATCH 04/15] twl4030_charger: use runtime_pm to keep usb phy active while charging NeilBrown
2015-02-25 7:24 ` Lee Jones
2015-03-05 5:48 ` NeilBrown
2015-02-24 4:33 ` [PATCH 05/15] twl4030_charger: trust phy to determine when USB power is available NeilBrown
2015-02-24 4:33 ` [PATCH 06/15] twl4030_charger: split uA calculation into a function NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-03-04 9:20 ` NeilBrown
2015-02-24 4:33 ` [PATCH 11/15] twl4030_charger: enable manual enable/disable of usb charging NeilBrown
2015-03-02 21:03 ` Pavel Machek
2015-03-04 6:15 ` NeilBrown
2015-03-04 10:19 ` Pavel Machek
2015-02-24 4:33 ` [PATCH 12/15] twl4030_charger: add software controlled linear charging mode NeilBrown
2015-03-02 21:09 ` Pavel Machek
2015-03-05 6:33 ` NeilBrown
2015-03-06 21:24 ` twl4030_charger: need changes to get probed? Pavel Machek
2015-03-06 21:57 ` Pali Rohár
2015-03-06 22:12 ` Grazvydas Ignotas
2015-03-06 22:40 ` Pavel Machek
2015-03-06 22:56 ` Pali Rohár
2015-03-07 15:56 ` Grazvydas Ignotas
2015-03-07 16:43 ` Pali Rohár
2015-04-26 10:13 ` Pavel Machek
2015-03-07 21:01 ` Sebastian Reichel
2015-03-09 0:06 ` NeilBrown
2015-03-09 11:14 ` Sebastian Reichel
2015-02-24 4:33 ` NeilBrown [this message]
2015-03-02 21:05 ` [PATCH 09/15] twl4030_charger: allow max_current to be managed via sysfs Pavel Machek
2015-03-05 6:26 ` NeilBrown
2015-03-05 8:17 ` Pavel Machek
2015-03-07 20:37 ` Sebastian Reichel
2015-02-24 4:33 ` [PATCH 10/15] twl4030_charger: only draw USB current as negotiated with host NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-02-24 4:33 ` [PATCH 13/15] twl4030_charger: add ac/mode to match usb/mode NeilBrown
2015-03-02 21:13 ` Pavel Machek
2015-03-06 21:59 ` Grazvydas Ignotas
2015-03-22 23:13 ` NeilBrown
2015-02-24 4:33 ` [PATCH 14/15] twl4030_charger: Increase current carefully while watching voltage NeilBrown
2015-03-02 21:29 ` Pavel Machek
2015-03-05 6:51 ` NeilBrown
2015-02-24 4:33 ` [PATCH 15/15] twl4030_charger: assume a 'charger' can supply maximum current NeilBrown
2015-03-02 21:29 ` Pavel Machek
2015-03-05 6:45 ` NeilBrown
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=20150224043351.4243.46323.stgit@notabene.brown \
--to=neilb@suse.de \
--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=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).