* [PATCH 1/2] compat-wireless: add some new config options for b43 @ 2011-07-17 20:57 Hauke Mehrtens 2011-07-17 20:57 ` [PATCH 2/2] compat-wireless: deactivate sido suspend for brcmfmac on older kernels Hauke Mehrtens 0 siblings, 1 reply; 6+ messages in thread From: Hauke Mehrtens @ 2011-07-17 20:57 UTC (permalink / raw) To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- config.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/config.mk b/config.mk index 3cae526..c7ed0a0 100644 --- a/config.mk +++ b/config.mk @@ -273,6 +273,7 @@ endif #CONFIG_MAC80211_LEDS CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y # CONFIG_B43_PHY_HT=y +# CONFIG_B43_PHY_LCN=y # CONFIG_B43_FORCE_PIO=y # CONFIG_B43_DEBUG=y @@ -334,6 +335,7 @@ CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_DEBUG=y # CONFIG_B43_BCMA=y +# CONFIG_B43_BCMA_PIO=y CONFIG_P54_PCI=m -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] compat-wireless: deactivate sido suspend for brcmfmac on older kernels. 2011-07-17 20:57 [PATCH 1/2] compat-wireless: add some new config options for b43 Hauke Mehrtens @ 2011-07-17 20:57 ` Hauke Mehrtens 2011-07-18 10:42 ` Arend van Spriel 0 siblings, 1 reply; 6+ messages in thread From: Hauke Mehrtens @ 2011-07-17 20:57 UTC (permalink / raw) To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- patches/29-sdio_no_suspend.patch | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index d6a6713..e940745 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -84,3 +84,41 @@ suspend and resume that are not backported. } }; +--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c ++++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +@@ -127,7 +127,7 @@ static int brcmf_ops_sdio_probe(struct s + const struct sdio_device_id *id); + static void brcmf_ops_sdio_remove(struct sdio_func *func); + +-#ifdef CONFIG_PM ++#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int brcmf_sdio_suspend(struct device *dev); + static int brcmf_sdio_resume(struct device *dev); + #endif /* CONFIG_PM */ +@@ -157,7 +157,7 @@ static const struct sdio_device_id brcmf + { /* end: all zeroes */ }, + }; + +-#ifdef CONFIG_PM ++#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static const struct dev_pm_ops brcmf_sdio_pm_ops = { + .suspend = brcmf_sdio_suspend, + .resume = brcmf_sdio_resume, +@@ -169,7 +169,7 @@ static struct sdio_driver brcmf_sdmmc_dr + .remove = brcmf_ops_sdio_remove, + .name = "brcmfmac", + .id_table = brcmf_sdmmc_ids, +-#ifdef CONFIG_PM ++#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + .drv = { + .pm = &brcmf_sdio_pm_ops, + }, +@@ -1081,7 +1081,7 @@ static void brcmf_ops_sdio_remove(struct + } + + +-#ifdef CONFIG_PM ++#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int brcmf_sdio_suspend(struct device *dev) + { + mmc_pm_flag_t sdio_flags; -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] compat-wireless: deactivate sido suspend for brcmfmac on older kernels. 2011-07-17 20:57 ` [PATCH 2/2] compat-wireless: deactivate sido suspend for brcmfmac on older kernels Hauke Mehrtens @ 2011-07-18 10:42 ` Arend van Spriel 2011-07-18 17:36 ` [PATCH v2 " Hauke Mehrtens 0 siblings, 1 reply; 6+ messages in thread From: Arend van Spriel @ 2011-07-18 10:42 UTC (permalink / raw) To: Hauke Mehrtens Cc: mcgrof@gmail.com, lrodriguez@atheros.com, linux-wireless@vger.kernel.org On 07/17/2011 10:57 PM, Hauke Mehrtens wrote: > Signed-off-by: Hauke Mehrtens<hauke@hauke-m.de> > --- > patches/29-sdio_no_suspend.patch | 38 ++++++++++++++++++++++++++++++++++++++ > 1 files changed, 38 insertions(+), 0 deletions(-) > > diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch > index d6a6713..e940745 100644 > --- a/patches/29-sdio_no_suspend.patch > +++ b/patches/29-sdio_no_suspend.patch > @@ -84,3 +84,41 @@ suspend and resume that are not backported. > } > }; It probably is obvious but could your patch elaborate on the 'why' for this deactivation for mere mortals like me ;-) Gr. AvS -- Almost nobody dances sober, unless they happen to be insane. -- H.P. Lovecraft -- ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] compat-wireless: deactivate sido suspend for brcmfmac on older kernels. 2011-07-18 10:42 ` Arend van Spriel @ 2011-07-18 17:36 ` Hauke Mehrtens 2011-07-19 10:29 ` Arend van Spriel 2011-07-20 1:11 ` Luis R. Rodriguez 0 siblings, 2 replies; 6+ messages in thread From: Hauke Mehrtens @ 2011-07-18 17:36 UTC (permalink / raw) To: mcgrof, lrodriguez; +Cc: linux-wireless, arend, Hauke Mehrtens With this patch the build does not break any more because of this commit: commit da68c4eb258cd9f3f0b8aeb7e46b8118bb6358b6 Author: Nicolas Pitre <nico@fluxnic.net> Date: Fri Mar 5 13:43:31 2010 -0800 sdio: introduce API for special power management features This build error occurs without the patch on linux-2.6.32. /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c: In function ‘brcmf_sdio_suspend’: /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:2: error: ‘mmc_pm_flag_t’ undeclared (first use in this function) /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:2: note: each undeclared identifier is reported only once for each function it appears in /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:16: error: expected ‘;’ before ‘sdio_flags’ /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1088:2: warning: ISO C90 forbids mixed declarations and code /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1092:2: error: ‘sdio_flags’ undeclared (first use in this function) /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1092:2: error: implicit declaration of function ‘sdio_get_host_pm_caps’ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- If someone wants to backport the the SDIO API for special power management features it will be nice. patches/29-sdio_no_suspend.patch | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index d6a6713..e940745 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -84,3 +84,41 @@ suspend and resume that are not backported. } }; +--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c ++++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +@@ -127,7 +127,7 @@ static int brcmf_ops_sdio_probe(struct s + const struct sdio_device_id *id); + static void brcmf_ops_sdio_remove(struct sdio_func *func); + +-#ifdef CONFIG_PM ++#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int brcmf_sdio_suspend(struct device *dev); + static int brcmf_sdio_resume(struct device *dev); + #endif /* CONFIG_PM */ +@@ -157,7 +157,7 @@ static const struct sdio_device_id brcmf + { /* end: all zeroes */ }, + }; + +-#ifdef CONFIG_PM ++#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static const struct dev_pm_ops brcmf_sdio_pm_ops = { + .suspend = brcmf_sdio_suspend, + .resume = brcmf_sdio_resume, +@@ -169,7 +169,7 @@ static struct sdio_driver brcmf_sdmmc_dr + .remove = brcmf_ops_sdio_remove, + .name = "brcmfmac", + .id_table = brcmf_sdmmc_ids, +-#ifdef CONFIG_PM ++#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + .drv = { + .pm = &brcmf_sdio_pm_ops, + }, +@@ -1081,7 +1081,7 @@ static void brcmf_ops_sdio_remove(struct + } + + +-#ifdef CONFIG_PM ++#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int brcmf_sdio_suspend(struct device *dev) + { + mmc_pm_flag_t sdio_flags; -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] compat-wireless: deactivate sido suspend for brcmfmac on older kernels. 2011-07-18 17:36 ` [PATCH v2 " Hauke Mehrtens @ 2011-07-19 10:29 ` Arend van Spriel 2011-07-20 1:11 ` Luis R. Rodriguez 1 sibling, 0 replies; 6+ messages in thread From: Arend van Spriel @ 2011-07-19 10:29 UTC (permalink / raw) To: Hauke Mehrtens Cc: mcgrof@gmail.com, lrodriguez@atheros.com, linux-wireless@vger.kernel.org On 07/18/2011 07:36 PM, Hauke Mehrtens wrote: > With this patch the build does not break any more because of this commit: > > commit da68c4eb258cd9f3f0b8aeb7e46b8118bb6358b6 > Author: Nicolas Pitre<nico@fluxnic.net> > Date: Fri Mar 5 13:43:31 2010 -0800 > > sdio: introduce API for special power management features > > This build error occurs without the patch on linux-2.6.32. > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c: In function ‘brcmf_sdio_suspend’: > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:2: error: ‘mmc_pm_flag_t’ undeclared (first use in this function) > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:2: note: each undeclared identifier is reported only once for each function it appears in > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:16: error: expected ‘;’ before ‘sdio_flags’ > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1088:2: warning: ISO C90 forbids mixed declarations and code > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1092:2: error: ‘sdio_flags’ undeclared (first use in this function) > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1092:2: error: implicit declaration of function ‘sdio_get_host_pm_caps’ > > Signed-off-by: Hauke Mehrtens<hauke@hauke-m.de> > --- Thanks, Hauke That clarifies it. Gr. AvS -- Almost nobody dances sober, unless they happen to be insane. -- H.P. Lovecraft -- ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] compat-wireless: deactivate sido suspend for brcmfmac on older kernels. 2011-07-18 17:36 ` [PATCH v2 " Hauke Mehrtens 2011-07-19 10:29 ` Arend van Spriel @ 2011-07-20 1:11 ` Luis R. Rodriguez 1 sibling, 0 replies; 6+ messages in thread From: Luis R. Rodriguez @ 2011-07-20 1:11 UTC (permalink / raw) To: Hauke Mehrtens; +Cc: linux-wireless, arend On Mon, Jul 18, 2011 at 10:36 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote: > With this patch the build does not break any more because of this commit: > > commit da68c4eb258cd9f3f0b8aeb7e46b8118bb6358b6 > Author: Nicolas Pitre <nico@fluxnic.net> > Date: Fri Mar 5 13:43:31 2010 -0800 > > sdio: introduce API for special power management features > > This build error occurs without the patch on linux-2.6.32. > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c: In function ‘brcmf_sdio_suspend’: > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:2: error: ‘mmc_pm_flag_t’ undeclared (first use in this function) > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:2: note: each undeclared identifier is reported only once for each function it appears in > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1087:16: error: expected ‘;’ before ‘sdio_flags’ > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1088:2: warning: ISO C90 forbids mixed declarations and code > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1092:2: error: ‘sdio_flags’ undeclared (first use in this function) > /drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c:1092:2: error: implicit declaration of function ‘sdio_get_host_pm_caps’ > > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> > --- > > If someone wants to backport the the SDIO API for special power management features it will be nice. > > patches/29-sdio_no_suspend.patch | 38 ++++++++++++++++++++++++++++++++++++++ > 1 files changed, 38 insertions(+), 0 deletions(-) > thanks, applied both and pushed! Luis ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-20 1:11 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-07-17 20:57 [PATCH 1/2] compat-wireless: add some new config options for b43 Hauke Mehrtens 2011-07-17 20:57 ` [PATCH 2/2] compat-wireless: deactivate sido suspend for brcmfmac on older kernels Hauke Mehrtens 2011-07-18 10:42 ` Arend van Spriel 2011-07-18 17:36 ` [PATCH v2 " Hauke Mehrtens 2011-07-19 10:29 ` Arend van Spriel 2011-07-20 1:11 ` Luis R. Rodriguez
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).