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: 39017 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C391C202DB for ; Sat, 18 Oct 2014 12:52:51 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id d1sf1325239wiv.6 for ; Sat, 18 Oct 2014 05:52:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=BtJonkUqSOFQaQqS5QFfyoQNyB14Z4kbSgLEHcduin0=; b=Vf3jBAgfDgMRoROFnDcig7fH16f3gv4mgUg6wH23rbv520xLuSgtEbCMGb9DmUpcKG z6rhs69YL/dn0xry00ig/9MRa0oDzSBAvivJRcBRyQmfjYgQB8hMD8Qsi6/vrShdmEhC BSQgFqb2SF0vuHv7Yli6xTVF9zeNZIyYvjTudlhwaS5txBHfcQB0LgLCAPmHQfjDx2OA L3yDR7bS29GN/BNYbFkDPn5rOkP4G+T1GkQ0F7MJDL7ev2uqlk6wKIx0nR/k65Pd/mO4 dtA8N7GrVYKONLDSaV3UamQzIIE29iB48czlRjRfXTmsX2Kjhgu6r3+WbomS3iKNKdXO DQkg== X-Gm-Message-State: ALoCoQmsXmjo3fpMCzcrd/HGWjvjVHAZm+boGOVy/SDIxPAA+ijlG2xF/JYZRjnoySDy++B69N/i X-Received: by 10.180.83.134 with SMTP id q6mr763013wiy.7.1413636770905; Sat, 18 Oct 2014 05:52:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.5 with SMTP id w5ls329907law.71.gmail; Sat, 18 Oct 2014 05:52:50 -0700 (PDT) X-Received: by 10.112.247.43 with SMTP id yb11mr15061970lbc.51.1413636770447; Sat, 18 Oct 2014 05:52:50 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id dk7si6138093lad.51.2014.10.18.05.52.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 18 Oct 2014 05:52:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ge10so1945890lab.10 for ; Sat, 18 Oct 2014 05:52:50 -0700 (PDT) X-Received: by 10.152.120.200 with SMTP id le8mr14762656lab.67.1413636770330; Sat, 18 Oct 2014 05:52:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp43426lbz; Sat, 18 Oct 2014 05:52:49 -0700 (PDT) X-Received: by 10.70.128.239 with SMTP id nr15mr15096264pdb.32.1413636768655; Sat, 18 Oct 2014 05:52:48 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ki11si3521296pbd.11.2014.10.18.05.52.48 for ; Sat, 18 Oct 2014 05:52:48 -0700 (PDT) Received-SPF: none (google.com: linux-input-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; 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-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: list List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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,