From patchwork Sat Oct 18 12:52:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 5099941 Return-Path: X-Original-To: patchwork-linux-input@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 E95049F30B for ; Sat, 18 Oct 2014 12:52:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19EED20176 for ; Sat, 18 Oct 2014 12:52:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3875520172 for ; Sat, 18 Oct 2014 12:52:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750996AbaJRMwm (ORCPT ); Sat, 18 Oct 2014 08:52:42 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:55174 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980AbaJRMwm (ORCPT ); Sat, 18 Oct 2014 08:52:42 -0400 Received: by mail-lb0-f182.google.com with SMTP id z11so1919828lbi.13 for ; Sat, 18 Oct 2014 05:52:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NOJbxhUbZHcb6izFC4bEdeJveo+LguIjGGCX6Bc52l8=; b=AoSoRaTrsvXarj1V5g8C4XWOuSKilL0J0o8lqgxmx6do+65qy5a5g93Qcy2ZSHOBRK JklrcijcoGOD3ctHiBJxX7fv0qZI6A5n1UEOhlCWJfFpeHzcs8kmn25f0r32pHCcLj9y +C0ZijKP37xh0OKlfX0U/TeDpYZmHlZzVqptz0V1ELRIvEczKa2RCSoEZ06ZClvXSofJ yOhCG1mePAMYIUb1dKYvgD0wNQGgEi23gKRxoUoLiTj9eJhVnH4TJk4m3DkvdSi0XQkD HBhH6PTfwv8YGEHZl6R61qWLz+tvzRAS7zH/WNZ0+jQSluNpu3AJqx74hwDIzAqVHjSZ GJPw== X-Gm-Message-State: ALoCoQlcG2gtbsVR/uwp+SD4HUJasQluG2sBprQgQh/kiDG4oft6UuQf9zLZYV42evfLnYDuQDbT X-Received: by 10.112.57.227 with SMTP id l3mr14991844lbq.68.1413636760127; Sat, 18 Oct 2014 05:52:40 -0700 (PDT) Received: from localhost.localdomain (c83-254-157-117.bredband.comhem.se. [83.254.157.117]) by mx.google.com with ESMTPSA id pw9sm1318482lbb.2.2014.10.18.05.52.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Oct 2014 05:52:38 -0700 (PDT) From: Linus Walleij To: Dmitry Torokhov , linux-input@vger.kernel.org Cc: Linus Walleij Subject: [PATCH] input: stmpe: fix valid key line bitmask Date: Sat, 18 Oct 2014 14:52:09 +0200 Message-Id: <1413636729-2985-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 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 The bitmask comment says it will enable GPIO 8-14 and 16-20 for keypad use, but it actually enables GPIO 8-11 and 13-20 due to a bit error. Instead of masking of the "hole" at GPIO 12 (which is used for keypad output 4) mask of the proper "hole" at GPIO 15. Signed-off-by: Linus Walleij --- Hi Dmitry, this is for fixes I think. --- drivers/input/keyboard/stmpe-keypad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c index c6727dda68f2..ef5e67fb567e 100644 --- a/drivers/input/keyboard/stmpe-keypad.c +++ b/drivers/input/keyboard/stmpe-keypad.c @@ -86,7 +86,7 @@ static const struct stmpe_keypad_variant stmpe_keypad_variants[] = { .max_cols = 8, .max_rows = 12, .col_gpios = 0x0000ff, /* GPIO 0 - 7*/ - .row_gpios = 0x1fef00, /* GPIO 8-14, 16-20 */ + .row_gpios = 0x1f7f00, /* GPIO 8-14, 16-20 */ }, [STMPE2403] = { .auto_increment = true,