From patchwork Wed Feb 6 10:54:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14617 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 DAF472423C for ; Wed, 6 Feb 2013 10:56:05 +0000 (UTC) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by fiordland.canonical.com (Postfix) with ESMTP id 90D92A18B58 for ; Wed, 6 Feb 2013 10:56:05 +0000 (UTC) Received: by mail-vc0-f170.google.com with SMTP id p16so748340vcq.15 for ; Wed, 06 Feb 2013 02:56:05 -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=FKg0mZO29x/LL856J/l7VShARXTAllNeaTI+71NqHKk=; b=ft8DIOo4iLGIJBMHCZCuoXV1YIzaZmTHW3r+2gMn9+tPuRXsU/zKV3jDVPiwWn54KO 3rXrizF1aZ8fuOhBaIswoGnWvR0bIkya8uV3DlPw7YFEZYKyMMBCup0lKsWgm2Ink1Mz zS1ToE3XF0zOJuXFGdECwMtUBAz4m4c0D3C6zAOP4UOTmyyUZEebFmbsRxkvJmPeN8v9 dMuLVLmxpfLjcpspvqxMWDYWCCiTgbDhYKA6WQ5nVbfdYob/8/gMc9BtfEgiDSa12vMD zIlqN4K6Ube8K2FcfLszD8WlAd+YeHtCR2IsYgNjr9htgymrtJUkJhrrao3NSmhZjRPf ZIgA== X-Received: by 10.52.66.168 with SMTP id g8mr2053188vdt.27.1360148165116; Wed, 06 Feb 2013 02:56:05 -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 zo8csp13008vec; Wed, 6 Feb 2013 02:56:02 -0800 (PST) X-Received: by 10.180.85.8 with SMTP id d8mr4188098wiz.4.1360148115200; Wed, 06 Feb 2013 02:55:15 -0800 (PST) Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]) by mx.google.com with ESMTPS id wp9si8559587wjb.22.2013.02.06.02.55.14 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:55:15 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::22a is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c00::22a; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c00::22a 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-f42.google.com with SMTP id 12so4913900wgh.5 for ; Wed, 06 Feb 2013 02:55:14 -0800 (PST) X-Received: by 10.180.105.195 with SMTP id go3mr3960038wib.13.1360148114776; Wed, 06 Feb 2013 02:55:14 -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.13 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:55:14 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: broonie@opensource.wolfsonmicro.com, linus.walleij@linaro.org, "xiaomei.zhang" , Alexandre Torgue , Lee Jones Subject: [PATCH 38/49] regulator: ab8500: Also check for AB8505 based platforms Date: Wed, 6 Feb 2013 10:54:00 +0000 Message-Id: <1360148051-7560-39-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: ALoCoQmY0TqQ9p0avtlX/s47Rz16ycsz5q6J3DqOi2sCQA31cKR2sNGm4MdkY9BUgaeoDNexYRuY 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 9643bcc..8c9f2ba 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -2836,6 +2836,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);