From patchwork Sat Apr 6 13:18:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2401311 Return-Path: X-Original-To: patchwork-linux-sh@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 31BEF3FD40 for ; Sat, 6 Apr 2013 12:20:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422761Ab3DFMTz (ORCPT ); Sat, 6 Apr 2013 08:19:55 -0400 Received: from mail-bk0-f42.google.com ([209.85.214.42]:63236 "EHLO mail-bk0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163468Ab3DFMSx (ORCPT ); Sat, 6 Apr 2013 08:18:53 -0400 Received: by mail-bk0-f42.google.com with SMTP id jc3so2457478bkc.29 for ; Sat, 06 Apr 2013 05:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=xs1+OQtXpReTIICIOtcx1bLs0d1NSiSgdtoxLBUsOLw=; b=RMxg9v7V7puLEDnytdiSh1J9+Xi3Lc2JZ0WBan/sGEJNl05i9lxOa9hsrv+riOtZqv j7ICa179MASs6YW5sjmdunfVtl7hIc0RIzcV332ccX+7lKW20h31ezDliAuTl0lYwKOh hFOkbBMTeEvNepnzCFCqL5a+bN2uFaTf3K4aIQ8i+TXCqKDdAH9G4umi0YcItzclAdxa jAib1fW/PTTSus60PEryHyixinyYJmREqWwgpgFlECQHfm+ttEAsuCKobE6fMzV7/tMK URIbM62ngvbfowf2bIgFtvwYGUKf2OBJN5Qn8AYgAwD0hvA5Iq7dBb7XevH/xzd9zuQ8 iEYA== X-Received: by 10.204.200.139 with SMTP id ew11mr2541206bkb.70.1365250731637; Sat, 06 Apr 2013 05:18:51 -0700 (PDT) Received: from localhost.localdomain (g229018019.adsl.alicedsl.de. [92.229.18.19]) by mx.google.com with ESMTPS id fy17sm9699584bkc.6.2013.04.06.05.18.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 06 Apr 2013 05:18:51 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org, linux-input@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pichart , Kuninori Morimoto Subject: [PATCH 2/2] ARM: shmobile: Armadillo800EVA: Move st1232 reset pin handling Date: Sat, 6 Apr 2013 15:18:46 +0200 Message-Id: <1365254327-10408-2-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365254327-10408-1-git-send-email-hechtb+renesas@gmail.com> References: <1365254327-10408-1-git-send-email-hechtb+renesas@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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 --- arch/arm/mach-shmobile/board-armadillo800eva.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index bf4c3d2..d82e67a 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 @@ -997,10 +998,15 @@ static struct platform_device i2c_gpio_device = { }; /* I2C */ +static struct st1232_pdata st1232_i2c0_pdata = { + .reset_pin = 166, +}; + static struct i2c_board_info i2c0_devices[] = { { I2C_BOARD_INFO("st1232-ts", 0x55), .irq = irq_pin(10), + .platform_data = &st1232_i2c0_pdata, }, { I2C_BOARD_INFO("wm8978", 0x1a), @@ -1120,7 +1126,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);