From patchwork Thu Jun 13 22:45:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 2718861 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 36A229F8E4 for ; Thu, 13 Jun 2013 22:45:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20F0F2030B for ; Thu, 13 Jun 2013 22:45:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 253BD2030A for ; Thu, 13 Jun 2013 22:45:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757717Ab3FMWpe (ORCPT ); Thu, 13 Jun 2013 18:45:34 -0400 Received: from gloria.sntech.de ([95.129.55.99]:54457 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757435Ab3FMWpe (ORCPT ); Thu, 13 Jun 2013 18:45:34 -0400 Received: from 146-52-32-150-dynip.superkabel.de ([146.52.32.150] helo=marty.localnet) by gloria.sntech.de with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1UnGGn-0007wo-87; Fri, 14 Jun 2013 00:45:29 +0200 From: Heiko =?utf-8?q?St=C3=BCbner?= To: Kukjin Kim Subject: [PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options Date: Fri, 14 Jun 2013 00:45:27 +0200 User-Agent: KMail/1.13.7 (Linux/3.2.0-3-686-pae; KDE/4.8.4; i686; ; ) Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Grant Likely , linus.walleij@linaro.org References: <201306140044.15568.heiko@sntech.de> In-Reply-To: <201306140044.15568.heiko@sntech.de> MIME-Version: 1.0 Message-Id: <201306140045.27744.heiko@sntech.de> 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=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 When a pinctrl driver is loaded legacy gpio support has to be disabled. The code checking for the pinctrl presence is contained in an #ifdef checking for the presence of a valid samsung pinctrl driver. There the new PINCTRL_S3C24XX was missing resulting in the check never being run and the gpio being enabled breaking the pinctrl driver. Fix this by adding the missing CONFIG_PINCTRL_S3C24XX Signed-off-by: Heiko Stuebner Acked-by: Linus Walleij --- 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..c84503e 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -2949,7 +2949,8 @@ 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_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440) || \ + defined(CONFIG_PINCTRL_S3C24XX) /* * This gpio driver includes support for device tree support and there * are platforms using it. In order to maintain compatibility with those