From patchwork Tue May 6 11:06:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 29696 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4C85E20534 for ; Tue, 6 May 2014 11:08:38 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id lc6sf1809154vcb.7 for ; Tue, 06 May 2014 04:08:38 -0700 (PDT) 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=j5NbF6VDNO3gVBG48RdJUC1wEnjzY5iX5jXGapYd7N4=; b=c7BGzy/mUEFlxE5tInM5iSR9H82U42LHRPdUai0kFWQsAfV4tuXaZOGgWRpig4XzIc GKpHPfuNcjT0yhDamQcSMYMRo9GihVNRi1igPhkDjSdaBG+U0Q3NQtvkdyV+0Jzqkk8n Qkgrd/eYTkhKZCZeSFD4I4746uidIYEmvmF7fsIqbfevdyLhDHy8CDHSyy4vE0hlaRjI AiXt6jzU+jR+PGUBcg1v44PrVDt5FxgAtUtXSwjiNBKtCyDVqz7yx3+5644E4K5YRjTv YBL4w+p30QcfOSvUQpOFRtjbFMLEbbv+hkAmhE8ZraidwRmOk7m8seX0A9DU6TYcdVJn 5W7Q== X-Gm-Message-State: ALoCoQlBg10ABxLGA7o+D+sGQcILQDww71aU01I8bYMP53+8dPhGyEYIk1Iy3GhFp4Hh5kXHLyCW X-Received: by 10.58.77.138 with SMTP id s10mr756826vew.40.1399374518646; Tue, 06 May 2014 04:08:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.247 with SMTP id u110ls893757qge.79.gmail; Tue, 06 May 2014 04:08:38 -0700 (PDT) X-Received: by 10.221.74.200 with SMTP id yx8mr32433641vcb.3.1399374518540; Tue, 06 May 2014 04:08:38 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id iq2si1245802veb.127.2014.05.06.04.08.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 06 May 2014 04:08:38 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ij19so696213vcb.14 for ; Tue, 06 May 2014 04:08:38 -0700 (PDT) X-Received: by 10.220.176.68 with SMTP id bd4mr4168vcb.70.1399374518460; Tue, 06 May 2014 04:08:38 -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.220.221.72 with SMTP id ib8csp213788vcb; Tue, 6 May 2014 04:08:37 -0700 (PDT) X-Received: by 10.50.33.74 with SMTP id p10mr31187234igi.5.1399374517698; Tue, 06 May 2014 04:08:37 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bs8si11737305pad.299.2014.05.06.04.08.36; Tue, 06 May 2014 04:08:36 -0700 (PDT) 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 S934996AbaEFLI1 (ORCPT + 27 others); Tue, 6 May 2014 07:08:27 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:36971 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934894AbaEFLGf (ORCPT ); Tue, 6 May 2014 07:06:35 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s46B6WUe015540; Tue, 6 May 2014 06:06:32 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s46B6WR2019201; Tue, 6 May 2014 06:06:32 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Tue, 6 May 2014 06:06:32 -0500 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 s46B6Kf8021055; Tue, 6 May 2014 06:06:29 -0500 From: Roger Quadros To: CC: , , , , , , , , Roger Quadros Subject: [PATCH v5 3/7] Input: pixcir_i2c_ts: Get rid of pdata->attb_read_val() Date: Tue, 6 May 2014 14:06:08 +0300 Message-ID: <1399374372-29123-4-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399374372-29123-1-git-send-email-rogerq@ti.com> References: <1399374372-29123-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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 96a1b1e..8a7da61 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->running) { pixcir_ts_poscheck(tsdata); - if (tsdata->chip->attb_read_val()) + if (gpio_get_value(pdata->gpio_attb)) break; msleep(20); @@ -296,6 +298,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); @@ -328,6 +335,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