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: 2314831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id CD78C400E6 for ; Thu, 21 Mar 2013 16:22:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIiCv-0002RK-W1; Thu, 21 Mar 2013 16:19:14 +0000 Received: from mail-wg0-f51.google.com ([74.125.82.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIhv7-0001Ft-Pa for linux-arm-kernel@lists.infradead.org; Thu, 21 Mar 2013 16:00:50 +0000 Received: by mail-wg0-f51.google.com with SMTP id 8so2326672wgl.18 for ; Thu, 21 Mar 2013 09:00:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=rT9akHrFF1gAu9Hr2lLvZ4rMkpz0vui72axvzzyDSQw=; b=Ifsbs7/tYZuO580X+WgLiLe/TrhY5+NzvGW5r/Fqhgc3p1MiyKZJ017VF7+BOgkN7/ j0asNmL8bvy+covp0GRse03MixTMdH7dvNFTgN9zVpAlz9mwGpu7E4ZEUvSvaGnbMfL+ IzrjMquKPbVjQ0Ca2xDi0/71OGDXWz4bKkKyTL5US861LcdAU40hjeL3plRyyPcrEM8S XmFHVOD7wmNVIDzG2PIU3tyXO8opXWAqhRLa3hcmD/c7Wo0YqaBME/NlwsToVRGgeYSV JVqH2r3ah8z8wUNH00jtZptRHWAC/QCKG8BQdgmpQztAIyrir+N52HORJJOTP/l6vdzO pJTw== 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 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: ALoCoQmNQw04MY/uyKh4bznSeBlge7jFdgviSbxGi6cVvPONiE2kAfU6kAteKoZOhFZW23Ev2MU9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130321_120049_959737_7197E505 X-CRM114-Status: GOOD ( 12.71 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.51 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, Bengt Jonsson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 */