--- drivers/net/wireless/bcm4325/src/bcmsdio/sys/bcmsdh_sdmmc_linux.c 2011-02-04 19:01:16.000000000 -0500 +++ ../../vm670/kernel/drivers/net/wireless/bcm4325/src/bcmsdio/sys/bcmsdh_sdmmc_linux.c 2011-02-17 00:31:52.000000000 -0500 @@ -64,7 +64,6 @@ #include #endif /* #if defined(CONFIG_BRCM_GPIO_INTR) && defined(CONFIG_HAS_EARLYSUSPEND) */ -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) #include #include @@ -88,7 +87,6 @@ extern void unregister_mmc_card_pm(void); #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) extern volatile bool dhd_mmc_suspend; @@ -127,7 +125,6 @@ extern void *dhd_es_get_dhd_bus_sdh(void); static int dhd_register_early_suspend(void); static void dhd_unregister_early_suspend(void); -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) void dhd_early_suspend(struct early_suspend *h); @@ -138,10 +135,8 @@ .resume = dhd_late_resume }; #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ DECLARE_WAIT_QUEUE_HEAD(bussleep_wake); typedef struct dhd_early_suspend { -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) int wait_driver_load; /* waiting for driver loaded */ bool skip; @@ -150,7 +145,6 @@ bool drv_loaded; struct dhd_bus_t *bus; } dhd_early_suspend_t; -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) dhd_early_suspend_t dhd_early_suspend_ctrl = { 0, 0, 0, 0, 0}; #else /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ @@ -267,39 +261,28 @@ return dhd_early_suspend_ctrl.bus; } -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) static int dhd_es_lock_dhd_bus(void) { -/* BEGIN: 0005533 mingi.sung@lge.com 2010-03-27 */ -/* MOD 0005533: [WLAN] Fixing WBT issues on Wi-Fi driver */ -/* WBT Fix TD# 248350 */ void *bus; bus = dhd_es_get_dhd_pub(); if( bus ) dhd_os_proto_block(bus); -/* END: 0005533 mingi.sung@lge.com 2010-03-27 */ - return 0; } static int dhd_es_unlock_dhd_bus(void) { -/* BEGIN: 0005533 mingi.sung@lge.com 2010-03-27 */ -/* MOD 0005533: [WLAN] Fixing WBT issues on Wi-Fi driver */ -/* WBT Fix TD# 248351 */ void *bus; bus = dhd_es_get_dhd_pub(); if( bus ) dhd_os_proto_unblock(bus); -/* END: 0005533 mingi.sung@lge.com 2010-03-27 */ return 0; } #endif /* defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ bool dhd_early_suspend_state(void) @@ -307,12 +290,9 @@ return dhd_early_suspend_ctrl.state; } -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) static void dhd_enable_sdio_irq(int enable) { -/* BEGIN: 0004825 mingi.sung@lge.com 2010-03-09 */ -/* MOD 0004825: [WLAN] Prevent insmod failed */ struct mmc_card *card; struct mmc_host *host; @@ -323,7 +303,6 @@ card = gInstance->func[0]->card; host = card->host; -/* END: 0004825 mingi.sung@lge.com 2010-03-09 */ if (enable == TRUE ) host->ops->enable_sdio_irq(host, 1); @@ -390,9 +369,6 @@ { #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) int gpio = 0; -/* BEGIN: 0003780 mingi.sung@lge.com 2010-02-02 */ -/* DEL 0003780: [WLAN] Reduce the time to resume when using host-wakeup */ -/* END: 0003780 mingi.sung@lge.com 2010-02-02 */ dhd_enable_sdio_irq(FALSE); dhd_suspend_context = FALSE; @@ -403,21 +379,17 @@ if (NULL != dhd_early_suspend_ctrl.bus) { dhd_early_suspend_ctrl.state = FALSE; #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) -/* LGE_CHANGE_S, [hyuksang], due to power consumption, the below line is discarded to reduce 2s delay */ /* Instead of wake_lock_timeout(), use wake_lock */ // wake_lock_timeout(&wlan_host_wakelock_resume, 2*HZ); wake_lock(&wlan_host_wakelock_resume); -/* LGE_CHANGE_E, [hyuksang], due to power consumption, the below line is discarded to reduce 2s delay */ #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ dhdsdio_dpc(dhd_early_suspend_ctrl.bus); dhd_es_unlock_dhd_bus(); #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) gpio = gpio_get_value(GPIO_WLAN_HOST_WAKE); DHD_TRACE(("%s: RESUME Done gpio->%d\n", __FUNCTION__, gpio)); -/* LGE_CHANGE_S, [hyuksang], due to power consumption, the below line is discarded to reduce 2s delay */ /* Instead of wake_lock_timeout(), use wake_lock */ wake_unlock(&wlan_host_wakelock_resume); -/* LGE_CHANGE_E, [hyuksang], due to power consumption, the below line is discarded to reduce 2s delay */ #else /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ DHD_TRACE(("%s: RESUME Done\n", __FUNCTION__)); #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ @@ -427,7 +399,6 @@ return 0; } #endif /* defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #endif /* #if defined(CONFIG_HAS_EARLYSUSPEND) */ /* Interrupt enable/disable */ @@ -522,19 +493,13 @@ sd_trace(("%s Enter\n", __FUNCTION__)); #if defined(CONFIG_HAS_EARLYSUSPEND) -/* BEGIN: 0004486 mingi.sung@lge.com 2010-02-28 */ -/* ADD 0004486: [WLAN] Fix a bug - Reset when Wi-Fi turn on/off */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) dhd_enable_sdio_irq(FALSE); #endif -/* END: 0004486 mingi.sung@lge.com 2010-02-28 */ dhd_unregister_early_suspend(); -/* BEGIN: 0004486 mingi.sung@lge.com 2010-02-28 */ -/* ADD 0004486: [WLAN] Fix a bug - Reset when Wi-Fi turn on/off */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) dhd_suspend_context = TRUE; #endif -/* END: 0004486 mingi.sung@lge.com 2010-02-28 */ #endif /* defined(CONFIG_HAS_EARLYSUSPEND) */ sdio_unregister_driver(&bcmsdh_sdmmc_driver); @@ -542,21 +507,16 @@ if (gInstance) kfree(gInstance); } -/* LGE_CHANGE_S, [yoohoo@lge.com], 2010-1-13, */ #if defined(CONFIG_BRCM_LGE_WL_ARPOFFLOAD) extern int dhd_config_arp_offload(void *bus, bool flag); #endif /* CONFIG_BRCM_LGE_WL_ARPOFFLOAD */ -/* LGE_CHANGE_E, [yoohoo@lge.com], 2010-1-13, */ -/* LGE_CHANGE_S, [yoohoo@lge.com], 2010-1-13, */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) && defined(CONFIG_BRCM_LGE_WL_PKTFILTER) extern int dhdsdio_enable_filters(void *bus); extern int dhdsdio_disable_filters(void *bus); #endif /* defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) && defined(CONFIG_BRCM_LGE_WL_PKTFILTER) */ -/* LGE_CHANGE_E, [yoohoo@lge.com], 2010-1-13, */ #if defined(CONFIG_HAS_EARLYSUSPEND) -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) void dhd_early_suspend(struct early_suspend *h) { @@ -572,18 +532,14 @@ /* If chip active is done, do put the device to suspend */ del_wl_timers(); -/* LGE_CHANGE_S, [yoohoo@lge.com], 2010-1-13, */ #if defined(CONFIG_BRCM_LGE_WL_ARPOFFLOAD) /*Enable ARP Offloading*/ dhd_config_arp_offload(dhd_early_suspend_ctrl.bus , TRUE); #endif /* CONFIG_BRCM_LGE_WL_ARPOFFLOAD */ -/* LGE_CHANGE_E, [yoohoo@lge.com], 2010-1-13, */ -/* LGE_CHANGE_S, [yoohoo@lge.com], 2010-1-13, */ #if defined(CONFIG_BRCM_LGE_WL_PKTFILTER) dhdsdio_enable_filters(dhd_early_suspend_ctrl.bus); #endif /* CONFIG_BRCM_LGE_WL_PKTFILTER */ -/* LGE_CHANGE_E, [yoohoo@lge.com], 2010-1-13, */ if(dhd_suspend() < 0) { dhd_enable_sdio_irq(TRUE); /* make sure one more for testing, later */ @@ -617,29 +573,23 @@ }else printk("%s: Do not dhd_suspend mode setting.\n",__FUNCTION__); -/* LGE_CHANGE_S, [yoohoo@lge.com], 2010-1-13, */ #if defined(CONFIG_BRCM_LGE_WL_ARPOFFLOAD) /*DiSable ARP Offloading*/ dhd_config_arp_offload(dhd_early_suspend_ctrl.bus, FALSE); #endif /* CONFIG_BRCM_LGE_WL_ARPOFFLOAD */ -/* LGE_CHANGE_E, [yoohoo@lge.com], 2010-1-13, */ -/* LGE_CHANGE_S, [yoohoo@lge.com], 2010-1-13, */ #if defined (CONFIG_BRCM_LGE_WL_PKTFILTER) dhdsdio_disable_filters(dhd_early_suspend_ctrl.bus); #endif /* CONFIG_BRCM_LGE_WL_PKTFILTER */ -/* LGE_CHANGE_E, [yoohoo@lge.com], 2010-1-13, */ return; } EXPORT_SYMBOL(dhd_early_suspend); EXPORT_SYMBOL(dhd_late_resume); #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-19, Support Host Wakeup */ #if defined(CONFIG_BRCM_GPIO_INTR) -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-06, Support Host Wakeup */ #if !defined(CONFIG_LGE_BCM432X_PATCH) #define GPIO_WLAN_HOST_WAKE 0 @@ -650,7 +600,6 @@ static struct dhd_wifisleep_info *dhd_wifi_sleep; #endif /* CONFIG_LGE_BCM432X_PATCH */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-06, Support Host Wakeup */ /** * Supposed that Early Suspend/Resume is disable @@ -699,11 +648,9 @@ printk(KERN_ERR "[%s] HostWakeup Get GPIO %d: %d\n", __func__, GPIO_WLAN_HOST_WAKE, gpio); gpio_set_value(GPIO_WLAN_HOST_WAKE, 0); -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-06, Support Host Wakeup */ #if !defined(CONFIG_LGE_BCM432X_PATCH) set_irq_type(dhd_wifi_sleep->host_wake_irq, gpio ? IRQF_TRIGGER_LOW : IRQF_TRIGGER_HIGH); #endif /* CONFIG_LGE_BCM432X_PATCH */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-06, Support Host Wakeup */ if (!gpio) { DHD_INFO(("[WiFi] complete on host-wakeup \n")); @@ -733,13 +680,11 @@ printk(KERN_ERR "[yoohoo] dhd_register_hwakeup : start \n"); -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Init wakelock */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) /* wake lock initialize */ wake_lock_init(&wlan_host_wakelock, WAKE_LOCK_SUSPEND, "WLAN_HOST_WAKE"); wake_lock_init(&wlan_host_wakelock_resume, WAKE_LOCK_SUSPEND, "WLAN_HOST_WAKE_RESUME"); #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-19, Init wakelock */ ret = gpio_request(dhd_wifi_sleep->host_wake, "wifi_hostwakeup"); if (ret < 0) { @@ -748,7 +693,6 @@ return 0; } -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, Set gpio init value to zero */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) /* Set gpio init value to zero */ ret = gpio_direction_output(dhd_wifi_sleep->host_wake, 0); @@ -757,7 +701,6 @@ } //gpio_set_value(dhd_wifi_sleep->host_wake, 0); #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-19, Init wakelock */ ret = gpio_direction_input(dhd_wifi_sleep->host_wake); if (ret < 0) { @@ -772,16 +715,13 @@ return 0; } -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-06, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) ret = request_irq(dhd_wifi_sleep->host_wake_irq, dhd_hostwakeup_isr, //IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING , "wifi_hostwakeup", NULL); - IRQF_DISABLED | IRQF_TRIGGER_RISING , "wifi_hostwakeup", NULL); //jisung.yang@lge.com #else /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ ret = request_irq(dhd_wifi_sleep->host_wake_irq, dhd_hostwakeup_isr, IRQF_DISABLED | IRQF_TRIGGER_HIGH, "wifi_hostwakeup", NULL); #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-06, Support Host Wakeup */ if (ret) { DHD_ERROR(("[WiFi] Failed to get HostWakeUp IRQ \n")); free_irq(dhd_wifi_sleep->host_wake_irq, 0); @@ -793,7 +733,6 @@ printk (KERN_ERR "[yoohoo] dhd_register_hwakeup : OK\n"); } -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-11-19, set_irq_type and disable_irq */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) //set_irq_type(dhd_wifi_sleep->host_wake_irq, IRQ_TYPE_EDGE_BOTH); set_irq_type(dhd_wifi_sleep->host_wake_irq, IRQ_TYPE_EDGE_RISING); @@ -801,7 +740,6 @@ disable_irq(dhd_wifi_sleep->host_wake_irq); #endif /* CONFIG_BRCM_GPIO_INTR */ #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2009-11-19, set_irq_type and disable_irq */ return ret; } @@ -819,7 +757,6 @@ static int dhd_register_early_suspend(void) { - /* LGE_CHANGE_S [yoohoo@lge.com] 2009-01-14, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) dhd_early_suspend_ctrl.drv_loaded = TRUE; @@ -838,13 +775,11 @@ #else /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ return 0; #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2010-01-14, Support Host Wakeup */ } static void dhd_unregister_early_suspend(void) { -/* LGE_CHANGE_S [yoohoo@lge.com] 2009-01-14, Support Host Wakeup */ #if defined(CONFIG_BRCM_LGE_WL_HOSTWAKEUP) if (dhd_early_suspend_ctrl.drv_loaded == FALSE) return; @@ -862,6 +797,5 @@ #else /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ return; #endif /* CONFIG_BRCM_LGE_WL_HOSTWAKEUP */ -/* LGE_CHANGE_E [yoohoo@lge.com] 2010-01-14, Support Host Wakeup */ } #endif /* #if defined(CONFIG_HAS_EARLYSUSPEND) */