linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ohad Ben-Cohen <ohad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
To: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org,
	Chikkature Rajashekar Madhusudhan
	<madhu.cr-l0cyMroinI0@public.gmane.org>,
	Luciano Coelho
	<luciano.coelho-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>,
	akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org,
	San Mehat <san-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
	Roger Quadros
	<roger.quadros-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>,
	Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>,
	Nicolas Pitre <nico-vtqb6HGKxmzR7s880joybQ@public.gmane.org>,
	Pandita Vikram <vikram.pandita-l0cyMroinI0@public.gmane.org>,
	Kalle Valo <kalle.valo-X3B1VOXEql0@public.gmane.org>,
	Ohad Ben-Cohen <ohad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
Subject: [PATCH v2 13/20] omap: zoom: add mmc3/wl1271 device support
Date: Wed, 21 Jul 2010 20:33:47 +0300	[thread overview]
Message-ID: <1279733634-21974-14-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1279733634-21974-1-git-send-email-ohad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>

Add MMC3 support on ZOOM, which has the wl1271 device hardwired to.

The wl1271 is a 4-wire, 1.8V, embedded SDIO WLAN device with an
external IRQ line, and power-controlled by a GPIO-based fixed regulator.

Signed-off-by: Ohad Ben-Cohen <ohad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
---
 arch/arm/mach-omap2/board-zoom-peripherals.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 2fc0f4a..3230801 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -17,6 +17,8 @@
 #include <linux/i2c/twl.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/fixed.h>
+#include <linux/mmc/host.h>
+#include <linux/wl12xx.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -29,6 +31,7 @@
 #include "hsmmc.h"
 
 #define OMAP_ZOOM_WLAN_PMENA_GPIO	(101)
+#define OMAP_ZOOM_WLAN_IRQ_GPIO		(162)
 
 /* Zoom2 has Qwerty keyboard*/
 static int board_keymap[] = {
@@ -184,6 +187,12 @@ static struct platform_device omap_vwlan_device = {
 	},
 };
 
+struct wl12xx_platform_data omap_zoom_wlan_data = {
+	.irq = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),
+	/* ZOOM ref clock is 26 MHz */
+	.board_ref_clock = 1,
+};
+
 static struct omap2_hsmmc_info mmc[] __initdata = {
 	{
 		.name		= "external",
@@ -201,6 +210,15 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
 		.nonremovable	= true,
 		.power_saving	= true,
 	},
+	{
+		.name		= "wl1271",
+		.mmc		= 3,
+		.wires		= 4,
+		.gpio_wp	= -EINVAL,
+		.gpio_cd	= -EINVAL,
+		.ocr_mask	= MMC_VDD_165_195,
+		.priv_data	= &omap_zoom_wlan_data,
+	},
 	{}      /* Terminator */
 };
 
@@ -217,6 +235,7 @@ static int zoom_twl_gpio_setup(struct device *dev,
 	zoom_vmmc1_supply.dev = mmc[0].dev;
 	zoom_vsim_supply.dev = mmc[0].dev;
 	zoom_vmmc2_supply.dev = mmc[1].dev;
+	zoom_vmmc3_supply.dev = mmc[2].dev;
 
 	return 0;
 }
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2010-07-21 17:33 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-21 17:33 [PATCH v2 00/20] native support for wl1271 on ZOOM Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 01/20] sdio: add TI + wl1271 ids Ohad Ben-Cohen
2010-07-21 17:58   ` Marcel Holtmann
2010-07-22 23:38     ` Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 02/20] wireless: wl1271: remove SDIO IDs from driver Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 03/20] mmc: support embedded data field in mmc_host Ohad Ben-Cohen
2010-07-28 19:47   ` Vitaly Wool
2010-07-29  6:00     ` Ohad Ben-Cohen
2010-07-29 16:16       ` Vitaly Wool
2010-08-02 15:54         ` Ohad Ben-Cohen
     [not found]           ` <AANLkTimZQKj7H_GeE=+O9cwxEMTR+LhfFbt=AyXGzN3d-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-08-02 16:25             ` Vitaly Wool
2010-08-02 21:35               ` Ohad Ben-Cohen
2010-08-03 14:17                 ` Vitaly Wool
     [not found]                   ` <AANLkTin4m8gJR50zwMB2b0jRMHdNA6CQToKBTAhOL9wF-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-08-04 11:24                     ` Ohad Ben-Cohen
     [not found]                       ` <AANLkTinu2S19r8fueM-jVkc35XL2G0Z16BddE92Ci9KB-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-08-04 11:41                         ` Russell King - ARM Linux
