From patchwork Mon Feb 4 11:53:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14484 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 BB32523F96 for ; Mon, 4 Feb 2013 11:56:54 +0000 (UTC) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by fiordland.canonical.com (Postfix) with ESMTP id 7B5ABA18477 for ; Mon, 4 Feb 2013 11:56:54 +0000 (UTC) Received: by mail-vc0-f178.google.com with SMTP id m8so3807588vcd.37 for ; Mon, 04 Feb 2013 03:56:54 -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=V5fSmo5j+CYUzbpUgMeLhHRCDiZWSQa63CAAZ0Nh3g1qyJpH6q7WIK+3R6wUkTOX40 PiNSmkumiIVbTilzKWB4gbcO6b9TakyrKMMlm4ClcW0MymGbtnAKchx7oddV9QZC8UPJ z1u2j1k9Dz9yfuJ7tVxG/6o7iIKduSiKH25lwztbAiiDLDOPbzSQ4snQO7sieL/lb/yI jPgjfLWBzdBaAyPUGTzmeDgNsIbC/tzEqpEBiHKgshu7fXgoAmBkxeYlfEWXl5xiVcBk 8P+MIVmjcIbgEsBgR0xYhV7K8vatIXkDDm0jjo6SvnKTLXMLtAKgJgG1KhHrTECmNFY6 LPrA== X-Received: by 10.58.8.82 with SMTP id p18mr17665410vea.54.1359979014029; Mon, 04 Feb 2013 03:56:54 -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 zo8csp83076vec; Mon, 4 Feb 2013 03:56:53 -0800 (PST) X-Received: by 10.180.93.100 with SMTP id ct4mr9776925wib.32.1359979013149; Mon, 04 Feb 2013 03:56:53 -0800 (PST) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mx.google.com with ESMTPS id y6si5708540wjx.247.2013.02.04.03.56.52 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:53 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.52 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.52; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.52 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-f52.google.com with SMTP id 12so4706662wgh.7 for ; Mon, 04 Feb 2013 03:56:52 -0800 (PST) X-Received: by 10.180.86.36 with SMTP id m4mr9923350wiz.5.1359979012750; Mon, 04 Feb 2013 03:56:52 -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 j9sm12937128wia.5.2013.02.04.03.56.50 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:51 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Bengt Jonsson , Lee Jones Subject: [PATCH 35/73] regulator: ab8500-ext: Add support for AB8505/AB9540 Date: Mon, 4 Feb 2013 11:53:50 +0000 Message-Id: <1359978868-28736-36-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> References: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnRTH7dAKKEk5M+q+i794DcTx5xEmNAyP3sTvJch9Sj3oYEmv2Z0FrwmiYRepPwMyx5f/Zf 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 */