From patchwork Thu Jul 26 19:30:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1244401 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CA464DFFCE for ; Thu, 26 Jul 2012 19:31:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754112Ab2GZTbO (ORCPT ); Thu, 26 Jul 2012 15:31:14 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:58906 "EHLO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753007Ab2GZTbA (ORCPT ); Thu, 26 Jul 2012 15:31:00 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKUBGa7QrSMI7e/vOYSFtHw4iMmcOGVFFA@postini.com; Thu, 26 Jul 2012 12:30:59 PDT Received: by pbbrp2 with SMTP id rp2so3630888pbb.28 for ; Thu, 26 Jul 2012 12:30:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:organization:references:date:in-reply-to :message-id:user-agent:mime-version:content-type:x-gm-message-state; bh=vnvURF7KOI2N7t69pt7jT9UdQJ4upZWeA4FVQhqHfVg=; b=F0pCrGwjr7vFVArQAM+zAYIzBcaBYlrBXrkLjyCwsqyWgP7tycyqlh4qYSLDuMiMBz MAnQ9Z7lCZSXlPBODd8C8MKSrNg1zyNiP5TWYBNEG553MpU7UavlrGLKCLtyJVz3D/oq ZvfZl06ofusxRSsdkf45RbVUoyBwz1t/ut/kMjEU70xSt073b/On/7pIngrnZ8oCi/jK Zck8lQIV5D1mM/hN/rK0DSPb8evBl3tvEuktlNnqepdIt56WW2WYQESaSHqCRNAgweiJ awyp0ItYbJntTCTuTqjLsw2YH2HWZS989pcVl9H95gy8euGXAUnNv5+gqio9gVfqP6Qr wfzw== Received: by 10.68.235.68 with SMTP id uk4mr6986846pbc.52.1343331050300; Thu, 26 Jul 2012 12:30:50 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id pa6sm268537pbc.47.2012.07.26.12.30.47 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:30:49 -0700 (PDT) From: Kevin Hilman To: Igor Grinberg Cc: Tony Lindgren , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Zumeng Chen Subject: Re: [PATCH] ARM: OMAP2+: ads7846 init: fix fault caused by freeing pen-down GPIO Organization: Texas Instruments, Inc. References: <1342048700-15040-1-git-send-email-khilman@ti.com> <500D494D.8020606@compulab.co.il> <500D4F2A.9090706@compulab.co.il> Date: Thu, 26 Jul 2012 12:30:49 -0700 In-Reply-To: <500D4F2A.9090706@compulab.co.il> (Igor Grinberg's message of "Mon, 23 Jul 2012 16:18:34 +0300") Message-ID: <87zk6mpbfa.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkXR2Amh8q1/kMXqQ2SnFKcEQNii72H3AuFh+lCP/F+GLsMmAzGh4flUyojHBPyXfJP3IXo Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org + Zumeng Chen Igor Grinberg writes: > Hi Kevin, > > I've just noticed that the patch has been modified by Arnd in a way > that of course will trigger GPIO use without being requested. > I'm sorry, I was not available by that time Arnd changed the patch. Your right, your original patch isn't the problem. I found the root cause. The real problem is actually introduced by the merge of your patch from the arm-soc/cleanup branch, and this one from Zumeng Chen: commit 16aced80f6 (ARM: OMAP3530evm: set pendown_state and debounce time for ads7846) from the arm-soc/boards branch. However, looking closer at the one from Zumeng, that one is clearly not right. It unconditionally adds a *board-specific* ->get_pendown_state function to the pdata that is common to *all* boards. That's just wrong and has the side-effect of making ->get_pendown_state() wrong on every board except the OMAP3EVM. Oops. So, IMO, in addition to $SUBJECT patch, in order to get the touchscreen GPIO working on non OMAP3EVM boards, we also need something like this as well. Igor, Zumeng, could you try this out on your boards anc confirm if it's working? I currently don't have a board setup with a touchscreen in my board farm. Kevin From 85516c6a3354967caf4cff434d28c3001cd411eb Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 26 Jul 2012 12:15:38 -0700 Subject: [PATCH 2/2] ARM: OMAP2+: ads7846: fix ->get_pendown_state() to work on all boards commit 16aced80f6 (ARM: OMAP3530evm: set pendown_state and debounce time for ads7846) introduced a common ->get_pendown_state() function into the generic code, but that function was board-specific for the OMAP3EVM. Fix this up to work for all boards that pass in a pendown GPIO. Cc: Zumeng Chen Cc: Igor Grinberg Signed-off-by: Kevin Hilman Tested-by: Igor Grinberg --- arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/common-board-devices.c | 4 +++- arch/arm/mach-omap2/common-board-devices.h | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index ef230a0..0d362e9 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -58,6 +58,7 @@ #include "hsmmc.h" #include "common-board-devices.h" +#define OMAP3_EVM_TS_GPIO 175 #define OMAP3_EVM_EHCI_VBUS 22 #define OMAP3_EVM_EHCI_SELECT 61 diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c index 0fee95f..06f176f 100644 --- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c @@ -40,9 +40,10 @@ static struct omap2_mcspi_device_config ads7846_mcspi_config = { * of pdata->get_pendown_state, but we have done this. So set * get_pendown_state to avoid twice gpio requesting. */ +static int omap3_gpio_pendown; static int omap3_get_pendown_state(void) { - return !gpio_get_value(OMAP3_EVM_TS_GPIO); + return !gpio_get_value(omap3_gpio_pendown); } static struct ads7846_platform_data ads7846_config = { @@ -74,6 +75,7 @@ void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, struct spi_board_info *spi_bi = &ads7846_spi_board_info; int err; + omap3_gpio_pendown = gpio_pendown; err = gpio_request_one(gpio_pendown, GPIOF_IN, "TSPenDown"); if (err) { pr_err("Couldn't obtain gpio for TSPenDown: %d\n", err); diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index 4c4ef6a..a0b4a428 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h @@ -4,7 +4,6 @@ #include "twl-common.h" #define NAND_BLOCK_SIZE SZ_128K -#define OMAP3_EVM_TS_GPIO 175 struct mtd_partition; struct ads7846_platform_data;