Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:37901 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756458Ab0GFAkh (ORCPT ); Mon, 5 Jul 2010 20:40:37 -0400 From: Ohad Ben-Cohen To: , , Cc: , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , , San Mehat , Ohad Ben-Cohen Subject: [PATCH 09/15] wireless: wl12xx: support pdata SDIO handlers Date: Tue, 6 Jul 2010 03:37:40 +0300 Message-Id: <1278376666-3509-10-git-send-email-ohad@wizery.com> In-Reply-To: <1278376666-3509-1-git-send-email-ohad@wizery.com> References: <1278376666-3509-1-git-send-email-ohad@wizery.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Ohad Ben-Cohen Make it possible for board code to send SDIO handlers to the wl12xx driver. These SDIO handlers are needed to allow software to trigger card detect events for hard-wired SDIO devices such as the wl1271 device. Signed-off-by: Ohad Ben-Cohen --- drivers/net/wireless/wl12xx/wl1271.h | 4 ++++ include/linux/wl12xx.h | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h index 6f1b6b5..fc4d122 100644 --- a/drivers/net/wireless/wl12xx/wl1271.h +++ b/drivers/net/wireless/wl12xx/wl1271.h @@ -356,6 +356,10 @@ struct wl1271 { struct wl1271_if_operations *if_ops; void (*set_power)(bool enable); + /* SDIO card detect emulation */ + void (*set_carddetect)(bool card_present); + void (*set_embedded_data)(void *priv); + int irq; spinlock_t wl_lock; diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h index 137ac89..4106184 100644 --- a/include/linux/wl12xx.h +++ b/include/linux/wl12xx.h @@ -26,6 +26,8 @@ struct wl12xx_platform_data { void (*set_power)(bool enable); + void (*set_carddetect)(bool card_present); + void (*set_embedded_data)(void *priv); /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */ int irq; bool use_eeprom; -- 1.7.0.4