From patchwork Thu Mar 21 15:59:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15495 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 ACAB723E77 for ; Thu, 21 Mar 2013 16:00:48 +0000 (UTC) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by fiordland.canonical.com (Postfix) with ESMTP id 200B9A19E76 for ; Thu, 21 Mar 2013 16:00:48 +0000 (UTC) Received: by mail-vc0-f172.google.com with SMTP id hr11so2480489vcb.3 for ; Thu, 21 Mar 2013 09:00:47 -0700 (PDT) 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=rT9akHrFF1gAu9Hr2lLvZ4rMkpz0vui72axvzzyDSQw=; b=O1NVYb0yPBHOua5NfvgLK4spM9ErYOlcQuXBXTFJCd7s4QvNxAn56WqYXlYln4I5gl QHxPCV3PUxT9ZSy3D0BgArpJ8T5Uq8C9FYIn6LTv28FRA9zB+I1FZyYxYpqZGCGJLVqh /9Zib7LQHgq8XdbyUL7KxxbIRhPP+hx61QjaE9oSzBmR540zRr2ql7bUdxcsa+nvsYcR ji5vNY1zGB2qr+kT/brqvo1c7qKhQcTQYI4hDp6b6xNITNkEYe3deNYIVpXJKRvfNndz PFu+UyZyNtMruIIULx+idk3Qw96c71c83OejwF1IRSsg6SWD0+ucfV8XXw7KF6iyYlA1 oZQg== X-Received: by 10.220.225.200 with SMTP id it8mr13979782vcb.39.1363881647647; Thu, 21 Mar 2013 09:00:47 -0700 (PDT) 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.58.233.198 with SMTP id ty6csp66792vec; Thu, 21 Mar 2013 09:00:47 -0700 (PDT) X-Received: by 10.180.72.148 with SMTP id d20mr5798503wiv.31.1363881646660; Thu, 21 Mar 2013 09:00:46 -0700 (PDT) Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]) by mx.google.com with ESMTPS id ce4si805424wib.39.2013.03.21.09.00.46 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:00:46 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22a is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22a; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c05::22a 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-wi0-f170.google.com with SMTP id hm11so7411579wib.3 for ; Thu, 21 Mar 2013 09:00:46 -0700 (PDT) X-Received: by 10.194.82.34 with SMTP id f2mr18274315wjy.25.1363881646265; Thu, 21 Mar 2013 09:00:46 -0700 (PDT) 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 h10sm6110847wic.8.2013.03.21.09.00.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:00:45 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: arnd@arndb.de, linus.walleij@stericsson.com, Bengt Jonsson , Lee Jones Subject: [PATCH 22/46] regulator: ab8500-ext: Add support for AB8505/AB9540 Date: Thu, 21 Mar 2013 15:59:19 +0000 Message-Id: <1363881583-15234-23-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363881583-15234-1-git-send-email-lee.jones@linaro.org> References: <1363881583-15234-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkPDEyWllavpCNbvu6jB6CtJR2UQK1JcggoZ3Zx2xAFBRhsXFyuvUJ5l+mVYVphPATynI9V From: Bengt Jonsson The external regulator driver checks for old AB8500 HW to apply a fix. This patch adds a check to see that it is a AB8500 (not AB8505/AB9540). Signed-off-by: Bengt Jonsson Signed-off-by: Lee Jones --- drivers/regulator/ab8500-ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c index 3af40fd..f3ec867 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -386,7 +386,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) } /* check for AB8500 2.x */ - if (abx500_get_chip_id(&pdev->dev) < 0x30) { + if (is_ab8500_2p0_or_earlier(ab8500)) { struct ab8500_ext_regulator_info *info; /* VextSupply3LPn is inverted on AB8500 2.x */