From patchwork Tue Oct 30 16:57:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=C5=81ukasz_Majewski?= X-Patchwork-Id: 195556 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 4CE8E2C007F for ; Wed, 31 Oct 2012 04:03:39 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 73E7F4A4ED; Tue, 30 Oct 2012 18:01:01 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ACUEIeIJ5xB1; Tue, 30 Oct 2012 18:01:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AD87B4A349; Tue, 30 Oct 2012 17:59:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5DDDF4A316 for ; Tue, 30 Oct 2012 17:59:31 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wrCTBmLStm0M for ; Tue, 30 Oct 2012 17:59:29 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by theia.denx.de (Postfix) with ESMTP id CD2DD4A252 for ; Tue, 30 Oct 2012 17:58:34 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MCP00E6JTRI7J70@mailout2.samsung.com> for u-boot@lists.denx.de; Wed, 31 Oct 2012 01:58:33 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-c6-509007396946 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B4.D2.12699.93700905; Wed, 31 Oct 2012 01:58:33 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MCP009BOTRPFA00@mmp2.samsung.com> for u-boot@lists.denx.de; Wed, 31 Oct 2012 01:58:33 +0900 (KST) From: Lukasz Majewski To: u-boot@lists.denx.de Date: Tue, 30 Oct 2012 17:57:13 +0100 Message-id: <1351616239-21079-19-git-send-email-l.majewski@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1351616239-21079-1-git-send-email-l.majewski@samsung.com> References: <1351616239-21079-1-git-send-email-l.majewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMJMWRmVeSWpSXmKPExsVy+t9jQV1L9gkBBoc/cFu83dvJ7sDocfbO DsYAxigum5TUnMyy1CJ9uwSujD1zm9gK1otU3OxcxtLAuEugi5GTQ0LAROLe9uNMELaYxIV7 69m6GLk4hASmM0q8v/KWBcJZzCRxffkxFpAqNgE9ic93n4J1iAhISPzqv8oIUsQssINRovnk WTaQhLBAmMSpLU/AGlgEVCUutC4Ei/MKuEv8WvKNEWKdvMTT+31AcQ4OTqD4ttX5IGEhATeJ 19+vsU9g5F3AyLCKUTS1ILmgOCk910ivODG3uDQvXS85P3cTI9jrz6R3MK5qsDjEKMDBqMTD a/CvP0CINbGsuDL3EKMEB7OSCO+S30Ah3pTEyqrUovz4otKc1OJDjNIcLErivM0eKQFCAumJ JanZqakFqUUwWSYOTqkGxrA17poOPRl5KdMFQy4c7ggUyK6fesKXcYYVh1eOkwL/D4UpJ3SC Z31dmBgpwnFiwRkF63f6hxq59ybsNu12Zbu47Jxe68y8LQxvWQNdH9b/MX/4+/TLhYJ1Fwxu 9d08sSRv3qX3R4TnnenWmb/gxz7PU+WfTuwuCf3wcqGn1oZTU+1aHmdFaiixFGckGmoxFxUn AgCv9ipu9gEAAA== Cc: Tom Rini , Kyungmin Park Subject: [U-Boot] [PATCH v4 18/24] pmic:max8997: Support for MAX8997 internal charger control X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Support for MAX8997 built-in charger. Signed-off-by: Lukasz Majewski Signed-off-by: Kyungmin Park Cc: Stefano Babic --- Changes for v2: - power_init_battery() method added to be called from MAX8997 struct pmic instance Changes for v3: - change code according to struct pmic redesign Changes for v4: - None --- drivers/power/pmic/pmic_max8997.c | 59 ++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/drivers/power/pmic/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c index 47ef7f6..0603d94 100644 --- a/drivers/power/pmic/pmic_max8997.c +++ b/drivers/power/pmic/pmic_max8997.c @@ -42,12 +42,68 @@ unsigned char max8997_reg_ldo(int uV) return ret; } +static int pmic_charger_state(struct pmic *p, int state, int current) +{ + unsigned char fc; + u32 val = 0; + + if (pmic_probe(p)) + return -1; + + if (state == CHARGER_DISABLE) { + puts("Disable the charger.\n"); + pmic_reg_read(p, MAX8997_REG_MBCCTRL2, &val); + val &= ~(MBCHOSTEN | VCHGR_FC); + pmic_reg_write(p, MAX8997_REG_MBCCTRL2, val); + + return -1; + } + + if (current < CHARGER_MIN_CURRENT || current > CHARGER_MAX_CURRENT) { + printf("%s: Wrong charge current: %d [mA]\n", + __func__, current); + return -1; + } + + fc = (current - CHARGER_MIN_CURRENT) / CHARGER_CURRENT_RESOLUTION; + fc = fc & 0xf; /* up to 950 mA */ + + printf("Enable the charger @ %d [mA]\n", fc * CHARGER_CURRENT_RESOLUTION + + CHARGER_MIN_CURRENT); + + val = fc | MBCICHFCSET; + pmic_reg_write(p, MAX8997_REG_MBCCTRL4, val); + + pmic_reg_read(p, MAX8997_REG_MBCCTRL2, &val); + val = MBCHOSTEN | VCHGR_FC; /* enable charger & fast charge */ + pmic_reg_write(p, MAX8997_REG_MBCCTRL2, val); + + return 0; +} + +static int pmic_charger_bat_present(struct pmic *p) +{ + u32 val; + + if (pmic_probe(p)) + return -1; + + pmic_reg_read(p, MAX8997_REG_STATUS4, &val); + + return !(val & DETBAT); +} + +static struct power_chrg power_chrg_pmic_ops = { + .chrg_bat_present = pmic_charger_bat_present, + .chrg_state = pmic_charger_state, +}; + int pmic_init(unsigned char bus) { struct pmic *p = pmic_alloc(); static const char name[] = "MAX8997_PMIC"; - puts("Board PMIC init\n"); + debug("Board PMIC init\n"); p->name = name; p->interface = PMIC_I2C; @@ -56,5 +112,6 @@ int pmic_init(unsigned char bus) p->hw.i2c.tx_num = 1; p->bus = bus; + p->chrg = &power_chrg_pmic_ops; return 0; }