From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/18] power: ab8500_bm: Adds support for Car/Travel Adapters
Date: Fri, 11 Jan 2013 13:12:58 +0000 [thread overview]
Message-ID: <1357909986-9262-11-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1357909986-9262-1-git-send-email-lee.jones@linaro.org>
From: Hakan Berg <hakan.berg@stericsson.com>
The Travel and Carkit adapter should be handled directly by
the charger driver.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Marcus Cooper <marcus.xm.cooper@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
---
drivers/power/ab8500_charger.c | 92 +++++++++++++++++++++++++---------
include/linux/mfd/abx500/ab8500-bm.h | 1 +
2 files changed, 69 insertions(+), 24 deletions(-)
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 919d156..ff18617 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -108,6 +108,18 @@ enum ab8500_charger_link_status {
USB_STAT_HM_IDGND,
USB_STAT_RESERVED,
USB_STAT_NOT_VALID_LINK,
+ USB_STAT_PHY_EN,
+ USB_STAT_SUP_NO_IDGND_VBUS,
+ USB_STAT_SUP_IDGND_VBUS,
+ USB_STAT_CHARGER_LINE_1,
+ USB_STAT_CARKIT_1,
+ USB_STAT_CARKIT_2,
+ USB_STAT_ACA_DOCK_CHARGER,
+ USB_STAT_SAMSUNG_USB_PHY_DIS,
+ USB_STAT_SAMSUNG_USB_PHY_ENA,
+ USB_STAT_SAMSUNG_UART_PHY_DIS,
+ USB_STAT_SAMSUNG_UART_PHY_ENA,
+ USB_STAT_MOTOROLA_USB_PHY_ENA,
};
enum ab8500_usb_state {
@@ -586,7 +598,7 @@ static int ab8500_charger_detect_chargers(struct ab8500_charger *di)
* Returns error code in case of failure else 0 on success
*/
static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
- enum ab8500_charger_link_status link_status)
+ enum ab8500_charger_link_status link_status)
{
int ret = 0;
@@ -595,15 +607,19 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
case USB_STAT_STD_HOST_C_NS:
case USB_STAT_STD_HOST_C_S:
dev_dbg(di->dev, "USB Type - Standard host is "
- "detected through USB driver\n");
+ "detected through USB driver\n");
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_0P09;
break;
case USB_STAT_HOST_CHG_HS_CHIRP:
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_0P5;
+ dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d", link_status,
+ di->max_usb_in_curr);
break;
case USB_STAT_HOST_CHG_HS:
case USB_STAT_ACA_RID_C_HS:
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_0P9;
+ dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d", link_status,
+ di->max_usb_in_curr);
break;
case USB_STAT_ACA_RID_A:
/*
@@ -611,6 +627,8 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
* can consume (300mA). Closest level is 1100mA
*/
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_1P1;
+ dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d", link_status,
+ di->max_usb_in_curr);
break;
case USB_STAT_ACA_RID_B:
/*
@@ -618,34 +636,50 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
* 100mA for potential accessory). Closest level is 1300mA
*/
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_1P3;
+ dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d", link_status,
+ di->max_usb_in_curr);
break;
- case USB_STAT_DEDICATED_CHG:
case USB_STAT_HOST_CHG_NM:
- case USB_STAT_ACA_RID_C_HS_CHIRP:
+ case USB_STAT_DEDICATED_CHG:
case USB_STAT_ACA_RID_C_NM:
+ case USB_STAT_ACA_RID_C_HS_CHIRP:
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_1P5;
- break;
- case USB_STAT_RESERVED:
- /*
- * This state is used to indicate that VBUS has dropped below
- * the detection level 4 times in a row. This is due to the
- * charger output current is set to high making the charger
- * voltage collapse. This have to be propagated through to
- * chargalg. This is done using the property
- * POWER_SUPPLY_PROP_CURRENT_AVG = 1
- */
- di->flags.vbus_collapse = true;
- dev_dbg(di->dev, "USB Type - USB_STAT_RESERVED "
- "VBUS has collapsed\n");
- ret = -1;
+ dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d", link_status,
+ di->max_usb_in_curr);
break;
case USB_STAT_HM_IDGND:
- case USB_STAT_NOT_CONFIGURED:
case USB_STAT_NOT_VALID_LINK:
+ case USB_STAT_NOT_CONFIGURED:
dev_err(di->dev, "USB Type - Charging not allowed\n");
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_0P05;
ret = -ENXIO;
break;
+ case USB_STAT_RESERVED:
+ if (is_ab8500(di->parent)) {
+ di->flags.vbus_collapse = true;
+ dev_err(di->dev, "USB Type - USB_STAT_RESERVED "
+ "VBUS has collapsed\n");
+ ret = -ENXIO;
+ break;
+ }
+ if (is_ab9540(di->parent) || is_ab8505(di->parent)) {
+ dev_dbg(di->dev, "USB Type - Charging not allowed\n");
+ di->max_usb_in_curr = USB_CH_IP_CUR_LVL_0P05;
+ dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d",
+ link_status, di->max_usb_in_curr);
+ ret = -ENXIO;
+ break;
+ }
+ break;
+ case USB_STAT_CARKIT_1:
+ case USB_STAT_CARKIT_2:
+ case USB_STAT_ACA_DOCK_CHARGER:
+ case USB_STAT_CHARGER_LINE_1:
+ di->max_usb_in_curr = USB_CH_IP_CUR_LVL_0P5;
+ dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d", link_status,
+ di->max_usb_in_curr);
+ break;
+
default:
dev_err(di->dev, "USB Type - Unknown\n");
di->max_usb_in_curr = USB_CH_IP_CUR_LVL_0P05;
@@ -677,8 +711,14 @@ static int ab8500_charger_read_usb_type(struct ab8500_charger *di)
dev_err(di->dev, "%s ab8500 read failed\n", __func__);
return ret;
}
- ret = abx500_get_register_interruptible(di->dev, AB8500_USB,
- AB8500_USB_LINE_STAT_REG, &val);
+ if (is_ab8500(di->parent)) {
+ ret = abx500_get_register_interruptible(di->dev, AB8500_USB,
+ AB8500_USB_LINE_STAT_REG, &val);
+ } else {
+ if (is_ab9540(di->parent) || is_ab8505(di->parent))
+ ret = abx500_get_register_interruptible(di->dev,
+ AB8500_USB, AB8500_USB_LINK1_STAT_REG, &val);
+ }
if (ret < 0) {
dev_err(di->dev, "%s ab8500 read failed\n", __func__);
return ret;
@@ -718,8 +758,13 @@ static int ab8500_charger_detect_usb_type(struct ab8500_charger *di)
dev_err(di->dev, "%s ab8500 read failed\n", __func__);
return ret;
}
- ret = abx500_get_register_interruptible(di->dev, AB8500_USB,
- AB8500_USB_LINE_STAT_REG, &val);
+
+ if (is_ab8500(di->parent))
+ ret = abx500_get_register_interruptible(di->dev,
+ AB8500_USB, AB8500_USB_LINE_STAT_REG, &val);
+ else
+ ret = abx500_get_register_interruptible(di->dev,
+ AB8500_USB, AB8500_USB_LINK1_STAT_REG, &val);
if (ret < 0) {
dev_err(di->dev, "%s ab8500 read failed\n", __func__);
return ret;
@@ -2947,7 +2992,6 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
}
if (charger_status & USB_PW_CONN) {
- dev_dbg(di->dev, "VBUS Detect during startup\n");
di->vbus_detected = true;
di->vbus_detected_start = true;
queue_work(di->charger_wq,
diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h
index fac684a..e2a1e6d 100644
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@ -23,6 +23,7 @@
* Bank : 0x5
*/
#define AB8500_USB_LINE_STAT_REG 0x80
+#define AB8500_USB_LINK1_STAT_REG 0x94
/*
* Charger / status register offfsets
--
1.7.9.5
next prev parent reply other threads:[~2013-01-11 13:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-11 13:12 [PATCH 00/18] AB8500 battery management series upgrade Lee Jones
2013-01-11 13:12 ` [PATCH 01/18] power: ab8500_charger: Rename the power_loss function Lee Jones
2013-01-11 13:12 ` [PATCH 02/18] power: ab8500_bm: Skip first CCEOC irq for instant current Lee Jones
2013-01-11 13:12 ` [PATCH 03/18] power: ab8500_charger: Detect charger removal Lee Jones
2013-01-16 1:36 ` Anton Vorontsov
2013-01-16 8:48 ` Lee Jones
2013-01-11 13:12 ` [PATCH 04/18] power: ab8500_fg: Replace msleep() with usleep_range() for greater accuracy Lee Jones
2013-01-14 17:17 ` Joe Perches
2013-01-15 8:48 ` Lee Jones
2013-01-15 8:59 ` Linus Walleij
2013-01-15 13:23 ` Arnd Bergmann
2013-01-15 13:52 ` Lee Jones
2013-01-15 14:09 ` Lee Jones
2013-01-11 13:12 ` [PATCH 05/18] power: ab8500_charger: Handle gpadc errors Lee Jones
2013-01-11 13:12 ` [PATCH 06/18] power: ab8500_bm: Recharge condition not optimal for battery Lee Jones
2013-01-16 1:44 ` Anton Vorontsov
2013-01-16 8:47 ` Lee Jones
2013-01-11 13:12 ` [PATCH 07/18] power: ab8500_fg: balance IRQ enable Lee Jones
2013-01-11 13:12 ` [PATCH 08/18] power: ab8500_btemp: Allign battery temperature resolution with the framework Lee Jones
2013-01-11 13:12 ` [PATCH 09/18] power: ab8500_btemp: Ignore false btemp low interrupt Lee Jones
2013-01-11 13:12 ` Lee Jones [this message]
2013-01-11 13:12 ` [PATCH 11/18] power: ab8500_fg: Round capacity output Lee Jones
2013-01-11 13:13 ` [PATCH 12/18] power: ab8500_btemp: remove superfluous BTEMP thermal comp Lee Jones
2013-01-11 13:13 ` [PATCH 13/18] power: ab8500_fg: Added support for BATT_OVV Lee Jones
2013-01-11 13:13 ` [PATCH 14/18] power: pm2301: Add pm2301 charger Lee Jones
2013-01-16 1:37 ` Anton Vorontsov
2013-01-11 13:13 ` [PATCH 15/18] power: ab8500_charger: remove unused defines Lee Jones
2013-01-11 13:13 ` [PATCH 16/18] power: ab8500_charger: Adds support for legacy USB chargers Lee Jones
2013-01-11 13:13 ` [PATCH 17/18] Power: ab8500_fg: Overflow in current calculation Lee Jones
2013-01-11 13:13 ` [PATCH 18/18] power: ab8500_fg: Remove pointless round_jiffies() call Lee Jones
2013-01-16 1:48 ` [PATCH 00/18] AB8500 battery management series upgrade Anton Vorontsov
2013-01-16 8:50 ` Lee Jones
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=1357909986-9262-11-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).