From patchwork Tue Apr 9 08:26:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 2413351 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 76AD03FC71 for ; Tue, 9 Apr 2013 08:26:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964949Ab3DII0u (ORCPT ); Tue, 9 Apr 2013 04:26:50 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:32948 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936887Ab3DII0s (ORCPT ); Tue, 9 Apr 2013 04:26:48 -0400 Received: from ayumi.akashicho.tokyo.vergenet.net (p8120-ipbfp1001kobeminato.hyogo.ocn.ne.jp [118.10.137.120]) by kirsty.vergenet.net (Postfix) with ESMTP id A3CAC25BF01; Tue, 9 Apr 2013 18:26:46 +1000 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id DC64AEDEA34; Tue, 9 Apr 2013 17:26:44 +0900 (JST) Date: Tue, 9 Apr 2013 17:26:44 +0900 From: Simon Horman To: Laurent Pinchart Cc: Bastian Hecht , linux-sh@vger.kernel.org, linux-input@vger.kernel.org, Tony SIM , Magnus Damm , Kuninori Morimoto Subject: Re: [PATCH v2 2/2] ARM: shmobile: Armadillo800EVA: Move st1232 reset pin handling Message-ID: <20130409082644.GD18478@verge.net.au> References: <1365425547-10391-1-git-send-email-hechtb+renesas@gmail.com> <1365425547-10391-2-git-send-email-hechtb+renesas@gmail.com> <1534841.hHClRQAXMk@avalon> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1534841.hHClRQAXMk@avalon> Organisation: Horms Solutions Ltd. User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org On Mon, Apr 08, 2013 at 04:17:22PM +0200, Laurent Pinchart wrote: > Hi Bastian, > > Thanks for the patch. > > On Monday 08 April 2013 14:52:27 Bastian Hecht wrote: > > We no longer need to set up the reset pin for the st1232 in the board > > code, but can pass the GPIO number via the platform data to the driver. > > This results in a cleaner grouping of the device setup. > > > > Signed-off-by: Bastian Hecht > > Acked-by: Laurent Pinchart Thanks. I have queued this up in the boards-armadillo800eva branch. There were some conflicts when I applied the code which I fixed manually. Bastian, can you please check that the following is correct? If it is not please send an incremental patch. From 14e0f336a45cdb9150aab5731c2b5b74f4dc3588 Mon Sep 17 00:00:00 2001 From: Bastian Hecht Date: Mon, 8 Apr 2013 12:52:27 +0000 Subject: [PATCH] ARM: shmobile: Armadillo800EVA: Move st1232 reset pin handling We no longer need to set up the reset pin for the st1232 in the board code, but can pass the GPIO number via the platform data to the driver. This results in a cleaner grouping of the device setup. Signed-off-by: Bastian Hecht Acked-by: Laurent Pinchart Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-armadillo800eva.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index f322a18..60fca5d 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -968,10 +969,14 @@ static struct platform_device i2c_gpio_device = { }; /* I2C */ +static struct st1232_pdata st1232_i2c0_pdata = { + .reset_gpio = 166, +}; static struct i2c_board_info i2c0_devices[] = { { I2C_BOARD_INFO("st1232-ts", 0x55), .irq = evt2irq(0x0340), + .platform_data = &st1232_i2c0_pdata, }, { I2C_BOARD_INFO("wm8978", 0x1a), @@ -1092,7 +1097,6 @@ static void __init eva_init(void) /* Touchscreen */ gpio_request(GPIO_FN_IRQ10, NULL); /* TP_INT */ - gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */ /* GETHER */ gpio_request(GPIO_FN_ET_CRS, NULL);