From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755684Ab3BDMCQ (ORCPT ); Mon, 4 Feb 2013 07:02:16 -0500 Received: from mail-wi0-f172.google.com ([209.85.212.172]:47248 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755435Ab3BDL5i (ORCPT ); Mon, 4 Feb 2013 06:57:38 -0500 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 1.7.9.5