From patchwork Sat Sep 28 18:21:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2958631 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 50BD7BFF0B for ; Sat, 28 Sep 2013 18:23:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78D4A2027D for ; Sat, 28 Sep 2013 18:23:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A118020214 for ; Sat, 28 Sep 2013 18:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755083Ab3I1SXM (ORCPT ); Sat, 28 Sep 2013 14:23:12 -0400 Received: from mail-ee0-f41.google.com ([74.125.83.41]:49090 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753233Ab3I1SWM (ORCPT ); Sat, 28 Sep 2013 14:22:12 -0400 Received: by mail-ee0-f41.google.com with SMTP id d17so1843534eek.0 for ; Sat, 28 Sep 2013 11:22:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kzYpJmMYDYKr6Cs1f8OOgkbuQNAJDSB0aZKHNniu1U0=; b=W639+g2JbnxUJNymCITrqthb9GJge90oHMmWSnEOPCck7zdTNlxggQQiJI4bx4F00w dxzD5VmHP3Mqkj0mAbG+rd3r56V1IrgP3eiSj72FTu0CG4Xss8GZlv84TLzCnKr5YWkL 8CU5lTbri66toFSXiuoh/c50+JVEInRSLy5FbknwzuNsWbRnhiKQLAE2S0im8K+kt7dh rpD0hZYYyAI6LITIE9XynLKX9Xo69X7XlJU5Ks2x4CJ/1hBbW1TKe+6jDuLW7fO8Mef7 vuaj6rN1vWH4CtSY8otYBYqqXh8YKDr35VsjO8kGv9lufAeWZpa1p/5zG2p79M1ZnRMY D+ww== X-Received: by 10.15.42.70 with SMTP id t46mr136359eev.58.1380392530681; Sat, 28 Sep 2013 11:22:10 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id f49sm30405339eec.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 28 Sep 2013 11:22:10 -0700 (PDT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-media@vger.kernel.org, alsa-devel@alsa-project.org, Kukjin Kim , Arnd Bergmann , Olof Johansson , Russell King - ARM Linux , Ben Dooks , Linus Walleij , Mauro Carvalho Chehab , Sangbeom Kim , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Sylwester Nawrocki , Geert Uytterhoeven , Martin Schwidefsky , Tomasz Figa Subject: [PATCH 2/5] gpio: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support Date: Sat, 28 Sep 2013 20:21:34 +0200 Message-Id: <1380392497-27406-2-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1380392497-27406-1-git-send-email-tomasz.figa@gmail.com> References: <1380392497-27406-1-git-send-email-tomasz.figa@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the gpio-samsung driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX. Signed-off-by: Tomasz Figa Acked-by: Linus Walleij --- drivers/gpio/gpio-samsung.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 29b5d67..76e02b9 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -1033,7 +1033,7 @@ static int s3c24xx_gpiolib_fbank_to_irq(struct gpio_chip *chip, unsigned offset) } #endif -#ifdef CONFIG_PLAT_S3C64XX +#ifdef CONFIG_ARCH_S3C64XX static int s3c64xx_gpiolib_mbank_to_irq(struct gpio_chip *chip, unsigned pin) { return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO; @@ -1174,7 +1174,7 @@ struct samsung_gpio_chip s3c24xx_gpios[] = { */ static struct samsung_gpio_chip s3c64xx_gpios_4bit[] = { -#ifdef CONFIG_PLAT_S3C64XX +#ifdef CONFIG_ARCH_S3C64XX { .chip = { .base = S3C64XX_GPA(0), @@ -1227,7 +1227,7 @@ static struct samsung_gpio_chip s3c64xx_gpios_4bit[] = { }; static struct samsung_gpio_chip s3c64xx_gpios_4bit2[] = { -#ifdef CONFIG_PLAT_S3C64XX +#ifdef CONFIG_ARCH_S3C64XX { .base = S3C64XX_GPH_BASE + 0x4, .chip = { @@ -1257,7 +1257,7 @@ static struct samsung_gpio_chip s3c64xx_gpios_4bit2[] = { }; static struct samsung_gpio_chip s3c64xx_gpios_2bit[] = { -#ifdef CONFIG_PLAT_S3C64XX +#ifdef CONFIG_ARCH_S3C64XX { .base = S3C64XX_GPF_BASE, .config = &samsung_gpio_cfgs[6],