From patchwork Thu Mar 21 15:59:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15507 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 E6B1223E14 for ; Thu, 21 Mar 2013 16:01:11 +0000 (UTC) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by fiordland.canonical.com (Postfix) with ESMTP id 3D445A19E61 for ; Thu, 21 Mar 2013 16:01:11 +0000 (UTC) Received: by mail-ve0-f169.google.com with SMTP id 15so2603438vea.28 for ; Thu, 21 Mar 2013 09:01:10 -0700 (PDT) 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=Mt3gHbpDKpkViz3gY5Knf75KzT3eN/IqiJRPHwwpQfo=; b=f/M8jyvGWqm1/1hoq4LnoazvQGFHv0OBbc9U9RNQpdqIOfMb/MlIeFT9HBIe84RJxa YrdSX4jcOMQuAKrEn5D11B+MHOwPvHhhG7M9Px4eOegoTwN2ixq2LSOhJ6cmJdR4sVJ6 xl8F9qW9x7piAJys5NL1pAPPKWy0YEaYW3apxlwXO4kiY306FYB7ZFOK2+To1ZCBimCH ZGTYMWlvZ2mue8zZEX0dwgKRZJJ9JUInwHnkk0LfnyCSouj136Nk81P5xi9SwFrgnUiI B/pXClMwV7baefFjDyx0NTnBK2CWsz3WE3t9KsvKTZ6/0kEEV4AaguoYB1jVEB378fbb 5rog== X-Received: by 10.52.76.103 with SMTP id j7mr12317556vdw.90.1363881670610; Thu, 21 Mar 2013 09:01:10 -0700 (PDT) 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.233.198 with SMTP id ty6csp66813vec; Thu, 21 Mar 2013 09:01:09 -0700 (PDT) X-Received: by 10.194.20.40 with SMTP id k8mr18373582wje.16.1363881669140; Thu, 21 Mar 2013 09:01:09 -0700 (PDT) Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]) by mx.google.com with ESMTPS id w8si1439307wiz.91.2013.03.21.09.01.08 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:01:09 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22f is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22f; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c05::22f 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-f175.google.com with SMTP id c10so1406018wiw.8 for ; Thu, 21 Mar 2013 09:01:08 -0700 (PDT) X-Received: by 10.194.83.33 with SMTP id n1mr18352269wjy.7.1363881668659; Thu, 21 Mar 2013 09:01:08 -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.01.06 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:01:07 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: arnd@arndb.de, linus.walleij@stericsson.com, "xiaomei.zhang" , Alexandre Torgue , Lee Jones Subject: [PATCH 33/46] regulator: ab8500: Also check for AB8505 based platforms Date: Thu, 21 Mar 2013 15:59:30 +0000 Message-Id: <1363881583-15234-34-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: ALoCoQljlZIYu6JnmbLY6Ir7qTivCOc6ABrfLPK+bpQwdWjNB+GDBOqOcTRotY9pkvYo3SnY3QNe 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 84393a6..c9c594d 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -2842,6 +2842,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);