From patchwork Thu Mar 28 16:11:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15733 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 6312C23E10 for ; Thu, 28 Mar 2013 16:12:18 +0000 (UTC) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by fiordland.canonical.com (Postfix) with ESMTP id 21A3BA18890 for ; Thu, 28 Mar 2013 16:12:18 +0000 (UTC) Received: by mail-ve0-f175.google.com with SMTP id pb11so5162056veb.6 for ; Thu, 28 Mar 2013 09:12:17 -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=bqET3YkvX8I0OE8E++OzKU0z2GNWG5qPLYpmA8YNhSk=; b=V+yAulpbukePI0AKEtWqEbH9SPBL1cPYGoDL+c0jdWfQMb2fvx6uUE//eDaD4FtLQo hVaCHx8D1I1BnEYcmCXpDp5ZCSqBQ1Gxpez05wyfjI7j5spHfyKqcUuuDLkkULAnkfz4 /XTPM9HmtcKAEZZEdbUkwzX02yj5bNvP3Y53bwpyjgz9PptMBUBLHlHqSKJm5+2OnM7b Fx7LiVJyRsMBQ0/3mpMN19XCuSjamti8NsR5Tnsj3bpP9o3t1UAKbsFoWmi2RbVNhuJT UXOxNKVvqPKF3VC5dJ5SENWfg2TKUV227ZnoMK3CzyYv8aoclzHliFjg1VHnHU6zep1B sGfQ== X-Received: by 10.52.93.20 with SMTP id cq20mr23714571vdb.38.1364487137681; Thu, 28 Mar 2013 09:12:17 -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.59.4.204 with SMTP id cg12csp22407ved; Thu, 28 Mar 2013 09:12:17 -0700 (PDT) X-Received: by 10.180.77.9 with SMTP id o9mr17547632wiw.16.1364487136603; Thu, 28 Mar 2013 09:12:16 -0700 (PDT) Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by mx.google.com with ESMTPS id j17si4310190wiv.119.2013.03.28.09.12.16 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Mar 2013 09:12:16 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.53 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.53; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.53 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-f53.google.com with SMTP id c11so1713189wgh.20 for ; Thu, 28 Mar 2013 09:12:16 -0700 (PDT) X-Received: by 10.180.84.162 with SMTP id a2mr17306233wiz.14.1364487136190; Thu, 28 Mar 2013 09:12:16 -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 o5sm16765926wix.3.2013.03.28.09.12.14 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Mar 2013 09:12:15 -0700 (PDT) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Bengt Jonsson , Lee Jones Subject: [PATCH 13/33] regulator: ab8500-ext: Add support for AB8505/AB9540 Date: Thu, 28 Mar 2013 16:11:13 +0000 Message-Id: <1364487093-19551-14-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364487093-19551-1-git-send-email-lee.jones@linaro.org> References: <1364487093-19551-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnACD8868Abs9QCRQ5wNm3/2GtP7warB6td2blFompds9B7GbfMukyPhfHwq9rmFyHM5Da5 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 95fe706..c73d544 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -385,7 +385,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 */