From patchwork Sun Nov 9 11:56:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 5260321 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 986CC9F2ED for ; Sun, 9 Nov 2014 11:57:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B994520142 for ; Sun, 9 Nov 2014 11:56:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8C562015D for ; Sun, 9 Nov 2014 11:56:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916AbaKIL4m (ORCPT ); Sun, 9 Nov 2014 06:56:42 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:59356 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751913AbaKIL4j (ORCPT ); Sun, 9 Nov 2014 06:56:39 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 8853381D8E; Sun, 9 Nov 2014 12:56:37 +0100 (CET) Date: Sun, 9 Nov 2014 12:56:37 +0100 From: Pavel Machek To: pali.rohar@gmail.com, sre@debian.org, sre@ring0.de, kernel list , linux-arm-kernel , linux-omap@vger.kernel.org, tony@atomide.com, khilman@kernel.org, aaro.koskinen@iki.fi, freemangordon@abv.bg, B38611@freescale.com, jg1.han@samsung.com, linux-input@vger.kernel.org Subject: tsc2005 touchscreen: implement disable attribute Message-ID: <20141109115636.GA3106@amd> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_RHS_DOB autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Implement disable attribute for tsc2005 touchscreen. It is useful to avoid wakeups when phone is in the pocket. Signed-off-by: Pavel Machek --- [This is from Pali's n900 tree that is GPL, so that is okay, but maybe I should get his sign-off here?] diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c index 52380b6..ec1c276 100644 --- a/drivers/input/touchscreen/tsc2005.c +++ b/drivers/input/touchscreen/tsc2005.c @@ -147,6 +147,7 @@ struct tsc2005 { unsigned int x_plate_ohm; + bool disabled; bool opened; bool suspended; @@ -384,6 +385,48 @@ static void __tsc2005_enable(struct tsc2005 *ts) } +static ssize_t tsc2005_disable_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct spi_device *spi = to_spi_device(dev); + struct tsc2005 *ts = spi_get_drvdata(spi); + + return sprintf(buf, "%u\n", ts->disabled); +} + +static ssize_t tsc2005_disable_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct spi_device *spi = to_spi_device(dev); + struct tsc2005 *ts = spi_get_drvdata(spi); + unsigned long val; + int error; + + error = kstrtoul(buf, 10, &val); + if (error) + return error; + + mutex_lock(&ts->mutex); + + if (!ts->suspended && ts->opened) { + if (val) { + if (!ts->disabled) + __tsc2005_disable(ts); + } else { + if (ts->disabled) + __tsc2005_enable(ts); + } + } + + ts->disabled = !!val; + + mutex_unlock(&ts->mutex); + + return count; +} +static DEVICE_ATTR(disable, 0664, tsc2005_disable_show, tsc2005_disable_store); + static ssize_t tsc2005_selftest_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -466,6 +509,7 @@ out: static DEVICE_ATTR(selftest, S_IRUGO, tsc2005_selftest_show, NULL); static struct attribute *tsc2005_attrs[] = { + &dev_attr_disable.attr, &dev_attr_selftest.attr, NULL }; @@ -551,7 +595,7 @@ static int tsc2005_open(struct input_dev *input) mutex_lock(&ts->mutex); - if (!ts->suspended) + if (!ts->suspended && !ts->disabled) __tsc2005_enable(ts); ts->opened = true; @@ -567,7 +611,7 @@ static void tsc2005_close(struct input_dev *input) mutex_lock(&ts->mutex); - if (!ts->suspended) + if (!ts->suspended && !ts->disabled) __tsc2005_disable(ts); ts->opened = false; @@ -781,7 +825,7 @@ static int tsc2005_suspend(struct device *dev) mutex_lock(&ts->mutex); - if (!ts->suspended && ts->opened) + if (!ts->suspended && !ts->disabled && ts->opened) __tsc2005_disable(ts); ts->suspended = true; @@ -798,7 +842,7 @@ static int tsc2005_resume(struct device *dev) mutex_lock(&ts->mutex); - if (ts->suspended && ts->opened) + if (ts->suspended && !ts->disabled && ts->opened) __tsc2005_enable(ts); ts->suspended = false;