From patchwork Tue Apr 15 10:28:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 3990751 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 DC0D69F2BA for ; Tue, 15 Apr 2014 10:30:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C171620251 for ; Tue, 15 Apr 2014 10:30:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A40E12024C for ; Tue, 15 Apr 2014 10:30:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754530AbaDOK2X (ORCPT ); Tue, 15 Apr 2014 06:28:23 -0400 Received: from top.free-electrons.com ([176.31.233.9]:39034 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754444AbaDOK2V (ORCPT ); Tue, 15 Apr 2014 06:28:21 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 5BA6C94E; Tue, 15 Apr 2014 12:28:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost (128-79-216-6.hfc.dyn.abo.bbox.fr [128.79.216.6]) by mail.free-electrons.com (Postfix) with ESMTPSA id 1902D60F; Tue, 15 Apr 2014 12:28:21 +0200 (CEST) From: Alexandre Belloni To: Nicolas Ferre , Jonathan Cameron , Dmitry Torokhov Cc: Jean-Christophe Plagniol-Villard , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-iio@vger.kernel.org, linux-input@vger.kernel.org, Alexandre Belloni Subject: [PATCHv3 09/15] ARM: at91: sam9rlek add touchscreen support through at91_adc Date: Tue, 15 Apr 2014 12:28:04 +0200 Message-Id: <1397557690-5650-10-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397557690-5650-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1397557690-5650-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP at91_adc now supports reading a touchscreen for ADCs without a TSMR register. Enable touchscreen support through at91_adc. This allows to use both a touchscreen and the remaining ADC channel at the same time. Signed-off-by: Alexandre Belloni --- arch/arm/mach-at91/board-sam9rlek.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index 604eecf6cd70..35d420247e25 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c @@ -18,6 +18,7 @@ #include #include #include +#include #include