From e623746dccb9a396415037a40d94c0ad0ff68fc8 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Thu, 6 Mar 2014 14:37:07 -0600 Subject: ti-compat-wireless: rename R4SP2 patch dir --- .../mt100eocg-pcie-dk/wl12xx_sdio.patch | 25 ------------ .../mt100eocg-pcie-dk/wl12xx_sdio.patch | 25 ++++++++++++ .../wl12xx-arp-reply.patch | 45 ++++++++++++++++++++++ .../wl12xx-set-power.patch | 37 ++++++++++++++++++ .../wl12xx-arp-reply.patch | 45 ---------------------- .../wl12xx-set-power.patch | 37 ------------------ 6 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch create mode 100644 multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/mt100eocg-pcie-dk/wl12xx_sdio.patch create mode 100644 multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/wl12xx-arp-reply.patch create mode 100644 multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/wl12xx-set-power.patch delete mode 100644 multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-arp-reply.patch delete mode 100644 multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-set-power.patch diff --git a/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch b/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch deleted file mode 100644 index 1b7ae64..0000000 --- a/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: compat-wireless/drivers/net/wireless/wl12xx/sdio.c -=================================================================== ---- compat-wireless.orig/drivers/net/wireless/wl12xx/sdio.c 2013-02-18 11:47:02.831869486 -0600 -+++ compat-wireless/drivers/net/wireless/wl12xx/sdio.c 2013-02-18 12:21:04.472513066 -0600 -@@ -277,14 +277,19 @@ - wl->irq = wlan_data->irq; - if (wl->ref_clock < 0) - wl->ref_clock = wlan_data->board_ref_clock; -+ -+ /* MTPCIE: force irq trigger - if (wl->tcxo_clock < 0) - wl->tcxo_clock = wlan_data->board_tcxo_clock; - wl->platform_quirks = wlan_data->platform_quirks; - - if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ) -- irqflags = IRQF_TRIGGER_RISING; -+ */ -+ irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING; -+ /* - else - irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT; -+ */ - - ret = request_threaded_irq(wl->irq, wl1271_hardirq, wl1271_irq, - irqflags, diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/mt100eocg-pcie-dk/wl12xx_sdio.patch b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/mt100eocg-pcie-dk/wl12xx_sdio.patch new file mode 100644 index 0000000..1b7ae64 --- /dev/null +++ b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/mt100eocg-pcie-dk/wl12xx_sdio.patch @@ -0,0 +1,25 @@ +Index: compat-wireless/drivers/net/wireless/wl12xx/sdio.c +=================================================================== +--- compat-wireless.orig/drivers/net/wireless/wl12xx/sdio.c 2013-02-18 11:47:02.831869486 -0600 ++++ compat-wireless/drivers/net/wireless/wl12xx/sdio.c 2013-02-18 12:21:04.472513066 -0600 +@@ -277,14 +277,19 @@ + wl->irq = wlan_data->irq; + if (wl->ref_clock < 0) + wl->ref_clock = wlan_data->board_ref_clock; ++ ++ /* MTPCIE: force irq trigger + if (wl->tcxo_clock < 0) + wl->tcxo_clock = wlan_data->board_tcxo_clock; + wl->platform_quirks = wlan_data->platform_quirks; + + if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ) +- irqflags = IRQF_TRIGGER_RISING; ++ */ ++ irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING; ++ /* + else + irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT; ++ */ + + ret = request_threaded_irq(wl->irq, wl1271_hardirq, wl1271_irq, + irqflags, diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/wl12xx-arp-reply.patch b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/wl12xx-arp-reply.patch new file mode 100644 index 0000000..ab438f0 --- /dev/null +++ b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/wl12xx-arp-reply.patch @@ -0,0 +1,45 @@ +Index: compat-wireless/drivers/net/wireless/wl12xx/cmd.c +=================================================================== +--- compat-wireless.orig/drivers/net/wireless/wl12xx/cmd.c 2012-12-31 09:58:56.746126785 -0600 ++++ compat-wireless/drivers/net/wireless/wl12xx/cmd.c 2012-12-31 10:02:03.246660822 -0600 +@@ -1214,7 +1214,7 @@ + skb_reserve(skb, sizeof(*hdr) + WL1271_EXTRA_SPACE_MAX); + + tmpl = (struct wl12xx_arp_rsp_template *)skb_put(skb, sizeof(*tmpl)); +- memset(tmpl, 0, sizeof(tmpl)); ++ memset(tmpl, 0, sizeof(*tmpl)); + + /* llc layer */ + memcpy(tmpl->llc_hdr, rfc1042_header, sizeof(rfc1042_header)); +@@ -1263,7 +1263,7 @@ + + /* mac80211 header */ + hdr = (struct ieee80211_hdr_3addr *)skb_push(skb, sizeof(*hdr)); +- memset(hdr, 0, sizeof(hdr)); ++ memset(hdr, 0, sizeof(*hdr)); + fc = IEEE80211_FTYPE_DATA | IEEE80211_FCTL_TODS; + if (wl->qos) + fc |= IEEE80211_STYPE_QOS_DATA; +Index: compat-wireless/drivers/net/wireless/wl12xx/main.c +=================================================================== +--- compat-wireless.orig/drivers/net/wireless/wl12xx/main.c 2012-12-31 09:59:00.246129356 -0600 ++++ compat-wireless/drivers/net/wireless/wl12xx/main.c 2012-12-31 10:01:26.746205394 -0600 +@@ -4142,10 +4142,14 @@ + goto out; + } + +- ret = wl1271_acx_arp_ip_filter(wl, +- (ACX_ARP_FILTER_ARP_FILTERING | +- ACX_ARP_FILTER_AUTO_ARP), +- addr); ++//Possible Firmware Issue with TI chip and Auto-ARP Response while using encryption. ++//Disabling Auto-ARP for now. ++// ret = wl1271_acx_arp_ip_filter(wl, ++// (ACX_ARP_FILTER_ARP_FILTERING | ++// ACX_ARP_FILTER_AUTO_ARP), ++// addr); ++ ret = wl1271_acx_arp_ip_filter(wl, 0, addr); ++ + } else { + wl->ip_addr = 0; + ret = wl1271_acx_arp_ip_filter(wl, 0, addr); diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/wl12xx-set-power.patch b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/wl12xx-set-power.patch new file mode 100644 index 0000000..3cd1342 --- /dev/null +++ b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-R4SP2/wl12xx-set-power.patch @@ -0,0 +1,37 @@ +Index: compat-wireless/drivers/net/wireless/wl12xx/sdio.c +=================================================================== +--- compat-wireless.orig/drivers/net/wireless/wl12xx/sdio.c ++++ compat-wireless/drivers/net/wireless/wl12xx/sdio.c +@@ -169,6 +169,10 @@ static int wl1271_sdio_power_on(struct w + struct sdio_func *func = wl_to_func(wl); + int ret; + ++ // MTS: enable chip on power on ++ if (wl->set_power) ++ wl->set_power(1); ++ + /* If enabled, tell runtime PM not to power off the card */ + if (pm_runtime_enabled(&func->dev)) { + ret = pm_runtime_get_sync(&func->dev); +@@ -193,6 +197,10 @@ static int wl1271_sdio_power_off(struct + struct sdio_func *func = wl_to_func(wl); + int ret; + ++ // MTS: disable chip on power off ++ if (wl->set_power) ++ wl->set_power(0); ++ + sdio_disable_func(func); + sdio_release_host(func); + +@@ -262,6 +270,10 @@ static int __devinit wl1271_probe(struct + goto out_free; + } + ++ // MTS: add set_power to control enable pin ++ if (wlan_data->set_power) ++ wl->set_power = wlan_data->set_power; ++ + wl->irq = wlan_data->irq; + if (wl->ref_clock < 0) + wl->ref_clock = wlan_data->board_ref_clock; diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-arp-reply.patch b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-arp-reply.patch deleted file mode 100644 index ab438f0..0000000 --- a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-arp-reply.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: compat-wireless/drivers/net/wireless/wl12xx/cmd.c -=================================================================== ---- compat-wireless.orig/drivers/net/wireless/wl12xx/cmd.c 2012-12-31 09:58:56.746126785 -0600 -+++ compat-wireless/drivers/net/wireless/wl12xx/cmd.c 2012-12-31 10:02:03.246660822 -0600 -@@ -1214,7 +1214,7 @@ - skb_reserve(skb, sizeof(*hdr) + WL1271_EXTRA_SPACE_MAX); - - tmpl = (struct wl12xx_arp_rsp_template *)skb_put(skb, sizeof(*tmpl)); -- memset(tmpl, 0, sizeof(tmpl)); -+ memset(tmpl, 0, sizeof(*tmpl)); - - /* llc layer */ - memcpy(tmpl->llc_hdr, rfc1042_header, sizeof(rfc1042_header)); -@@ -1263,7 +1263,7 @@ - - /* mac80211 header */ - hdr = (struct ieee80211_hdr_3addr *)skb_push(skb, sizeof(*hdr)); -- memset(hdr, 0, sizeof(hdr)); -+ memset(hdr, 0, sizeof(*hdr)); - fc = IEEE80211_FTYPE_DATA | IEEE80211_FCTL_TODS; - if (wl->qos) - fc |= IEEE80211_STYPE_QOS_DATA; -Index: compat-wireless/drivers/net/wireless/wl12xx/main.c -=================================================================== ---- compat-wireless.orig/drivers/net/wireless/wl12xx/main.c 2012-12-31 09:59:00.246129356 -0600 -+++ compat-wireless/drivers/net/wireless/wl12xx/main.c 2012-12-31 10:01:26.746205394 -0600 -@@ -4142,10 +4142,14 @@ - goto out; - } - -- ret = wl1271_acx_arp_ip_filter(wl, -- (ACX_ARP_FILTER_ARP_FILTERING | -- ACX_ARP_FILTER_AUTO_ARP), -- addr); -+//Possible Firmware Issue with TI chip and Auto-ARP Response while using encryption. -+//Disabling Auto-ARP for now. -+// ret = wl1271_acx_arp_ip_filter(wl, -+// (ACX_ARP_FILTER_ARP_FILTERING | -+// ACX_ARP_FILTER_AUTO_ARP), -+// addr); -+ ret = wl1271_acx_arp_ip_filter(wl, 0, addr); -+ - } else { - wl->ip_addr = 0; - ret = wl1271_acx_arp_ip_filter(wl, 0, addr); diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-set-power.patch b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-set-power.patch deleted file mode 100644 index 3cd1342..0000000 --- a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx/wl12xx-set-power.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: compat-wireless/drivers/net/wireless/wl12xx/sdio.c -=================================================================== ---- compat-wireless.orig/drivers/net/wireless/wl12xx/sdio.c -+++ compat-wireless/drivers/net/wireless/wl12xx/sdio.c -@@ -169,6 +169,10 @@ static int wl1271_sdio_power_on(struct w - struct sdio_func *func = wl_to_func(wl); - int ret; - -+ // MTS: enable chip on power on -+ if (wl->set_power) -+ wl->set_power(1); -+ - /* If enabled, tell runtime PM not to power off the card */ - if (pm_runtime_enabled(&func->dev)) { - ret = pm_runtime_get_sync(&func->dev); -@@ -193,6 +197,10 @@ static int wl1271_sdio_power_off(struct - struct sdio_func *func = wl_to_func(wl); - int ret; - -+ // MTS: disable chip on power off -+ if (wl->set_power) -+ wl->set_power(0); -+ - sdio_disable_func(func); - sdio_release_host(func); - -@@ -262,6 +270,10 @@ static int __devinit wl1271_probe(struct - goto out_free; - } - -+ // MTS: add set_power to control enable pin -+ if (wlan_data->set_power) -+ wl->set_power = wlan_data->set_power; -+ - wl->irq = wlan_data->irq; - if (wl->ref_clock < 0) - wl->ref_clock = wlan_data->board_ref_clock; -- cgit v1.2.3