From patchwork Sat Jul 12 09:31:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 33520 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DD26A20672 for ; Sat, 12 Jul 2014 09:31:34 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wp18sf11129510obc.1 for ; Sat, 12 Jul 2014 02:31:34 -0700 (PDT) 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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=9EGnJdWMAt3hsgUwKDqcz3IlzSAMMMZX063em8UgwRg=; b=fg/9NrV9JLpzto0t5jZNLPGrpV1sfQ3S8HaolWyz75/fLPBUh7lc0uF0rReKnf6rcZ 4uSLmjeWPS5o/jrq4P7rx3ptyLDXh+ovm4QSGzHY38skGEWsz9+d6SLtJdK4YXNtB/iO VGjeWgo1gG06ourJLsCG11h6bWyWPUfos9YNF/RHJ2vuiEbMbYHGQzaURCRrbsts/yyh icABIKOdQXiJVWCuP0Lr+smzEgHRTxrKNxMTjOmFbIfrx/FBTa6OlW5Exp/n/N3LbBjn 3L2fyYBAsunUlR55YoPVuwAdpOP0RWsmpKS8sfpOSx63WUeUCBChg0XOmHseBMkJ3CYt 6gRg== X-Gm-Message-State: ALoCoQn0+2AmgKd5+qgqGPkGCdt86kby5zZqZf3N/9FUyX5vP0TOpBsbdmWavtFrwOgW+kVxM5rk X-Received: by 10.182.49.136 with SMTP id u8mr2105355obn.32.1405157494369; Sat, 12 Jul 2014 02:31:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.40 with SMTP id m37ls639848qgd.18.gmail; Sat, 12 Jul 2014 02:31:34 -0700 (PDT) X-Received: by 10.221.44.73 with SMTP id uf9mr4563730vcb.9.1405157494267; Sat, 12 Jul 2014 02:31:34 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id qr19si3413789vdb.86.2014.07.12.02.31.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 12 Jul 2014 02:31:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id im17so3953261vcb.39 for ; Sat, 12 Jul 2014 02:31:34 -0700 (PDT) X-Received: by 10.58.149.170 with SMTP id ub10mr4870128veb.0.1405157494138; Sat, 12 Jul 2014 02:31:34 -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.221.37.5 with SMTP id tc5csp101001vcb; Sat, 12 Jul 2014 02:31:31 -0700 (PDT) X-Received: by 10.66.226.172 with SMTP id rt12mr4223299pac.101.1405157491309; Sat, 12 Jul 2014 02:31:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g4si2430936pde.456.2014.07.12.02.31.30; Sat, 12 Jul 2014 02:31:31 -0700 (PDT) Received-SPF: none (google.com: linux-input-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 S1752269AbaGLJba (ORCPT ); Sat, 12 Jul 2014 05:31:30 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:44081 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752080AbaGLJb3 (ORCPT ); Sat, 12 Jul 2014 05:31:29 -0400 Received: by mail-wg0-f51.google.com with SMTP id y10so2073025wgg.22 for ; Sat, 12 Jul 2014 02:31:28 -0700 (PDT) X-Received: by 10.194.78.68 with SMTP id z4mr5465051wjw.126.1405157488264; Sat, 12 Jul 2014 02:31:28 -0700 (PDT) Received: from localhost.localdomain.localdomain (smb-rsycl-02.wifihubtelecom.net. [213.174.124.178]) by mx.google.com with ESMTPSA id cj8sm10703702wjb.5.2014.07.12.02.31.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jul 2014 02:31:27 -0700 (PDT) From: Linus Walleij To: Dmitry Torokhov , linux-input@vger.kernel.org Cc: Dmitry Artamonow , Alessandro GARDICH , Linus Walleij Subject: [PATCH] input: driver for touchscreen on iPaq h3xxx Date: Sat, 12 Jul 2014 11:31:21 +0200 Message-Id: <1405157481-10348-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-input-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.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.220.180 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: Dmitry Artamonow This adds a driver for the touchscreen connected to the Atmel microcontroller on the iPAQ h3xxx series. Based on a driver from handhelds.org 2.6.21 kernel, written by Alessandro GARDICH. Signed-off-by: Alessandro GARDICH Signed-off-by: Dmitry Artamonow Signed-off-by: Linus Walleij --- drivers/input/touchscreen/Kconfig | 8 ++ drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/ipaq-micro-ts.c | 137 ++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 drivers/input/touchscreen/ipaq-micro-ts.c diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index a23a94bb4bcb..26d0953c7094 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -471,6 +471,14 @@ config TOUCHSCREEN_HP7XX To compile this driver as a module, choose M here: the module will be called jornada720_ts. +config TOUCHSCREEN_IPAQ_MICRO + tristate "HP iPAQ Atmel Micro ASIC touchscreen" + depends on MFD_IPAQ_MICRO + help + This enables support for the touchscreen attached to + the Atmel Micro peripheral controller on iPAQ h3100/h3600/h3700 + + config TOUCHSCREEN_HTCPEN tristate "HTC Shift X9500 touchscreen" depends on ISA diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 126479d8c29a..4be94fce41af 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -46,6 +46,7 @@ obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o obj-$(CONFIG_TOUCHSCREEN_HP7XX) += jornada720_ts.o +obj-$(CONFIG_TOUCHSCREEN_IPAQ_MICRO) += ipaq-micro-ts.o obj-$(CONFIG_TOUCHSCREEN_HTCPEN) += htcpen.o obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE) += usbtouchscreen.o obj-$(CONFIG_TOUCHSCREEN_PCAP) += pcap_ts.o diff --git a/drivers/input/touchscreen/ipaq-micro-ts.c b/drivers/input/touchscreen/ipaq-micro-ts.c new file mode 100644 index 000000000000..9c5e1b62d192 --- /dev/null +++ b/drivers/input/touchscreen/ipaq-micro-ts.c @@ -0,0 +1,137 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * h3600 atmel micro companion support, touchscreen subdevice + * Author : Alessandro Gardich + * Author : Linus Walleij + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct touchscreen_data { + struct input_dev *input; + struct ipaq_micro *micro; +}; + +static void micro_ts_receive(void *data, int len, unsigned char *msg) +{ + struct touchscreen_data *ts = data; + + if (len == 4) { + input_report_abs(ts->input, ABS_X, (msg[2]<<8)+msg[3]); + input_report_abs(ts->input, ABS_Y, (msg[0]<<8)+msg[1]); + input_report_abs(ts->input, ABS_PRESSURE, 1); + input_report_key(ts->input, BTN_TOUCH, 0); + } + if (len == 0) { + input_report_abs(ts->input, ABS_X, 0); + input_report_abs(ts->input, ABS_Y, 0); + input_report_abs(ts->input, ABS_PRESSURE, 0); + input_report_key(ts->input, BTN_TOUCH, 1); + } + input_sync(ts->input); +} + + +static int micro_ts_probe(struct platform_device *pdev) +{ + struct touchscreen_data *ts; + int ret; + + ts = devm_kzalloc(&pdev->dev, sizeof(*ts), GFP_KERNEL); + if (!ts) + return -ENOMEM; + ts->micro = dev_get_drvdata(pdev->dev.parent); + + platform_set_drvdata(pdev, ts); + + ts->input = input_allocate_device(); + + ts->input->evbit[0] = BIT(EV_ABS); + ts->input->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE); + input_set_abs_params(ts->input, ABS_X, 0, 1023, 0, 0); + input_set_abs_params(ts->input, ABS_Y, 0, 1023, 0, 0); + input_set_abs_params(ts->input, ABS_PRESSURE, 0x0, 0x1, 0, 0); + + ts->input->name = "ipaq micro ts"; + /* ts->input->private = ts; */ + + ret = input_register_device(ts->input); + if (ret) { + dev_err(&pdev->dev, "error registering touch input\n"); + return ret; + } + + spin_lock(&ts->micro->lock); + ts->micro->ts = micro_ts_receive; + ts->micro->ts_data = ts; + spin_unlock(&ts->micro->lock); + + dev_info(&pdev->dev, "iPAQ micro touchscreen\n"); + return 0; +} + +static int micro_ts_remove(struct platform_device *pdev) +{ + struct touchscreen_data *ts = platform_get_drvdata(pdev); + + spin_lock(&ts->micro->lock); + ts->micro->ts = NULL; + ts->micro->ts_data = NULL; + spin_unlock(&ts->micro->lock); + input_unregister_device(ts->input); + + return 0; +} + +static int micro_ts_suspend(struct device *dev) +{ + struct touchscreen_data *ts = dev_get_drvdata(dev); + + spin_lock(&ts->micro->lock); + ts->micro->ts = NULL; + ts->micro->ts_data = NULL; + spin_unlock(&ts->micro->lock); + return 0; +} + +static int micro_ts_resume(struct device *dev) +{ + struct touchscreen_data *ts = dev_get_drvdata(dev); + + spin_lock(&ts->micro->lock); + ts->micro->ts = micro_ts_receive; + ts->micro->ts_data = ts; + spin_unlock(&ts->micro->lock); + return 0; +} + +static const struct dev_pm_ops micro_ts_dev_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(micro_ts_suspend, micro_ts_resume) +}; + +struct platform_driver micro_ts_device_driver = { + .driver = { + .name = "ipaq-micro-ts", + .pm = µ_ts_dev_pm_ops, + }, + .probe = micro_ts_probe, + .remove = micro_ts_remove, +}; +module_platform_driver(micro_ts_device_driver); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("driver for iPAQ Atmel micro touchscreen"); +MODULE_ALIAS("platform:ipaq-micro-ts");