From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756112Ab3CUQAy (ORCPT ); Thu, 21 Mar 2013 12:00:54 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:61423 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933977Ab3CUQAr (ORCPT ); Thu, 21 Mar 2013 12:00:47 -0400 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, Bengt Jonsson , Lee Jones Subject: [PATCH 22/46] regulator: ab8500-ext: Add support for AB8505/AB9540 Date: Thu, 21 Mar 2013 15:59:19 +0000 Message-Id: <1363881583-15234-23-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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 */ -- 1.7.10.4