From patchwork Tue Aug 10 22:12:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 118698 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7AMEFMR007347 for ; Tue, 10 Aug 2010 22:14:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933376Ab0HJWN7 (ORCPT ); Tue, 10 Aug 2010 18:13:59 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:62839 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933359Ab0HJWN5 (ORCPT ); Tue, 10 Aug 2010 18:13:57 -0400 Received: by mail-bw0-f46.google.com with SMTP id 3so2240853bwz.19 for ; Tue, 10 Aug 2010 15:13:56 -0700 (PDT) Received: by 10.204.76.205 with SMTP id d13mr12307375bkk.93.1281478436100; Tue, 10 Aug 2010 15:13:56 -0700 (PDT) Received: from localhost.localdomain (85-250-37-93.bb.netvision.net.il [85.250.37.93]) by mx.google.com with ESMTPS id f10sm4569096bkl.17.2010.08.10.15.13.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 10 Aug 2010 15:13:55 -0700 (PDT) From: Ohad Ben-Cohen To: , , Cc: Mark Brown , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , , San Mehat , Roger Quadros , Tony Lindgren , Nicolas Pitre , Pandita Vikram , Kalle Valo , Ohad Ben-Cohen Subject: [PATCH v3 9/9] omap: zoom: add mmc3/wl1271 device support Date: Wed, 11 Aug 2010 01:12:28 +0300 Message-Id: <1281478348-24833-10-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281478348-24833-1-git-send-email-ohad@wizery.com> References: <1281478348-24833-1-git-send-email-ohad@wizery.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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]); Tue, 10 Aug 2010 22:14:31 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index de88635..82776bc 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include #include #include @@ -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[] = { @@ -185,6 +188,28 @@ static struct platform_device omap_vwlan_device = { }, }; +struct wl12xx_platform_data omap_zoom_wlan_data = { + /* ZOOM ref clock is 26 MHz */ + .board_ref_clock = 1, +}; + +static struct resource omap_zoom_wl1271_resources[] = { + { + .start = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO), + .end = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO), + .flags = IORESOURCE_IRQ, + } +}; +static struct platform_device omap_zoom_wl1271 = { + .name = "wl1271_plat.2", + .id = -1, + .resource = omap_zoom_wl1271_resources, + .num_resources = ARRAY_SIZE(omap_zoom_wl1271_resources), + .dev = { + .platform_data = &omap_zoom_wlan_data, + }, +}; + static struct omap2_hsmmc_info mmc[] __initdata = { { .name = "external", @@ -202,6 +227,14 @@ 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, + }, {} /* Terminator */ }; @@ -313,6 +346,7 @@ static void enable_board_wakeup_source(void) void __init zoom_peripherals_init(void) { + platform_device_register(&omap_zoom_wl1271); omap_i2c_init(); platform_device_register(&omap_vwlan_device); usb_musb_init(&musb_board_data);