From patchwork Mon Feb 4 11:54:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14505 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 2040923F96 for ; Mon, 4 Feb 2013 11:57:40 +0000 (UTC) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by fiordland.canonical.com (Postfix) with ESMTP id CC4D6A1877A for ; Mon, 4 Feb 2013 11:57:39 +0000 (UTC) Received: by mail-ve0-f180.google.com with SMTP id jx10so4533313veb.25 for ; Mon, 04 Feb 2013 03:57:39 -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=8p2PxKaCGDZeoH0kdPw3B2ZMghGIo4xaV8LwrpaGAVo=; b=Rh83rUS8GijxRtz3+EkeKG+LJosUd1+8C2ps3a8w2849/zXonz+33H+NBr3+DWOWUr r4iXSIrWxUaPtAql4QUve8DvNgQeAHskhzXywKLedOoQATG79StcljOaMOkgqxY/K0/y gtAkb6w2uOD5xlMBE90oZSQKS4OP3TIfP/vqGlKyWgWx1dnzGouGjcVN4kBVCIuAB58y oWncIGxP91jjIodtnZv7Vh77NFaLT3Y+olXg6r/KKZY3dPjw0Dn7K6KU9IAkVyk3SaIR 7ZhNxmf2++8aUMeqPzAYgwu0PcVQRZC7jF6RKA2UI7H6x6JGp9qVYSFWxPfNgE7lxQN9 K/vQ== X-Received: by 10.58.48.231 with SMTP id p7mr18055425ven.11.1359979059360; Mon, 04 Feb 2013 03:57:39 -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 zo8csp83117vec; Mon, 4 Feb 2013 03:57:38 -0800 (PST) X-Received: by 10.194.77.13 with SMTP id o13mr34559723wjw.58.1359979057365; Mon, 04 Feb 2013 03:57:37 -0800 (PST) Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by mx.google.com with ESMTPS id u7si3484375wif.2.2013.02.04.03.57.37 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.176 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.176; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.176 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-f176.google.com with SMTP id hm14so2763781wib.15 for ; Mon, 04 Feb 2013 03:57:37 -0800 (PST) X-Received: by 10.194.216.5 with SMTP id om5mr278720wjc.27.1359979056958; Mon, 04 Feb 2013 03:57:36 -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.57.34 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:35 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: "xiaomei.zhang" , Alexandre Torgue , Lee Jones Subject: [PATCH 56/73] regulator: ab8500: Also check for AB8505 based platforms Date: Mon, 4 Feb 2013 11:54:11 +0000 Message-Id: <1359978868-28736-57-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: ALoCoQnHOzF4tQFCk2T4+KLeDKhy9/CJ/vS9L3A5cK0bbOKi6enWgYt97djq8j3zW5msXU1oxHCK From: "xiaomei.zhang" Ensure we initialise AB8505 external supply regulators. Signed-off-by: Alexandre Torgue Signed-off-by: Lee Jones Reviewed-by: Philippe LANGLAIS Tested-by: Xiao Mei ZHANG --- drivers/regulator/ab8500-ext.c | 2 +- drivers/regulator/ab8500.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c index f75d4f7..ce1830f 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -414,7 +414,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) info->cfg = (struct ab8500_ext_regulator_cfg *) pdata->ext_regulator[i].driver_data; - if (is_ab9540(ab8500)) { + if ((is_ab9540(ab8500)) || (is_ab8540(ab8500))) { if (info->desc.id == AB8500_EXT_SUPPLY1) info->desc.ops = &ab9540_ext_regulator_ops; if (info->desc.id == AB8500_EXT_SUPPLY2) { diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index e654f0a..5e959b0 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -2823,6 +2823,9 @@ static int ab8500_regulator_remove(struct platform_device *pdev) } else if (is_ab8505(ab8500)) { regulator_info = ab8505_regulator_info; regulator_info_size = ARRAY_SIZE(ab8505_regulator_info); + } else if (is_ab8540(ab8500)) { + regulator_info = ab8540_regulator_info; + regulator_info_size = ARRAY_SIZE(ab8540_regulator_info); } else { regulator_info = ab8500_regulator_info; regulator_info_size = ARRAY_SIZE(ab8500_regulator_info);