2010-08-04 12:42                           ` Ohad Ben-Cohen
2010-08-04 14:01                             ` Vitaly Wool
2010-08-06  7:07                             ` Linus Walleij
2010-08-06 10:02                               ` Ohad Ben-Cohen
2010-08-06 14:46                                 ` Russell King - ARM Linux
     [not found]                                   ` <20100806144605.GA21015-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2010-08-06 16:53                                     ` Nicolas Pitre
2010-07-21 17:33 ` [PATCH v2 05/20] omap zoom3: wlan board muxing Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 06/20] wireless: wl1271: make wl12xx.h common to both spi and sdio Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 07/20] wireless: wl1271: support return value for the set power func Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 08/20] wireless: wl1271: take irq info from private board data Ohad Ben-Cohen
     [not found] ` <1279733634-21974-1-git-send-email-ohad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
2010-07-21 17:33   ` [PATCH v2 04/20] omap zoom2: wlan board muxing Ohad Ben-Cohen
2010-07-21 17:33   ` [PATCH v2 09/20] wireless: wl1271: make ref_clock configurable by board Ohad Ben-Cohen
2010-07-21 17:33   ` [PATCH v2 12/20] omap: hsmmc: allow board-specific settings of private mmc data Ohad Ben-Cohen
2010-07-21 17:33   ` Ohad Ben-Cohen [this message]
2010-07-21 17:33   ` [PATCH v2 18/20] mmc: sdio: enable a default power off mode of the card Ohad Ben-Cohen
2010-07-22 11:35     ` Roger Quadros
     [not found]       ` <4C482D01.1040109-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
2010-07-25 12:40         ` Ohad Ben-Cohen
2010-07-25 13:56           ` Nicolas Pitre
     [not found]             ` <alpine.LFD.2.00.1007250953400.25246-QuJgVwGFrdf/9pzu0YdTqQ@public.gmane.org>
2010-07-25 14:05               ` Ohad Ben-Cohen
2010-07-21 17:33   ` [PATCH v2 20/20] wireless: wl1271: call SDIO claim/release power API Ohad Ben-Cohen
2010-07-22 22:56   ` [PATCH v2 00/20] native support for wl1271 on ZOOM Nicolas Pitre
2010-07-22 23:56     ` Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 10/20] omap: zoom: add fixed regulator device for wlan Ohad Ben-Cohen
2010-07-21 17:59   ` Mark Brown
2010-07-22 11:16     ` Roger Quadros
2010-07-22 23:13       ` Ohad Ben-Cohen
     [not found]         ` <AANLkTin2dyLNo1RMQgLG-4DtN-CsXqNNLAfITXDbMIvl-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-07-23  9:15           ` Mark Brown
2010-07-25 10:40             ` Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 11/20] omap: hsmmc: support mmc3 regulator power control Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 14/20] mmc: sdio: fully reconfigure oldcard on resume Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 15/20] mmc: sdio: verify existence of resume handler Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 16/20] mmc: introduce API to control the card's power Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 17/20] mmc: sdio: relocate sdio_set_block_size call Ohad Ben-Cohen
2010-07-21 17:33 ` [PATCH v2 19/20] omap: zoom: keep the MMC3 wl1271 device powered off Ohad Ben-Cohen
2010-07-21 18:55   ` Gabay, Benzy
     [not found]   ` <676FD6AA0F002F49B89E70F0C5EFD22C1311192A47@dlee04.ent.ti.com>
2010-07-22 23:18     ` Ohad Ben-Cohen
     [not found]       ` <AANLkTim3RWv2-qi9UMg1imwKTJuh3GstdjMTxz64uOHf-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-07-26 18:33         ` Gabay, Benzy
2010-07-26 19:30 ` [PATCH v2 00/20] native support for wl1271 on ZOOM John W. Linville
     [not found]   ` <20100726193028.GG3903-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2010-07-27  9:32     ` Ohad Ben-Cohen
2010-08-02  8:16   ` Luciano Coelho
2010-08-02 11:42     ` Tony Lindgren
2010-08-02 12:08       ` Ohad Ben-Cohen
     [not found]       ` <20100802114256.GE12293-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2010-08-02 15:12         ` Vitaly Wool
2010-08-02 15:59           ` Ohad Ben-Cohen
2010-08-02 16:19             ` Vitaly Wool
2010-08-02 16:40               ` Ohad Ben-Cohen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1279733634-21974-14-git-send-email-ohad@wizery.com \
    --to=ohad-ix1uc/w3ht7qt0dzr+alfa@public.gmane.org \
    --cc=akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
    --cc=kalle.valo-X3B1VOXEql0@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \
    --cc=linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=luciano.coelho-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org \
    --cc=madhu.cr-l0cyMroinI0@public.gmane.org \
    --cc=nico-vtqb6HGKxmzR7s880joybQ@public.gmane.org \
    --cc=roger.quadros-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org \
    --cc=san-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
    --cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \
    --cc=vikram.pandita-l0cyMroinI0@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).