* [PATCH] b43: Fix compilation for devices without PCI core
@ 2009-03-04 15:41 Michael Buesch
2009-03-04 16:51 ` Randy Dunlap
0 siblings, 1 reply; 2+ messages in thread
From: Michael Buesch @ 2009-03-04 15:41 UTC (permalink / raw)
To: John W Linville
Cc: bcm43xx-dev, linux-wireless, Stephen Rothwell, Randy Dunlap
This fixes compilation, if the PCI core is disabled.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
---
John, I think this is only needed for the next feature release, as the patch
that broke that was only merged for next, afaik.
Index: wireless-testing/drivers/net/wireless/b43/main.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/b43/main.c 2009-03-04 16:35:07.000000000 +0100
+++ wireless-testing/drivers/net/wireless/b43/main.c 2009-03-04 16:36:08.000000000 +0100
@@ -4176,15 +4176,17 @@ static int b43_wireless_core_init(struct
hf |= B43_HF_4318TSSI;
if (phy->radio_rev < 6)
hf |= B43_HF_VCORECALC;
}
if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
+#ifdef CONFIG_SSB_DRIVER_PCICORE
if ((bus->bustype == SSB_BUSTYPE_PCI) &&
(bus->pcicore.dev->id.revision <= 10))
hf |= B43_HF_PCISCW; /* PCI slow clock workaround. */
+#endif
hf &= ~B43_HF_SKCFPUP;
b43_hf_write(dev, hf);
b43_set_retry_limits(dev, B43_DEFAULT_SHORT_RETRY_LIMIT,
B43_DEFAULT_LONG_RETRY_LIMIT);
b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_SFFBLIM, 3);
--
Greetings, Michael.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] b43: Fix compilation for devices without PCI core
2009-03-04 15:41 [PATCH] b43: Fix compilation for devices without PCI core Michael Buesch
@ 2009-03-04 16:51 ` Randy Dunlap
0 siblings, 0 replies; 2+ messages in thread
From: Randy Dunlap @ 2009-03-04 16:51 UTC (permalink / raw)
To: Michael Buesch
Cc: John W Linville, bcm43xx-dev, linux-wireless, Stephen Rothwell
Michael Buesch wrote:
> This fixes compilation, if the PCI core is disabled.
>
> Signed-off-by: Michael Buesch <mb@bu3sch.de>
>
> ---
Ack. Thanks.
>
> John, I think this is only needed for the next feature release, as the patch
> that broke that was only merged for next, afaik.
>
> Index: wireless-testing/drivers/net/wireless/b43/main.c
> ===================================================================
> --- wireless-testing.orig/drivers/net/wireless/b43/main.c 2009-03-04 16:35:07.000000000 +0100
> +++ wireless-testing/drivers/net/wireless/b43/main.c 2009-03-04 16:36:08.000000000 +0100
> @@ -4176,15 +4176,17 @@ static int b43_wireless_core_init(struct
> hf |= B43_HF_4318TSSI;
> if (phy->radio_rev < 6)
> hf |= B43_HF_VCORECALC;
> }
> if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
> hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
> if ((bus->bustype == SSB_BUSTYPE_PCI) &&
> (bus->pcicore.dev->id.revision <= 10))
> hf |= B43_HF_PCISCW; /* PCI slow clock workaround. */
> +#endif
> hf &= ~B43_HF_SKCFPUP;
> b43_hf_write(dev, hf);
>
> b43_set_retry_limits(dev, B43_DEFAULT_SHORT_RETRY_LIMIT,
> B43_DEFAULT_LONG_RETRY_LIMIT);
> b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_SFFBLIM, 3);
>
--
~Randy
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-04 16:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-04 15:41 [PATCH] b43: Fix compilation for devices without PCI core Michael Buesch
2009-03-04 16:51 ` Randy Dunlap
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).