From patchwork Wed Feb 23 12:24:44 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Reizer, Eyal" <eyalr@ti.com>
X-Patchwork-Id: 584081
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1NCOwmf004345
	for <patchwork-omap@patchwork.kernel.org>;
	Wed, 23 Feb 2011 12:24:58 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754679Ab1BWMYu (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Wed, 23 Feb 2011 07:24:50 -0500
Received: from bear.ext.ti.com ([192.94.94.41]:48237 "EHLO bear.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754680Ab1BWMYs (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Wed, 23 Feb 2011 07:24:48 -0500
Received: from dlep34.itg.ti.com ([157.170.170.115])
	by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p1NCOlW5031567
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Wed, 23 Feb 2011 06:24:47 -0600
Received: from dlep26.itg.ti.com (localhost [127.0.0.1])
	by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id p1NCOlqY001692;
	Wed, 23 Feb 2011 06:24:47 -0600 (CST)
Received: from DNCE73.ent.ti.com (localhost [127.0.0.1])
	by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id p1NCOkZF012102;
	Wed, 23 Feb 2011 06:24:47 -0600 (CST)
Received: from dnce02.ent.ti.com ([137.167.131.106]) by DNCE73.ent.ti.com
	([137.167.130.158]) with mapi; Wed, 23 Feb 2011 13:24:46 +0100
From: "Reizer, Eyal" <eyalr@ti.com>
To: "tony@atomide.com" <tony@atomide.com>
CC: "Reizer, Eyal" <eyalr@ti.com>,
	"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Date: Wed, 23 Feb 2011 13:24:44 +0100
Subject: Re: Re: Ping-> Subject: [PATCH] omap: omap3evm: add support for
	the WL12xx WLAN module to the omap3evm
Thread-Topic: Re: Ping-> Subject: [PATCH] omap: omap3evm: add support for
	the WL12xx WLAN module to the omap3evm
Thread-Index: AcvTVKdjdzaogVZAQIKxQsqP/rGhtw==
Message-ID: <EC51CDB0807A51469E0C9CB8CF72D65F033179C278@dnce02.ent.ti.com>
References: <EC51CDB0807A51469E0C9CB8CF72D65F032D73AA68@dnce02.ent.ti.com>
	<20110217222027.GD20795@atomide.com>
In-Reply-To: <20110217222027.GD20795@atomide.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
 <EC51CDB0807A51469E0C9CB8CF72D65F033179C278@dnce02.ent.ti.com>
acceptlanguage: en-US
MIME-Version: 1.0
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Wed, 23 Feb 2011 12:24:59 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/board-omap3evm.c
b/arch/arm/mach-omap2/board-omap3evm.c
index 323c380..349aac9 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -30,6 +30,8 @@
 #include <linux/usb/otg.h>
 #include <linux/smsc911x.h>
 
+#include <linux/wl12xx.h>
+#include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/mmc/host.h>
 
@@ -381,6 +383,16 @@ static struct omap2_hsmmc_info mmc[] = {
                .gpio_cd        = -EINVAL,
                .gpio_wp        = 63,
        },
+#ifdef CONFIG_WL12XX_PLATFORM_DATA
+       {
+               .name           = "wl1271",
+               .mmc            = 2,
+               .caps           = MMC_CAP_4_BIT_DATA |
MMC_CAP_POWER_OFF_CARD,
+               .gpio_wp        = -EINVAL,
+               .gpio_cd        = -EINVAL,
+               .nonremovable   = true,
+       },
+#endif
        {}      /* Terminator */
 };