From patchwork Mon Apr 15 21:14:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2446911 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9AC44DF2E5 for ; Mon, 15 Apr 2013 21:16:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755648Ab3DOVQD (ORCPT ); Mon, 15 Apr 2013 17:16:03 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:45386 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755510Ab3DOVQB (ORCPT ); Mon, 15 Apr 2013 17:16:01 -0400 Received: by mail-ee0-f46.google.com with SMTP id d49so2410514eek.5 for ; Mon, 15 Apr 2013 14:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=O9tkzgFtoJ8zQN0AxcldYkw0Z7YPeYO8ESaaAHw6azg=; b=FTkpqu9BXoG2wwvJZcBvjMiMZv2DAYTR+htfdVCJfL/YJqKv8jOGeCsqw9e/CrlGNw jtkPcIidyCuqjN5c2TY9+6WiUfxMBbddsIKnolyiWboV/sl7NslOcaZ5HlwF1TrPKqZo wfAohLCILwRpVjoiTZaUvfgs92rWbOUX0gtSHsKh3dIVEu6MZ3k0/ZmzWM+GTOadkQz+ 0iVYNzrOaWrkaTYWujNjZoLLqgYqLc4SrFbtWlIVT+8t9sFX7+RR2+7Ho6/sJ2fJbb3n lDXZaCwy+3B5RwLEqlHan3lBrT1QeMSRRGUppF/rG9Rz8Xt84YadYszQeECpPZ4iOR1w iXtg== X-Received: by 10.15.32.67 with SMTP id z43mr64993140eeu.24.1366060560682; Mon, 15 Apr 2013 14:16:00 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPS id a2sm27439737eem.11.2013.04.15.14.15.58 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Apr 2013 14:15:59 -0700 (PDT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, kgene.kim@samsung.com, broonie@opensource.wolfsonmicro.com, kwangwoo.lee@gmail.com, jacmet@sunsite.dk, augulis.darius@gmail.com, mcuelenaere@gmail.com, linux@arm.linux.org.uk, Rob Herring , Mark Rutland , Tomasz Figa Subject: [PATCH v5 3/6] gpio: samsung: Skip legacy GPIO registration if pinctrl-s3c64xx is present Date: Mon, 15 Apr 2013 23:14:40 +0200 Message-Id: <1366060483-20342-4-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1366060483-20342-1-git-send-email-tomasz.figa@gmail.com> References: <1366060483-20342-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 The new driver handles GPIO on DT-enabled platforms. Signed-off-by: Tomasz Figa --- drivers/gpio/gpio-samsung.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 99e0fa4..dc06a6f 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -3012,7 +3012,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 @@ -3026,10 +3026,12 @@ static __init int samsung_gpiolib_init(void) */ struct device_node *pctrl_np; static const struct of_device_id exynos_pinctrl_ids[] = { + { .compatible = "samsung,s3c64xx-pinctrl", }, { .compatible = "samsung,exynos4210-pinctrl", }, { .compatible = "samsung,exynos4x12-pinctrl", }, { .compatible = "samsung,exynos5250-pinctrl", }, { .compatible = "samsung,exynos5440-pinctrl", }, + { }, }; for_each_matching_node(pctrl_np, exynos_pinctrl_ids) if (pctrl_np && of_device_is_available(pctrl_np))