From patchwork Sun Sep 4 09:40:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 1123542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p849fEWb013873 for ; Sun, 4 Sep 2011 09:41:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753059Ab1IDJlH (ORCPT ); Sun, 4 Sep 2011 05:41:07 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:26498 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752965Ab1IDJlG (ORCPT ); Sun, 4 Sep 2011 05:41:06 -0400 Received: from epcpsbgm2.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LQZ006LLS8GR500@mailout2.samsung.com>; Sun, 04 Sep 2011 18:41:04 +0900 (KST) X-AuditID: cbfee61b-b7b7fae000005864-98-4e6347b0dc8b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id A0.73.22628.0B7436E4; Sun, 04 Sep 2011 18:41:04 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LQZ00AR3S8BFE@mmp2.samsung.com>; Sun, 04 Sep 2011 18:41:04 +0900 (KST) Date: Sun, 04 Sep 2011 15:10:44 +0530 From: Thomas Abraham Subject: [PATCH] arm: exynos4: fix incorrect pad configuration for keypad row lines To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, linux-input@vger.kernel.org, linux-arm-kernel@lists.infradead.org Message-id: <1315129244-26489-1-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 Content-transfer-encoding: 7BIT X-Brightmail-Tracker: AAAAAA== Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 04 Sep 2011 09:41:18 +0000 (UTC) The keypad controller requires a external pull-up for all the keypad row lines. Fix the incorrect pad configuration for keypad controller row lines by enabling the pad pull-up for the all row lines of the keypad controller. Signed-off-by: Thomas Abraham --- SMDKV310 board does not have pull-up resistors populated for the keypad row lines (unlike the smdk boards for the previous Samsung SoC's). So the pad pull-up for all keypad row lines should be enabled for smdkv310 board. The default requirement for the keypad controller is to enable the pull-up for all the keypad row lines. If a exynos4 based board has on-board pull-up's populated for keypad row lines, this patch would cause no harm. And in such cases, if internal pad pull-up is to be disabled (to reduce some power consumption), an alternative gpio configuration function can be supplied that does not enable the internal pad pull-up. --- arch/arm/mach-exynos4/setup-keypad.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-exynos4/setup-keypad.c b/arch/arm/mach-exynos4/setup-keypad.c index 1ee0ebf..7862bfb 100644 --- a/arch/arm/mach-exynos4/setup-keypad.c +++ b/arch/arm/mach-exynos4/setup-keypad.c @@ -19,15 +19,16 @@ void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) if (rows > 8) { /* Set all the necessary GPX2 pins: KP_ROW[0~7] */ - s3c_gpio_cfgrange_nopull(EXYNOS4_GPX2(0), 8, S3C_GPIO_SFN(3)); + s3c_gpio_cfgall_range(EXYNOS4_GPX2(0), 8, S3C_GPIO_SFN(3), + S3C_GPIO_PULL_UP); /* Set all the necessary GPX3 pins: KP_ROW[8~] */ - s3c_gpio_cfgrange_nopull(EXYNOS4_GPX3(0), (rows - 8), - S3C_GPIO_SFN(3)); + s3c_gpio_cfgall_range(EXYNOS4_GPX3(0), (rows - 8), + S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); } else { /* Set all the necessary GPX2 pins: KP_ROW[x] */ - s3c_gpio_cfgrange_nopull(EXYNOS4_GPX2(0), rows, - S3C_GPIO_SFN(3)); + s3c_gpio_cfgall_range(EXYNOS4_GPX2(0), rows, S3C_GPIO_SFN(3), + S3C_GPIO_PULL_UP); } /* Set all the necessary GPX1 pins to special-function 3: KP_COL[x] */