From patchwork Wed Mar 25 10:26:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 14293 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2PAQmWD004824 for ; Wed, 25 Mar 2009 10:26:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754341AbZCYK0G (ORCPT ); Wed, 25 Mar 2009 06:26:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758354AbZCYK0G (ORCPT ); Wed, 25 Mar 2009 06:26:06 -0400 Received: from smtp.nokia.com ([192.100.122.230]:44830 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754341AbZCYK0F (ORCPT ); Wed, 25 Mar 2009 06:26:05 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx03.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n2PAPakS021977 for ; Wed, 25 Mar 2009 12:25:58 +0200 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 25 Mar 2009 12:25:46 +0200 Received: from mgw-int01.ntc.nokia.com ([172.21.143.96]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 25 Mar 2009 12:25:45 +0200 Received: from localhost.localdomain (esdhcp042162.research.nokia.com [172.21.42.162]) by mgw-int01.ntc.nokia.com (Switch-3.2.5/Switch-3.2.5) with ESMTP id n2PAPi4G003513; Wed, 25 Mar 2009 12:25:44 +0200 From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Jarkko Nikula Subject: [PATCH 1/2] ARM: OMAP: N8x0: Add retu-headset platform data Date: Wed, 25 Mar 2009 12:26:20 +0200 Message-Id: <1237976781-3252-1-git-send-email-jarkko.nikula@nokia.com> X-Mailer: git-send-email 1.6.2 X-OriginalArrivalTime: 25 Mar 2009 10:25:45.0622 (UTC) FILETIME=[0EDFC360:01C9AD34] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This was earlier in board-n800-audio.c but got removed by the commit c65c733e1af5eac5681233309fed38538c9e06d2. Signed-off-by: Jarkko Nikula --- arch/arm/mach-omap2/board-n800.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c index 60a414c..b90d153 100644 --- a/arch/arm/mach-omap2/board-n800.c +++ b/arch/arm/mach-omap2/board-n800.c @@ -568,10 +568,20 @@ static struct omap_gpio_switch n800_gpio_switches[] __initdata = { }, }; +#if defined(CONFIG_CBUS_RETU_HEADSET) +static struct platform_device retu_headset_device = { + .name = "retu-headset", + .id = -1, +}; +#endif + static struct platform_device *n800_devices[] __initdata = { #if defined(CONFIG_CBUS_RETU) && defined(CONFIG_LEDS_OMAP_PWM) &n800_keypad_led_device, #endif +#if defined(CONFIG_CBUS_RETU_HEADSET) + &retu_headset_device, +#endif }; #ifdef CONFIG_MENELAUS