From patchwork Thu Apr 15 12:06:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 92733 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3FC75ps017245 for ; Thu, 15 Apr 2010 12:07:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753136Ab0DOMHB (ORCPT ); Thu, 15 Apr 2010 08:07:01 -0400 Received: from smtp.nokia.com ([192.100.122.233]:32137 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752356Ab0DOMG5 (ORCPT ); Thu, 15 Apr 2010 08:06:57 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o3FC6gh3011204; Thu, 15 Apr 2010 15:06:54 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 15 Apr 2010 15:06:41 +0300 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 15 Apr 2010 15:06:41 +0300 Received: from localhost.localdomain (esdhcp041154.research.nokia.com [172.21.41.154]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o3FC6d81029675; Thu, 15 Apr 2010 15:06:41 +0300 From: Roger Quadros To: Tomi.Valkeinen@nokia.com Cc: tony@atomide.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: [PATCHv3 3/5] OMAP: RX51: Add Touch Controller in SPI board info Date: Thu, 15 Apr 2010 15:06:19 +0300 Message-Id: <1271333181-23609-4-git-send-email-roger.quadros@nokia.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1271333181-23609-3-git-send-email-roger.quadros@nokia.com> References: <1271333181-23609-1-git-send-email-roger.quadros@nokia.com> <1271333181-23609-2-git-send-email-roger.quadros@nokia.com> <1271333181-23609-3-git-send-email-roger.quadros@nokia.com> X-OriginalArrivalTime: 15 Apr 2010 12:06:41.0499 (UTC) FILETIME=[1BE8C2B0:01CADC94] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 15 Apr 2010 12:07:06 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 3ef805e..020f354 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -46,6 +46,7 @@ enum { RX51_SPI_WL1251, RX51_SPI_MIPID, /* LCD panel */ + RX51_SPI_TSC2005, /* Touch Controller */ }; static struct wl12xx_platform_data wl1251_pdata; @@ -60,6 +61,11 @@ static struct omap2_mcspi_device_config mipid_mcspi_config = { .single_channel = 1, }; +static struct omap2_mcspi_device_config tsc2005_mcspi_config = { + .turbo_mode = 0, + .single_channel = 1, +}; + static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = { [RX51_SPI_WL1251] = { .modalias = "wl1251", @@ -77,6 +83,15 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = { .max_speed_hz = 6000000, .controller_data = &mipid_mcspi_config, }, + [RX51_SPI_TSC2005] = { + .modalias = "tsc2005", + .bus_num = 1, + .chip_select = 0, + /* .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),*/ + .max_speed_hz = 6000000, + .controller_data = &tsc2005_mcspi_config, + /* .platform_data = &tsc2005_config,*/ + }, }; #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)