From patchwork Wed Feb 26 15:28:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 25360 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 99B6520715 for ; Wed, 26 Feb 2014 15:30:05 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wo20sf3417100obc.0 for ; Wed, 26 Feb 2014 07:30:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=WmoKpwmPwPUn8jQ3055OXq3zOpy3ZvAsnsyApllVR50=; b=lLCne+2LZi5Jpc8QU2bFV9/sbF1kpvlNmehlZKsAVCMDZKdsRnHM8mzEbDVLypEPsk OQsAAFZsf9HJkl7CubBHOmaDrmgvNIbYrinZEUKkzmoO+hsk153aRh2GVXFhHeJGxgOL MBc4aQoNI5kh5zHlJfQb7NOfiaDX00pl+PHG+xHqFPmgqRXjbhY0KPjO2khIwKIANbR5 BEZhfZdNUeZYIKr2u7e/cECW5IBnKcYRDCYjjkXe2lgpwK9pOMSGVzOKJmaJl1aKlRE6 rz06fjZei9dUsxgEFLi80TWoR51ycoQK01RoqPI/ilRLQHRNnuuxJR36yGSCmVHOu/cM wJvg== X-Gm-Message-State: ALoCoQmrbNYsORgK+RHWmZHutY1QwHGj1KzJZej35Y7SfSWCiDx24jfvpflxR+WwIzSAuE1CYj6l X-Received: by 10.42.78.197 with SMTP id o5mr8963ick.9.1393428604728; Wed, 26 Feb 2014 07:30:04 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.227 with SMTP id m90ls253114qga.38.gmail; Wed, 26 Feb 2014 07:30:04 -0800 (PST) X-Received: by 10.58.161.227 with SMTP id xv3mr1311323veb.31.1393428604569; Wed, 26 Feb 2014 07:30:04 -0800 (PST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id n15si294586vcy.102.2014.02.26.07.30.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Feb 2014 07:30:04 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id im17so1074254vcb.5 for ; Wed, 26 Feb 2014 07:30:04 -0800 (PST) X-Received: by 10.58.186.132 with SMTP id fk4mr6302702vec.9.1393428604488; Wed, 26 Feb 2014 07:30:04 -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.220.174.196 with SMTP id u4csp34127vcz; Wed, 26 Feb 2014 07:30:04 -0800 (PST) X-Received: by 10.66.102.39 with SMTP id fl7mr9248301pab.43.1393428602097; Wed, 26 Feb 2014 07:30:02 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ha5si1427641pbc.0.2014.02.26.07.30.01; Wed, 26 Feb 2014 07:30:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753183AbaBZP2c (ORCPT + 26 others); Wed, 26 Feb 2014 10:28:32 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:45246 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753072AbaBZP23 (ORCPT ); Wed, 26 Feb 2014 10:28:29 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s1QFSMRR017914; Wed, 26 Feb 2014 09:28:22 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1QFSMTu014328; Wed, 26 Feb 2014 09:28:22 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Wed, 26 Feb 2014 09:28:21 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1QFSAC5027272; Wed, 26 Feb 2014 09:28:19 -0600 From: Roger Quadros To: CC: , , , , , , , , Roger Quadros Subject: [PATCH v2 3/8] Input: pixcir_i2c_ts: Get rid of pdata->attb_read_val() Date: Wed, 26 Feb 2014 17:28:01 +0200 Message-ID: <1393428486-15001-4-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393428486-15001-1-git-send-email-rogerq@ti.com> References: <1393428486-15001-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 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: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Get rid of the attb_read_val() platform hook. Instead, read the ATTB gpio directly from the driver. Fail if valid ATTB gpio is not provided by patform data. Signed-off-by: Roger Quadros Acked-by: Mugunthan V N --- drivers/input/touchscreen/pixcir_i2c_ts.c | 16 +++++++++++++++- include/linux/input/pixcir_ts.h | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c index cce3740..fe17b41 100644 --- a/drivers/input/touchscreen/pixcir_i2c_ts.c +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c @@ -24,6 +24,7 @@ #include #include #include +#include struct pixcir_i2c_ts_data { struct i2c_client *client; @@ -87,11 +88,12 @@ static void pixcir_ts_poscheck(struct pixcir_i2c_ts_data *data) static irqreturn_t pixcir_ts_isr(int irq, void *dev_id) { struct pixcir_i2c_ts_data *tsdata = dev_id; + const struct pixcir_ts_platform_data *pdata = tsdata->chip; while (!tsdata->exiting) { pixcir_ts_poscheck(tsdata); - if (tsdata->chip->attb_read_val()) + if (gpio_get_value(pdata->gpio_attb)) break; msleep(20); @@ -293,6 +295,11 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client, if (!pdata) { dev_err(&client->dev, "platform data not defined\n"); return -EINVAL; + } else { + if (!gpio_is_valid(pdata->gpio_attb)) { + dev_err(dev, "Invalid gpio_attb in pdata\n"); + return -EINVAL; + } } tsdata = devm_kzalloc(dev, sizeof(*tsdata), GFP_KERNEL); @@ -325,6 +332,13 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client, input_set_drvdata(input, tsdata); + error = devm_gpio_request_one(dev, pdata->gpio_attb, + GPIOF_DIR_IN, "pixcir_i2c_attb"); + if (error) { + dev_err(dev, "Failed to request ATTB gpio\n"); + return error; + } + error = devm_request_threaded_irq(dev, client->irq, NULL, pixcir_ts_isr, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, client->name, tsdata); diff --git a/include/linux/input/pixcir_ts.h b/include/linux/input/pixcir_ts.h index 7942804..160cf35 100644 --- a/include/linux/input/pixcir_ts.h +++ b/include/linux/input/pixcir_ts.h @@ -44,9 +44,9 @@ enum pixcir_int_mode { #define PIXCIR_INT_POL_HIGH (1UL << 2) struct pixcir_ts_platform_data { - int (*attb_read_val)(void); int x_max; int y_max; + int gpio_attb; /* GPIO connected to ATTB line */ }; #endif