From patchwork Wed Sep 15 23:32:30 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: 184042 X-Patchwork-Delegate: tony@atomide.com 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 o8FNVq9v022117 for ; Wed, 15 Sep 2010 23:31:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754773Ab0IOXbu (ORCPT ); Wed, 15 Sep 2010 19:31:50 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:58384 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754359Ab0IOXbt (ORCPT ); Wed, 15 Sep 2010 19:31:49 -0400 Received: by mail-bw0-f46.google.com with SMTP id 11so1064943bwz.19 for ; Wed, 15 Sep 2010 16:31:49 -0700 (PDT) Received: by 10.204.54.72 with SMTP id p8mr1734943bkg.163.1284593507986; Wed, 15 Sep 2010 16:31:47 -0700 (PDT) Received: from localhost.localdomain (46-116-86-31.bb.netvision.net.il [46.116.86.31]) by mx.google.com with ESMTPS id 11sm1854037bkj.11.2010.09.15.16.31.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Sep 2010 16:31:47 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: "John W. Linville" , Mark Brown , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , San Mehat , Roger Quadros , Tony Lindgren , Nicolas Pitre , Ido Yariv , Kalle Valo , Russell King , Vitaly Wool , Ohad Ben-Cohen Subject: [PATCH v6 7/7] omap: zoom: add mmc3/wl1271 device support Date: Thu, 16 Sep 2010 01:32:30 +0200 Message-Id: <1284593551-30141-1-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 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 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Sep 2010 23:31:53 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index de88635..5b3b711 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,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 +187,12 @@ static struct platform_device omap_vwlan_device = { }, }; +struct wl12xx_platform_data omap_zoom_wlan_data __initdata = { + .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", @@ -202,6 +210,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, + .nonremovable = true, + }, {} /* Terminator */ }; @@ -313,6 +329,9 @@ static void enable_board_wakeup_source(void) void __init zoom_peripherals_init(void) { + if (wl12xx_set_platform_data(&omap_zoom_wlan_data)) + pr_err("error setting wl12xx data\n"); + omap_i2c_init(); platform_device_register(&omap_vwlan_device); usb_musb_init(&musb_board_data);