From patchwork Fri Dec 14 16:19:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 13599 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 E748523FB4 for ; Fri, 14 Dec 2012 16:20:09 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 988BAA195F9 for ; Fri, 14 Dec 2012 16:20:09 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so3226308iag.11 for ; Fri, 14 Dec 2012 08:20:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=aqqd7R0t0hkUe6oTR2FauLdASpHTSYLgqA53EUIxuGk=; b=f47iQk1U7rWOGo9helwoG1jlbn3m7OhKsshwHnVxu6mPf0MUalCyBs7S00IyDSpPT4 0HfhXFZEN3BwgsvY0uYtqFtWSd5Z21oSfRKe4fTvn8w1319Hw8JNiSqybJZ55zDT+8+z POrFyT4TIHLIFS2ArQFsr5pqtamKpkQtpH0rIM0jXS0XVDSTvSRIc/3iMWqc8Q9A8/oI qmk++WhBFmSVgOGO3XviJ4Opjwll3g9OJFqcssJOKoQ1ar60k8IeT3vs6QDixEr7BACA 1eHiyLfi5JDjKxhgSrOljIpcg5kEWNkeKAO/wz3n9nhvPWVPyllAyQ4gc6/TLueBIWLz 0Hcg== Received: by 10.42.73.7 with SMTP id q7mr4316817icj.6.1355502008959; Fri, 14 Dec 2012 08:20:08 -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.50.67.148 with SMTP id n20csp81601igt; Fri, 14 Dec 2012 08:20:08 -0800 (PST) Received: by 10.180.88.138 with SMTP id bg10mr3595615wib.13.1355502008038; Fri, 14 Dec 2012 08:20:08 -0800 (PST) Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by mx.google.com with ESMTPS id ko10si3752312wjb.22.2012.12.14.08.20.07 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 08:20:08 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.47 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.47; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.47 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-f47.google.com with SMTP id dq11so1436650wgb.2 for ; Fri, 14 Dec 2012 08:20:07 -0800 (PST) Received: by 10.180.107.197 with SMTP id he5mr3625337wib.1.1355502007458; Fri, 14 Dec 2012 08:20:07 -0800 (PST) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id u6sm8325248wif.2.2012.12.14.08.20.05 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 08:20:06 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, Michel JAOUEN , Lee Jones Subject: [PATCH 13/21] gpio: ab8500: Use most recent run-time platform checker Date: Fri, 14 Dec 2012 16:19:31 +0000 Message-Id: <1355501979-1157-14-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355501979-1157-1-git-send-email-lee.jones@linaro.org> References: <1355501979-1157-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmOYCJEdlh5g68B8DsHbhlt1tqClogPBXjsTAklW79tgQPNqPDmMYnR0P0HgplXkmc+4fM+ From: Michel JAOUEN Use is_ab9540() instead of cpu_is_u9540() when checking platform. Signed-off-by: Lee Jones Signed-off-by: Michel JAOUEN Reviewed-by: Jonas ABERG --- drivers/gpio/gpio-ab8500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-ab8500.c b/drivers/gpio/gpio-ab8500.c index ef75984..200c605 100644 --- a/drivers/gpio/gpio-ab8500.c +++ b/drivers/gpio/gpio-ab8500.c @@ -483,7 +483,7 @@ static int __devinit ab8500_gpio_probe(struct platform_device *pdev) ab8500_gpio->irq_base = pdata->irq_base; /* Configure GPIO Settings for specific AB devices */ - if (cpu_is_u9540()) { + if (is_ab9540(parent)) { ab8500_gpio->chip.ngpio = AB9540_NUM_GPIO; ab8500_gpio->irq_cluster = ab9540_irq_clusters; ab8500_gpio->irq_cluster_size =