From patchwork Mon Apr 8 12:52:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2408421 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A00E4DFB78 for ; Mon, 8 Apr 2013 12:52:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935987Ab3DHMwq (ORCPT ); Mon, 8 Apr 2013 08:52:46 -0400 Received: from mail-bk0-f49.google.com ([209.85.214.49]:40744 "EHLO mail-bk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935706Ab3DHMwq (ORCPT ); Mon, 8 Apr 2013 08:52:46 -0400 Received: by mail-bk0-f49.google.com with SMTP id w12so3100183bku.36 for ; Mon, 08 Apr 2013 05:52:44 -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=mRz1me2e/Vk/dzv0V2M4dVALQ9QQ9tkoTRSObjJ37XU=; b=PYQ5JFb7iSQ2fiS7NUedUnim3HJdrdIm1MEw82IH8wUQxw15ulB2In1goX6kBY2ziz meQLJZvSsZ3ThgbGOWNHj3ctaeudeppFa680rX9vljV3+IMPq0ddC3wiLODNWjC9DIkC 0a9XasawlH+bSdqqRFNYPeXbe0i+eECewHPmK0ci9Dpv2aoZ52dr76ZHD6HuG4od/tNh Syi2srxf4RzqyhaVEwC348YWUh7otSspcPRFM/c2d/fjioWAtm1Re+ZCQcKiqVfoH36F c+wA8zp47gz2GC7TU2xAS65G+evYnkb3ZVnb7ghtxM3nrrbyUkM1DANRd+K/2BTE7xFP uAsw== X-Received: by 10.204.135.12 with SMTP id l12mr3675637bkt.101.1365425564760; Mon, 08 Apr 2013 05:52:44 -0700 (PDT) Received: from localhost.localdomain (g229018043.adsl.alicedsl.de. [92.229.18.43]) by mx.google.com with ESMTPS id fs20sm12484317bkc.8.2013.04.08.05.52.40 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 05:52:44 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org, linux-input@vger.kernel.org Cc: Tony SIM , Laurent Pichart , Magnus Damm , Simon Horman , Kuninori Morimoto Subject: [PATCH v2 2/2] ARM: shmobile: Armadillo800EVA: Move st1232 reset pin handling Date: Mon, 8 Apr 2013 14:52:27 +0200 Message-Id: <1365425547-10391-2-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365425547-10391-1-git-send-email-hechtb+renesas@gmail.com> References: <1365425547-10391-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 Acked-by: Laurent Pinchart --- v2: reset_pin changed to reset_gpio 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..d1c1ff4 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), @@ -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);