From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752500AbbCVXWl (ORCPT ); Sun, 22 Mar 2015 19:22:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58802 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751980AbbCVXWd (ORCPT ); Sun, 22 Mar 2015 19:22:33 -0400 From: NeilBrown To: Sebastian Reichel Date: Mon, 23 Mar 2015 10:20:29 +1100 Subject: [PATCH 14/14] twl4030_charger: assume a 'charger' can supply maximum current. Cc: NeilBrown , linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, GTA04 owners , inux-pm@vger.kernel.org, Pavel Machek , linux-omap@vger.kernel.org, Lee Jones Message-ID: <20150322232029.23789.35538.stgit@notabene.brown> In-Reply-To: <20150322231635.23789.70149.stgit@notabene.brown> References: <20150322231635.23789.70149.stgit@notabene.brown> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: NeilBrown If it cannot, we will stop pulling more current when voltage drops. Signed-off-by: NeilBrown --- drivers/power/twl4030_charger.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index d0199495dddc..6f0dc971d84d 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c @@ -694,8 +694,10 @@ static void twl4030_bci_usb_work(struct work_struct *data) struct twl4030_bci *bci = container_of(data, struct twl4030_bci, work); switch (bci->event) { - case USB_EVENT_VBUS: case USB_EVENT_CHARGER: + bci->usb_cur = USB_MAX_CURRENT; + /* FALL THROUGH */ + case USB_EVENT_VBUS: case USB_EVENT_ENUMERATED: twl4030_charger_enable_usb(bci, true); break;