From patchwork Wed Feb 6 10:53:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14603 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 BBC6E2423C for ; Wed, 6 Feb 2013 10:55:24 +0000 (UTC) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by fiordland.canonical.com (Postfix) with ESMTP id 79ECEA187D8 for ; Wed, 6 Feb 2013 10:55:24 +0000 (UTC) Received: by mail-ve0-f177.google.com with SMTP id m1so1017150ves.36 for ; Wed, 06 Feb 2013 02:55:24 -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=yIWF/VaJhFl8nDbKGmat+DRiiS4FI3Xz0nvLX3BwEJA=; b=jKUxTJQpt2TZgL/bU6cfFn7xETgsqcGaYY9248EMOU10IyRtdhN+B9NmrN8ZZTKjmi eZE7WLaWywnyKNOximYBuRwE9E2uT3bbjxoH/cpajqyz26bHdzdZy+ZQQf9xP3U5PNEI rL8d0XOe96NzXM+d+rUo212rpKt4nvDRlcoIAdq01TObg6HXnuGsgHncj4XnxdnOxuy4 htA288u0F5jFhstPCUo8KwzmUYrC2nL6naLo/hIQGTgCm1UtuDNG4EbWiZdz1ZHNqvzq XD43tpf6jGNn2aJFFUJi9DvG/C/qLFFUTjQzGyXpHOlMzuJ7xhZJja/7aDN7QNEqdsTA k+GA== X-Received: by 10.52.21.146 with SMTP id v18mr27869275vde.79.1360148124032; Wed, 06 Feb 2013 02:55:24 -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.58.252.8 with SMTP id zo8csp12970vec; Wed, 6 Feb 2013 02:55:23 -0800 (PST) X-Received: by 10.194.21.70 with SMTP id t6mr48724983wje.42.1360148103119; Wed, 06 Feb 2013 02:55:03 -0800 (PST) Received: from mail-we0-x233.google.com ([2a00:1450:400c:c03::233]) by mx.google.com with ESMTPS id bp2si8555730wjc.71.2013.02.06.02.55.02 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:55:03 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::233 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::233; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::233 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-we0-f179.google.com with SMTP id x43so1006753wey.24 for ; Wed, 06 Feb 2013 02:55:02 -0800 (PST) X-Received: by 10.180.104.196 with SMTP id gg4mr4142926wib.16.1360148102581; Wed, 06 Feb 2013 02:55:02 -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 be1sm2406649wib.10.2013.02.06.02.55.01 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:55:02 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: broonie@opensource.wolfsonmicro.com, linus.walleij@linaro.org, Bengt Jonsson , Lee Jones Subject: [PATCH 25/49] regulator: ab8500-ext: Add support for AB8505/AB9540 Date: Wed, 6 Feb 2013 10:53:47 +0000 Message-Id: <1360148051-7560-26-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> References: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmXnAB4R/VMzwjT2elJ1x147OiHyw+2AYT1RGq6XODbExzqhndOWHMkLqJWqJGCvfStDDws 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 */