From patchwork Wed Apr 10 21:41:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2423511 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 DC8943FCA5 for ; Wed, 10 Apr 2013 21:41:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936388Ab3DJVl3 (ORCPT ); Wed, 10 Apr 2013 17:41:29 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:33947 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759724Ab3DJVl2 (ORCPT ); Wed, 10 Apr 2013 17:41:28 -0400 Received: by mail-bk0-f51.google.com with SMTP id y8so490999bkt.10 for ; Wed, 10 Apr 2013 14:41:26 -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=bCaoOwKJ4rnPQ0xRmTrJCZ861ppW23SAA/tUOj/5MM4=; b=zpwoKRz5ZGK2HxkugqXVe3VCQIaQWIpNuUPVa09s7mHi3SsiR41c4l7gznk0HQVBge zF33e/YNCPoPJCaBDluxvs8fwyB0C7UU0iD1HlGe2i7UjT9aEDFMYMX8tEVZHntfNi6d q3g5qObwYtU1vQSDNQw0eAE0AB0J/VpbRAfMAQncZUP4NUUbKMqRW5t7ufJodMboNvHG rOD/gOvTnSQH26GIuSdveVZ6F4iXj+1NRTgt0w4gdRe/kcw/kNt9mDB35HOt5sD/8UpS B41I8qa/4/DtURIMs3iyKIyW0Ni39jExd1yQbYAegOizfBXsRrv0QpUx1x+9V+3e5Ufn n9Sg== X-Received: by 10.204.173.142 with SMTP id p14mr1473380bkz.115.1365630086909; Wed, 10 Apr 2013 14:41:26 -0700 (PDT) Received: from localhost.localdomain (g229017229.adsl.alicedsl.de. [92.229.17.229]) by mx.google.com with ESMTPS id io13sm760642bkc.15.2013.04.10.14.41.25 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Apr 2013 14:41:26 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org, linux-input@vger.kernel.org Cc: Laurent Pichart , Magnus Damm , Simon Horman , Kuninori Morimoto , Dmitry Torokhov Subject: [PATCH v3 2/2] ARM: shmobile: Armadillo800EVA: Move st1232 reset pin handling Date: Wed, 10 Apr 2013 23:41:23 +0200 Message-Id: <1365630083-9758-2-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365630083-9758-1-git-send-email-hechtb+renesas@gmail.com> References: <1365630083-9758-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 --- v3: same 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 81db74a..885c6a9 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_gpio = 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), @@ -1121,7 +1127,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);