From patchwork Fri Feb 15 12:44:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14873 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1158323E2E for ; Fri, 15 Feb 2013 12:46:58 +0000 (UTC) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by fiordland.canonical.com (Postfix) with ESMTP id CB2D5A197C4 for ; Fri, 15 Feb 2013 12:46:57 +0000 (UTC) Received: by mail-ve0-f174.google.com with SMTP id pb11so2915222veb.19 for ; Fri, 15 Feb 2013 04:46:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=t3DkW1pZ45aHOirqEoj5lSNmiXL/cfTwxXOHrdjpVLs=; b=D2OO0GYPUlzn9hQKqyyDGkDg4ciafUTu8pjHFSOR5w4KtLX5UnZUpztXW2PhmuHweV pyiaX9Rhd85OOOL6cipdPdHJPXp+KUs63i4B/hvdL8/9QhXkViu0o7t+eOw9CuECtaG8 aAnE7e3kmjQZ+R7pCUC7PCij5/K2Iv7EJOZbkP6r7PBRHj9Yp8nySMayeje70baUIRhW RbkchesitearZG0Jf/XjQiQb/1La61SNXDETGvomCzjf7ys81MMKjUWzOxMujHsIdDGp FmrUFrPANIPWeJoj1PrtXDy9qVKw+gHdATbAmF3YkdqokzqdFHqzO25yLGdrg38kSec9 +rXA== X-Received: by 10.52.69.74 with SMTP id c10mr2628183vdu.3.1360932417270; Fri, 15 Feb 2013 04:46:57 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.221.4.5 with SMTP id oa5csp10896vcb; Fri, 15 Feb 2013 04:46:51 -0800 (PST) X-Received: by 10.180.105.232 with SMTP id gp8mr5561796wib.33.1360932406010; Fri, 15 Feb 2013 04:46:46 -0800 (PST) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id e6si1048654wix.17.2013.02.15.04.46.45 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:46:46 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f45.google.com with SMTP id dq12so2839154wgb.24 for ; Fri, 15 Feb 2013 04:46:45 -0800 (PST) X-Received: by 10.180.75.110 with SMTP id b14mr5736944wiw.21.1360932405523; Fri, 15 Feb 2013 04:46:45 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id bs6sm5133904wib.4.2013.02.15.04.46.43 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:46:44 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, cbouatmailru@gmail.com, sameo@linux.intel.com, Rabin Vincent , Lee Jones Subject: [PATCH 29/40] ab8500-charger: Run detect workaround only on AB8500 Date: Fri, 15 Feb 2013 12:44:59 +0000 Message-Id: <1360932310-30065-30-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360932310-30065-1-git-send-email-lee.jones@linaro.org> References: <1360932310-30065-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlrVnCXvrJjbT518bKb+ZODsD11jCrIeAU28VrcFErNGwpTS2iW0UERJHMZ6zpZ80dtQ7ca From: Rabin Vincent Only AB8500 has this hardware bug, so these works only need to be run there. Signed-off-by: Rabin Vincent Signed-off-by: Lee Jones Reviewed-by: Marcus COOPER Reviewed-by: Martin SJOBLOM Reviewed-by: Jonas ABERG --- drivers/power/ab8500_charger.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index 64accb2..8530028 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -441,7 +441,8 @@ static void ab8500_charger_set_usb_connected(struct ab8500_charger *di, mutex_lock(&di->charger_attached_mutex); mutex_unlock(&di->charger_attached_mutex); - queue_delayed_work(di->charger_wq, + if (is_ab8500(di->parent)) + queue_delayed_work(di->charger_wq, &di->usb_charger_attached_work, HZ); } else { @@ -2622,7 +2623,9 @@ static irqreturn_t ab8500_charger_mainchplugdet_handler(int irq, void *_di) mutex_lock(&di->charger_attached_mutex); mutex_unlock(&di->charger_attached_mutex); - queue_delayed_work(di->charger_wq, + + if (is_ab8500(di->parent)) + queue_delayed_work(di->charger_wq, &di->ac_charger_attached_work, HZ); return IRQ_HANDLED; @@ -3690,14 +3693,16 @@ static int ab8500_charger_probe(struct platform_device *pdev) ch_stat = ab8500_charger_detect_chargers(di, false); if ((ch_stat & AC_PW_CONN) == AC_PW_CONN) { - queue_delayed_work(di->charger_wq, - &di->ac_charger_attached_work, - HZ); + if (is_ab8500(di->parent)) + queue_delayed_work(di->charger_wq, + &di->ac_charger_attached_work, + HZ); } if ((ch_stat & USB_PW_CONN) == USB_PW_CONN) { - queue_delayed_work(di->charger_wq, - &di->usb_charger_attached_work, - HZ); + if (is_ab8500(di->parent)) + queue_delayed_work(di->charger_wq, + &di->usb_charger_attached_work, + HZ); } mutex_unlock(&di->charger_attached_mutex);