From patchwork Fri Jun 21 00:35:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2759441 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 D776EC0AB1 for ; Fri, 21 Jun 2013 00:37:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 08BEB20202 for ; Fri, 21 Jun 2013 00:37:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36873201FF for ; Fri, 21 Jun 2013 00:37:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422824Ab3FUAfz (ORCPT ); Thu, 20 Jun 2013 20:35:55 -0400 Received: from mail-ea0-f171.google.com ([209.85.215.171]:48981 "EHLO mail-ea0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965830Ab3FUAfw (ORCPT ); Thu, 20 Jun 2013 20:35:52 -0400 Received: by mail-ea0-f171.google.com with SMTP id m14so4275810eaj.16 for ; Thu, 20 Jun 2013 17:35:49 -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:x-mailer:in-reply-to:references; bh=BPUHVvtb4Crv42IMp32GDdgCBeNEGF1EafeTgHxFI2E=; b=WxmL5hmREih4PvRja/lgWL0399IVf7Ab1zYozE4JNT2yMM69c894moHm7JPFYzm0UT 60VOXYnApDO9YuHNN98o4S103+VaTgCOH1bcAqK5DoAl+0H935eqi6H809hOf5uwAANQ FtIxxqHlzpVI56yaK/tCewltHrbZNUxtRs9PompMB+heh5SWL4s+Ho/ePk3zssNnpJth NmIuy3Kwrq9vy5YqJIpDlG0XVlApHni7+oO5y10gYdqlJo0hFvObr2SdOxq1bwBFnziZ O1RH14X8bi7nEZsfJlMjjgEjXPSrW/uwelnKPVPAdv88K3SHvIoIiS8+S7IPYtE1ZhPE 0xNA== X-Received: by 10.15.102.68 with SMTP id bq44mr10020763eeb.89.1371774949787; Thu, 20 Jun 2013 17:35:49 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id m1sm3910115eex.17.2013.06.20.17.35.47 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Jun 2013 17:35:48 -0700 (PDT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Kukjin Kim , Arnd Bergmann , Olof Johansson , Mark Brown , Rob Herring , Grant Likely , Benoit Cousson , devicetree-discuss@lists.ozlabs.org, Jason Cooper , linux-kernel@vger.kernel.org, Marc Zyngier , Nicolas Pitre , Russell King , Stephen Warren , Thomas Gleixner , Will Deacon , Tomasz Figa Subject: [PATCH v6 3/8] gpio: samsung: Skip legacy GPIO registration if pinctrl-s3c64xx is present Date: Fri, 21 Jun 2013 02:35:19 +0200 Message-Id: <1371774924-9224-4-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1371774924-9224-1-git-send-email-tomasz.figa@gmail.com> References: <1371774924-9224-1-git-send-email-tomasz.figa@gmail.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 The new driver handles GPIO on DT-enabled platforms. Signed-off-by: Tomasz Figa --- drivers/gpio/gpio-samsung.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index a1392f4..8d512b1 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -2949,7 +2949,7 @@ static __init int samsung_gpiolib_init(void) int i, nr_chips; int group = 0; -#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440) +#if defined(CONFIG_PINCTRL_SAMSUNG) || defined(CONFIG_PINCTRL_EXYNOS5440) /* * This gpio driver includes support for device tree support and there * are platforms using it. In order to maintain compatibility with those @@ -2967,6 +2967,7 @@ static __init int samsung_gpiolib_init(void) { .compatible = "samsung,s3c2416-pinctrl", }, { .compatible = "samsung,s3c2440-pinctrl", }, { .compatible = "samsung,s3c2450-pinctrl", }, + { .compatible = "samsung,s3c64xx-pinctrl", }, { .compatible = "samsung,exynos4210-pinctrl", }, { .compatible = "samsung,exynos4x12-pinctrl", }, { .compatible = "samsung,exynos5250-pinctrl", },