From patchwork Sun Jul 8 17:12:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Borleis X-Patchwork-Id: 1169871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 23E5F3FD4F for ; Sun, 8 Jul 2012 17:23:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Snv2k-0001s5-Lx; Sun, 08 Jul 2012 17:13:10 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Snv2A-0001oZ-7H for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 17:12:36 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Snv23-0006yL-Mw for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 19:12:27 +0200 Received: from jbe by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1Snv22-0004Yz-QY for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 19:12:26 +0200 From: Juergen Beisert To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/10] MACH/Samsung/Mini2440: enable button 6 as one of the GPIO keys Date: Sun, 8 Jul 2012 19:12:22 +0200 Message-Id: <1341767544-17447-9-git-send-email-jbe@pengutronix.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1341767544-17447-1-git-send-email-jbe@pengutronix.de> References: <1341767544-17447-1-git-send-email-jbe@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: jbe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org There is no more restriction to omit button 6 Signed-off-by: Juergen Beisert --- arch/arm/mach-s3c24xx/mach-mini2440.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c index 36149ed..ad1d89e 100644 --- a/arch/arm/mach-s3c24xx/mach-mini2440.c +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c @@ -415,16 +415,12 @@ static struct gpio_keys_button mini2440_buttons[] = { .desc = "Button 5", .active_low = 1, }, -#if 0 - /* this pin is also known as TCLK1 and seems to already - * marked as "in use" somehow in the kernel -- possibly wrongly */ { - .gpio = S3C2410_GPG(11), /* K6 */ + .gpio = S3C2410_GPG(11), /* K6 */ .code = KEY_F6, .desc = "Button 6", .active_low = 1, }, -#endif }; static struct gpio_keys_platform_data mini2440_button_data = {