From 517e29dc7f4631630f58c9f7195899ef0f54d94a Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Tue, 12 Feb 2013 13:59:55 -0600 Subject: linux,compat-wireless: move mt100eocg-pcie-dk patches into subdir --- .../compat-wireless/files/wl12xx_sdio.patch | 51 ---------------------- .../mt100eocg-pcie-dk/wl12xx_sdio.patch | 51 ++++++++++++++++++++++ .../linux-2.6.39.4-at91-mci-clock-debug.patch | 14 ------ .../linux-2.6.39.4-mmc-core-maxclock.patch | 28 ------------ .../linux-2.6.39.4-at91-mci-clock-debug.patch | 14 ++++++ .../linux-2.6.39.4-mmc-core-maxclock.patch | 28 ++++++++++++ 6 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 multitech/recipes/compat-wireless/files/wl12xx_sdio.patch create mode 100644 multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch delete mode 100644 multitech/recipes/linux/linux-2.6.39.4/linux-2.6.39.4-at91-mci-clock-debug.patch delete mode 100644 multitech/recipes/linux/linux-2.6.39.4/linux-2.6.39.4-mmc-core-maxclock.patch create mode 100644 multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-clock-debug.patch create mode 100644 multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mmc-core-maxclock.patch diff --git a/multitech/recipes/compat-wireless/files/wl12xx_sdio.patch b/multitech/recipes/compat-wireless/files/wl12xx_sdio.patch deleted file mode 100644 index 9db2a03..0000000 --- a/multitech/recipes/compat-wireless/files/wl12xx_sdio.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/drivers/net/wireless/wl12xx/sdio.c 2011-12-20 06:20:19.000000000 -0600 -+++ b/drivers/net/wireless/wl12xx/sdio.c 2012-06-20 12:51:18.000000000 -0500 -@@ -169,6 +169,10 @@ - struct sdio_func *func = wl_to_func(wl); - int ret; - -+ // MTPCIE: -+ 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 @@ - struct sdio_func *func = wl_to_func(wl); - int ret; - -+ // MTPCIE: -+ if (wl->set_power) -+ wl->set_power(0); -+ - sdio_disable_func(func); - sdio_release_host(func); - -@@ -265,14 +273,18 @@ - wl->irq = wlan_data->irq; - if (wl->ref_clock < 0) - wl->ref_clock = wlan_data->board_ref_clock; -- 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; -- else -- irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT; -+ // MTPCIE: -+ if (wlan_data->set_power) -+ wl->set_power = wlan_data->set_power; -+ -+ //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 | 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/mt100eocg-pcie-dk/wl12xx_sdio.patch b/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch new file mode 100644 index 0000000..9db2a03 --- /dev/null +++ b/multitech/recipes/compat-wireless/mt100eocg-pcie-dk/wl12xx_sdio.patch @@ -0,0 +1,51 @@ +--- a/drivers/net/wireless/wl12xx/sdio.c 2011-12-20 06:20:19.000000000 -0600 ++++ b/drivers/net/wireless/wl12xx/sdio.c 2012-06-20 12:51:18.000000000 -0500 +@@ -169,6 +169,10 @@ + struct sdio_func *func = wl_to_func(wl); + int ret; + ++ // MTPCIE: ++ 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 @@ + struct sdio_func *func = wl_to_func(wl); + int ret; + ++ // MTPCIE: ++ if (wl->set_power) ++ wl->set_power(0); ++ + sdio_disable_func(func); + sdio_release_host(func); + +@@ -265,14 +273,18 @@ + wl->irq = wlan_data->irq; + if (wl->ref_clock < 0) + wl->ref_clock = wlan_data->board_ref_clock; +- 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; +- else +- irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT; ++ // MTPCIE: ++ if (wlan_data->set_power) ++ wl->set_power = wlan_data->set_power; ++ ++ //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 | 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/linux/linux-2.6.39.4/linux-2.6.39.4-at91-mci-clock-debug.patch b/multitech/recipes/linux/linux-2.6.39.4/linux-2.6.39.4-at91-mci-clock-debug.patch deleted file mode 100644 index 2554386..0000000 --- a/multitech/recipes/linux/linux-2.6.39.4/linux-2.6.39.4-at91-mci-clock-debug.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: linux-2.6.39.4/drivers/mmc/host/at91_mci.c -=================================================================== ---- linux-2.6.39.4.orig/drivers/mmc/host/at91_mci.c 2012-09-10 14:29:38.217293988 -0500 -+++ linux-2.6.39.4/drivers/mmc/host/at91_mci.c 2012-09-10 14:41:35.352414089 -0500 -@@ -724,7 +724,8 @@ - else - clkdiv = (at91_master_clock / ios->clock) / 2; - -- pr_debug("clkdiv = %d. mcck = %ld\n", clkdiv, -+ pr_info("MMC: requested clock: %ld\n", ios->clock); -+ pr_info("MMC: clkdiv = %d. mcck = %ld\n", clkdiv, - at91_master_clock / (2 * (clkdiv + 1))); - } - if (ios->bus_width == MMC_BUS_WIDTH_4 && host->board->wire4) { diff --git a/multitech/recipes/linux/linux-2.6.39.4/linux-2.6.39.4-mmc-core-maxclock.patch b/multitech/recipes/linux/linux-2.6.39.4/linux-2.6.39.4-mmc-core-maxclock.patch deleted file mode 100644 index 9f8303a..0000000 --- a/multitech/recipes/linux/linux-2.6.39.4/linux-2.6.39.4-mmc-core-maxclock.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: linux-2.6.39.4/drivers/mmc/core/core.c -=================================================================== ---- linux-2.6.39.4.orig/drivers/mmc/core/core.c 2011-08-03 14:43:28.000000000 -0500 -+++ linux-2.6.39.4/drivers/mmc/core/core.c 2012-09-12 10:45:57.246686939 -0500 -@@ -46,7 +46,10 @@ - * So we allow it it to be disabled. - */ - int use_spi_crc = 1; -+/* MTPCIE: default max clock to 13MHz */ -+int max_clock = 13000000; - module_param(use_spi_crc, bool, 0); -+module_param(max_clock, int, 0); - - /* - * We normally treat cards as removed during suspend if they are not -@@ -628,6 +631,12 @@ - - if (ios->clock > 0) - mmc_set_ungated(host); -+ -+ if (max_clock > 0 && ios->clock > max_clock) { -+ ios->clock = max_clock; -+ printk("mmc: forcing clock to %u\n", ios->clock); -+ } -+ - host->ops->set_ios(host, ios); - } - diff --git a/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-clock-debug.patch b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-clock-debug.patch new file mode 100644 index 0000000..2554386 --- /dev/null +++ b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-at91-mci-clock-debug.patch @@ -0,0 +1,14 @@ +Index: linux-2.6.39.4/drivers/mmc/host/at91_mci.c +=================================================================== +--- linux-2.6.39.4.orig/drivers/mmc/host/at91_mci.c 2012-09-10 14:29:38.217293988 -0500 ++++ linux-2.6.39.4/drivers/mmc/host/at91_mci.c 2012-09-10 14:41:35.352414089 -0500 +@@ -724,7 +724,8 @@ + else + clkdiv = (at91_master_clock / ios->clock) / 2; + +- pr_debug("clkdiv = %d. mcck = %ld\n", clkdiv, ++ pr_info("MMC: requested clock: %ld\n", ios->clock); ++ pr_info("MMC: clkdiv = %d. mcck = %ld\n", clkdiv, + at91_master_clock / (2 * (clkdiv + 1))); + } + if (ios->bus_width == MMC_BUS_WIDTH_4 && host->board->wire4) { diff --git a/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mmc-core-maxclock.patch b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mmc-core-maxclock.patch new file mode 100644 index 0000000..9f8303a --- /dev/null +++ b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mmc-core-maxclock.patch @@ -0,0 +1,28 @@ +Index: linux-2.6.39.4/drivers/mmc/core/core.c +=================================================================== +--- linux-2.6.39.4.orig/drivers/mmc/core/core.c 2011-08-03 14:43:28.000000000 -0500 ++++ linux-2.6.39.4/drivers/mmc/core/core.c 2012-09-12 10:45:57.246686939 -0500 +@@ -46,7 +46,10 @@ + * So we allow it it to be disabled. + */ + int use_spi_crc = 1; ++/* MTPCIE: default max clock to 13MHz */ ++int max_clock = 13000000; + module_param(use_spi_crc, bool, 0); ++module_param(max_clock, int, 0); + + /* + * We normally treat cards as removed during suspend if they are not +@@ -628,6 +631,12 @@ + + if (ios->clock > 0) + mmc_set_ungated(host); ++ ++ if (max_clock > 0 && ios->clock > max_clock) { ++ ios->clock = max_clock; ++ printk("mmc: forcing clock to %u\n", ios->clock); ++ } ++ + host->ops->set_ios(host, ios); + } + -- cgit v1.2.3