aboutsummaryrefslogtreecommitdiff
path: root/drivers/power/pcf50633-charger.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power/pcf50633-charger.c')
-rw-r--r--drivers/power/pcf50633-charger.c256
1 files changed, 151 insertions, 105 deletions
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index 8ade32aa5d1..ed69a4ca973 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -1,4 +1,4 @@
-/* Philips PCF50633 Main Battery Charger Driver
+/* NXP PCF50633 Main Battery Charger Driver
*
* (C) 2006-2008 by Openmoko, Inc.
* Author: Balaji Rao <balajirrao@openmoko.org>
@@ -7,28 +7,41 @@
* Broken down from monstrous PCF50633 driver mainly by
* Harald Welte, Andy Green and Werner Almesberger
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
*/
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/device.h>
+#include <linux/sysfs.h>
+#include <linux/platform_device.h>
+#include <linux/power_supply.h>
+
#include <linux/mfd/pcf50633/core.h>
#include <linux/mfd/pcf50633/mbc.h>
-void pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
+struct pcf50633_mbc {
+ struct pcf50633 *pcf;
+
+ int adapter_active;
+ int adapter_online;
+ int usb_active;
+ int usb_online;
+
+ struct power_supply usb;
+ struct power_supply adapter;
+};
+
+int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
{
- int ret;
+ struct pcf50633_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev);
+ int ret = 0;
u8 bits;
int charging_start = 1;
u8 mbcs2, chgmod;
@@ -69,36 +82,56 @@ void pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
}
EXPORT_SYMBOL_GPL(pcf50633_mbc_usb_curlim_set);
-static const char *chgmode_names[] = {
- [PCF50633_MBCS2_MBC_PLAY] = "play-only",
- [PCF50633_MBCS2_MBC_USB_PRE] = "pre",
- [PCF50633_MBCS2_MBC_ADP_PRE] = "pre",
- [PCF50633_MBCS2_MBC_USB_PRE_WAIT] = "pre-wait",
- [PCF50633_MBCS2_MBC_ADP_PRE_WAIT] = "pre-wait",
- [PCF50633_MBCS2_MBC_USB_FAST] = "fast",
- [PCF50633_MBCS2_MBC_ADP_FAST] = "fast",
- [PCF50633_MBCS2_MBC_USB_FAST_WAIT] = "fast-wait",
- [PCF50633_MBCS2_MBC_ADP_FAST_WAIT] = "fast-wait",
- [PCF50633_MBCS2_MBC_BAT_FULL] = "bat-full",
-};
+int pcf50633_mbc_get_status(struct pcf50633 *pcf)
+{
+ struct pcf50633_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev);
+ int status = 0;
+
+ if (mbc->usb_online)
+ status |= PCF50633_MBC_USB_ONLINE;
+ if (mbc->usb_active)
+ status |= PCF50633_MBC_USB_ACTIVE;
+ if (mbc->adapter_online)
+ status |= PCF50633_MBC_ADAPTER_ONLINE;
+ if (mbc->adapter_active)
+ status |= PCF50633_MBC_ADAPTER_ACTIVE;
+
+ return status;
+}
+EXPORT_SYMBOL_GPL(pcf50633_mbc_get_status);
+
+void pcf50633_mbc_set_status(struct pcf50633 *pcf, int what, int status)
+{
+ struct pcf50633_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev);
+
+ if (what & PCF50633_MBC_USB_ONLINE)
+ mbc->usb_online = !!status;
+ if (what & PCF50633_MBC_USB_ACTIVE)
+ mbc->usb_active = !!status;
+ if (what & PCF50633_MBC_ADAPTER_ONLINE)
+ mbc->adapter_online = !!status;
+ if (what & PCF50633_MBC_ADAPTER_ACTIVE)
+ mbc->adapter_active = !!status;
+}
+EXPORT_SYMBOL_GPL(pcf50633_mbc_set_status);
-static ssize_t show_chgmode(struct device *dev, struct device_attribute *attr,
- char *buf)
+static ssize_t
+show_chgmode(struct device *dev, struct device_attribute *attr, char *buf)
{
- struct pcf50633 *pcf = dev_get_drvdata(dev);
+ struct pcf50633_mbc *mbc = dev_get_drvdata(dev);
- u8 mbcs2 = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
+ u8 mbcs2 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS2);
u8 chgmod = (mbcs2 & PCF50633_MBCS2_MBC_MASK);
- return sprintf(buf, "%s %d\n", chgmode_names[chgmod], chgmod);
+ return sprintf(buf, "%d\n", chgmod);
}
-static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, NULL);
+static DEVICE_ATTR(chgmode, S_IRUGO, show_chgmode, NULL);
-static ssize_t show_usblim(struct device *dev, struct device_attribute *attr,
- char *buf)
+static ssize_t
+show_usblim(struct device *dev, struct device_attribute *attr, char *buf)
{
- struct pcf50633 *pcf = dev_get_drvdata(dev);
- u8 usblim = pcf50633_reg_read(pcf, PCF50633_REG_MBCC7) &
+ struct pcf50633_mbc *mbc = dev_get_drvdata(dev);
+ u8 usblim = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC7) &
PCF50633_MBCC7_USB_MASK;
unsigned int ma;
@@ -113,34 +146,34 @@ static ssize_t show_usblim(struct device *dev, struct device_attribute *attr,
return sprintf(buf, "%u\n", ma);
}
-static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, NULL);
-static ssize_t force_usb_limit_dangerous(struct device *dev,
- struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_usblim(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
{
- struct pcf50633 *pcf = dev_get_drvdata(dev);
+ struct pcf50633_mbc *mbc = dev_get_drvdata(dev);
unsigned long ma;
+ int ret;
- strict_strtoul(buf, 10, &ma);
+ ret = strict_strtoul(buf, 10, &ma);
+ if (ret)
+ return -EINVAL;
- pcf50633_mbc_usb_curlim_set(pcf, ma);
+ pcf50633_mbc_usb_curlim_set(mbc->pcf, ma);
return count;
}
-static DEVICE_ATTR(force_usb_limit_dangerous, 0600,
- NULL, force_usb_limit_dangerous);
+static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, set_usblim);
-static struct attribute *mbc_sysfs_entries[] = {
+static struct attribute *pcf50633_mbc_sysfs_entries[] = {
&dev_attr_chgmode.attr,
&dev_attr_usb_curlim.attr,
- &dev_attr_force_usb_limit_dangerous.attr,
NULL,
};
static struct attribute_group mbc_attr_group = {
.name = NULL, /* put in device directory */
- .attrs = mbc_sysfs_entries,
+ .attrs = pcf50633_mbc_sysfs_entries,
};
/* MBC state machine switches into charging mode when the battery voltage
@@ -181,14 +214,12 @@ static void pcf50633_mbc_charging_restart(struct work_struct *work)
static void pcf50633_mbc_irq_handler(struct pcf50633 *pcf, int irq, void *data)
{
- struct pcf50633_mbc *mbc;
-
- mbc = &pcf->mbc;
+ struct pcf50633_mbc *mbc = data;
/* USB */
- if (irq == PCF50633_IRQ_USBINS)
+ if (irq == PCF50633_IRQ_USBINS) {
mbc->usb_online = 1;
- else if (irq == PCF50633_IRQ_USBREM) {
+ } else if (irq == PCF50633_IRQ_USBREM) {
mbc->usb_online = 0;
mbc->usb_active = 0;
pcf50633_mbc_usb_curlim_set(pcf, 0);
@@ -197,8 +228,8 @@ static void pcf50633_mbc_irq_handler(struct pcf50633 *pcf, int irq, void *data)
/* Adapter */
if (irq == PCF50633_IRQ_ADPINS) {
- pcf->mbc.adapter_online = 1;
- pcf->mbc.adapter_active = 1;
+ mbc->adapter_online = 1;
+ mbc->adapter_active = 1;
} else if (irq == PCF50633_IRQ_ADPREM) {
mbc->adapter_online = 0;
mbc->adapter_active = 0;
@@ -218,16 +249,16 @@ static void pcf50633_mbc_irq_handler(struct pcf50633 *pcf, int irq, void *data)
power_supply_changed(&mbc->usb);
power_supply_changed(&mbc->adapter);
- if (pcf->pdata->mbc_event_callback)
- pcf->pdata->mbc_event_callback(pcf, irq);
+ if (mbc->pcf->pdata->mbc_event_callback)
+ mbc->pcf->pdata->mbc_event_callback(mbc->pcf, irq);
}
static int adapter_get_property(struct power_supply *psy,
enum power_supply_property psp,
union power_supply_propval *val)
{
- int ret = 0;
struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, usb);
+ int ret = 0;
switch (psp) {
case POWER_SUPPLY_PROP_ONLINE:
@@ -244,8 +275,8 @@ static int usb_get_property(struct power_supply *psy,
enum power_supply_property psp,
union power_supply_propval *val)
{
- int ret = 0;
struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, usb);
+ int ret = 0;
struct pcf50633 *pcf = container_of(mbc, struct pcf50633, mbc);
u8 usblim = pcf50633_reg_read(pcf, PCF50633_REG_MBCC7) &
@@ -288,59 +319,57 @@ static enum power_supply_property power_props[] = {
POWER_SUPPLY_PROP_ONLINE,
};
-int __init pcf50633_mbc_probe(struct platform_device *pdev)
+static const u8 mbc_irq_handlers[] = {
+ PCF50633_IRQ_ADPINS,
+ PCF50633_IRQ_ADPREM,
+ PCF50633_IRQ_USBINS,
+ PCF50633_IRQ_USBREM,
+ PCF50633_IRQ_BATFULL,
+ PCF50633_IRQ_CHGHALT,
+ PCF50633_IRQ_THLIMON,
+ PCF50633_IRQ_THLIMOFF,
+ PCF50633_IRQ_USBLIMON,
+ PCF50633_IRQ_USBLIMOFF,
+ PCF50633_IRQ_LOWSYS,
+ PCF50633_IRQ_LOWBAT,
+};
+
+static int __devinit pcf50633_mbc_probe(struct platform_device *pdev)
{
- struct pcf50633 *pcf;
struct pcf50633_mbc *mbc;
+ struct pcf50633_subdev_pdata *pdata = pdev->dev.platform_data;
int ret;
u8 mbcs1;
+ int i;
+
+ mbc = kzalloc(sizeof(*mbc), GFP_KERNEL);
+ if (!mbc)
+ return -ENOMEM;
- pcf = platform_get_drvdata(pdev);
- mbc = &pcf->mbc;
+ platform_set_drvdata(pdev, mbc);
+ mbc->pcf = pdata->pcf;
/* Set up IRQ handlers */
- pcf->irq_handler[PCF50633_IRQ_ADPINS].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_ADPREM].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_USBINS].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_USBREM].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_BATFULL].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_CHGHALT].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_THLIMON].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_THLIMOFF].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_USBLIMON].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_USBLIMOFF].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_LOWSYS].handler =
- pcf50633_mbc_irq_handler;
- pcf->irq_handler[PCF50633_IRQ_LOWBAT].handler =
- pcf50633_mbc_irq_handler;
+ for (i = 0; i < ARRAY_SIZE(mbc_irq_handlers); i++)
+ pcf50633_register_irq(mbc->pcf, mbc_irq_handlers[i],
+ pcf50633_mbc_irq_handler, mbc);
/* Create power supplies */
-
mbc->adapter.name = "adapter";
mbc->adapter.type = POWER_SUPPLY_TYPE_MAINS;
mbc->adapter.properties = power_props;
mbc->adapter.num_properties = ARRAY_SIZE(power_props);
mbc->adapter.get_property = &adapter_get_property;
- mbc->adapter.supplied_to = pcf->pdata->batteries;
- mbc->adapter.num_supplicants = pcf->pdata->num_batteries;
+ mbc->adapter.supplied_to = mbc->pcf->pdata->batteries;
+ mbc->adapter.num_supplicants = mbc->pcf->pdata->num_batteries;
mbc->usb.name = "usb";
mbc->usb.type = POWER_SUPPLY_TYPE_USB;
mbc->usb.properties = power_props;
mbc->usb.num_properties = ARRAY_SIZE(power_props);
mbc->usb.get_property = usb_get_property;
- mbc->usb.supplied_to = pcf->pdata->batteries;
- mbc->usb.num_supplicants = pcf->pdata->num_batteries;
+ mbc->usb.supplied_to = mbc->pcf->pdata->batteries;
+ mbc->usb.num_supplicants = mbc->pcf->pdata->num_batteries;
mbc->ac.name = "ac";
mbc->ac.type = POWER_SUPPLY_TYPE_MAINS;
@@ -354,16 +383,25 @@ int __init pcf50633_mbc_probe(struct platform_device *pdev)
pcf50633_mbc_charging_restart);
ret = power_supply_register(&pdev->dev, &mbc->adapter);
- if (ret)
- dev_err(pcf->dev, "failed to register adapter\n");
+ if (ret) {
+ dev_err(mbc->pcf->dev, "failed to register adapter\n");
+ kfree(mbc);
+ return ret;
+ }
ret = power_supply_register(&pdev->dev, &mbc->usb);
- if (ret)
- dev_err(pcf->dev, "failed to register usb\n");
+ if (ret) {
+ dev_err(mbc->pcf->dev, "failed to register usb\n");
+ power_supply_unregister(&mbc->adapter);
+ kfree(mbc);
+ return ret;
+ }
- ret = power_supply_register(&pdev->dev, &mbc->ac);
- if (ret)
- dev_err(pcf->dev, "failed to register ac\n");
+ mbcs1 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS1);
+ if (mbcs1 & PCF50633_MBCS1_USBPRES)
+ pcf50633_mbc_irq_handler(PCF50633_IRQ_USBINS, mbc);
+ if (mbcs1 & PCF50633_MBCS1_ADAPTPRES)
+ pcf50633_mbc_irq_handler(PCF50633_IRQ_ADPINS, mbc);
mbcs1 = pcf50633_reg_read(pcf, PCF50633_REG_MBCS1);
if (mbcs1 & 0x01)
@@ -382,14 +420,22 @@ int __init pcf50633_mbc_probe(struct platform_device *pdev)
static int __devexit pcf50633_mbc_remove(struct platform_device *pdev)
{
- struct pcf50633 *pcf;
+ struct pcf50633_mbc *mbc = platform_get_drvdata(pdev);
+ int i;
+
+ /* Remove IRQ handlers */
+ for (i = 0; i < ARRAY_SIZE(mbc_irq_handlers); i++)
+ pcf50633_free_irq(mbc->pcf, mbc_irq_handlers[i]);
+
+ power_supply_unregister(&mbc->usb);
+ power_supply_unregister(&mbc->adapter);
- pcf = platform_get_drvdata(pdev);
+ kfree(mbc);
return 0;
}
-struct platform_driver pcf50633_mbc_driver = {
+static struct platform_driver pcf50633_mbc_driver = {
.driver = {
.name = "pcf50633-mbc",
},
@@ -399,13 +445,13 @@ struct platform_driver pcf50633_mbc_driver = {
static int __init pcf50633_mbc_init(void)
{
- return platform_driver_register(&pcf50633_mbc_driver);
+ return platform_driver_register(&pcf50633_mbc_driver);
}
module_init(pcf50633_mbc_init);
static void __exit pcf50633_mbc_exit(void)
{
- platform_driver_unregister(&pcf50633_mbc_driver);
+ platform_driver_unregister(&pcf50633_mbc_driver);
}
module_exit(pcf50633_mbc_exit);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 09:24:37 +0000