From patchwork Fri Jan 9 10:32:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 42901 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DC3D026CF1 for ; Fri, 9 Jan 2015 10:48:19 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id a1sf3936455wgh.3 for ; Fri, 09 Jan 2015 02:48:19 -0800 (PST) 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:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=z2m/O9WNAIEdsTKk/Bz4Kjb7y9kbamTxVWfMBaDWaQU=; b=U8BAIgGT4Jcalra6DOQASljsP8l7WKf9vp9DhokOUPi+g0rXBbjJliiI/JrAbMcLHZ +dc2md4VBD6dfuwzKzZ2Ek04SRJaFDMTjjL4AcYG78910teHU1pyJuX0EwPmOEt2VSVW Km+uEF+AbLRBwzBbCNhwxflfNgSWqvUKLyl6CT8aUFo7DaTQJW26aDjfkvPudsVEMF/p FGc6uKNPIzXgiRjDgZ7pD5sy15ymQarnm0CIz+y9S0iSOJfFPKZcNTNdO/KrSA+0jKum tfb4RQfiBAwGY2P1qF2TcL1XE4kTq9R/CvFOWLn/8e2csJYYjg1zuvt/2Q/N+yNcOXc8 3CWw== X-Gm-Message-State: ALoCoQmKjrdQjxDOqpHeWSJi5yYaQbL/mrhuewAxqWfDtj+FleIrYgG0hZXbwf9Z9YxW0/8xIleS X-Received: by 10.180.7.226 with SMTP id m2mr293407wia.5.1420800499221; Fri, 09 Jan 2015 02:48:19 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.242.129 with SMTP id wq1ls374661lac.56.gmail; Fri, 09 Jan 2015 02:48:19 -0800 (PST) X-Received: by 10.112.162.4 with SMTP id xw4mr20510608lbb.89.1420800499016; Fri, 09 Jan 2015 02:48:19 -0800 (PST) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id k12si12676944laa.24.2015.01.09.02.48.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Jan 2015 02:48:18 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id hz20so13837254lab.6 for ; Fri, 09 Jan 2015 02:48:18 -0800 (PST) X-Received: by 10.112.30.71 with SMTP id q7mr20829931lbh.41.1420800498754; Fri, 09 Jan 2015 02:48:18 -0800 (PST) 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.9.200 with SMTP id c8csp292451lbb; Fri, 9 Jan 2015 02:48:17 -0800 (PST) X-Received: by 10.68.189.105 with SMTP id gh9mr22536505pbc.142.1420800496104; Fri, 09 Jan 2015 02:48:16 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rc8si13049802pdb.83.2015.01.09.02.48.15; Fri, 09 Jan 2015 02:48:16 -0800 (PST) Received-SPF: none (google.com: linux-kernel-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 S933129AbbAIKsM (ORCPT + 27 others); Fri, 9 Jan 2015 05:48:12 -0500 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:44582 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757454AbbAIKc3 (ORCPT ); Fri, 9 Jan 2015 05:32:29 -0500 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.84) (envelope-from ) id 1Y9Wrk-00044y-8y; Fri, 09 Jan 2015 11:32:28 +0100 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Linus Walleij , Lee Jones , Jiri Slaby Subject: [PATCH 3.12 76/78] mfd: stmpe: Fix STMPE24xx GPMR LSB Date: Fri, 9 Jan 2015 11:32:25 +0100 Message-Id: <83ee596143c7f78fec7c8f36f92be2223d9a8bad.1420799385.git.jslaby@suse.cz> X-Mailer: git-send-email 2.2.1 In-Reply-To: <72002f1f248c28d1715d10454190e209d5a20fe1.1420799385.git.jslaby@suse.cz> References: <72002f1f248c28d1715d10454190e209d5a20fe1.1420799385.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.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.47 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: , From: Linus Walleij 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 871c3cf4ea7d5baf58e0a40bce7431ca5525aa2a upstream. The least significat byte of the GPIO value read register on the STMPE24xx series is on addres 0xA4 not 0xA5. Correct against datasheet and tested on the STMPE2401 hardware. Signed-off-by: Linus Walleij Signed-off-by: Lee Jones Signed-off-by: Jiri Slaby --- drivers/mfd/stmpe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h index ff2b09ba8797..50a5c8697bf7 100644 --- a/drivers/mfd/stmpe.h +++ b/drivers/mfd/stmpe.h @@ -269,7 +269,7 @@ int stmpe_remove(struct stmpe *stmpe); #define STMPE24XX_REG_CHIP_ID 0x80 #define STMPE24XX_REG_IEGPIOR_LSB 0x18 #define STMPE24XX_REG_ISGPIOR_MSB 0x19 -#define STMPE24XX_REG_GPMR_LSB 0xA5 +#define STMPE24XX_REG_GPMR_LSB 0xA4 #define STMPE24XX_REG_GPSR_LSB 0x85 #define STMPE24XX_REG_GPCR_LSB 0x88 #define STMPE24XX_REG_GPDR_LSB 0x8B