Message ID | 1345277555-13013-1-git-send-email-zajec5@gmail.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
What are the prerequisite patches for this one? It seems to be based on something other than wireless-next. John On Sat, Aug 18, 2012 at 10:12:35AM +0200, Rafa? Mi?ecki wrote: > > Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> > Tested-by: Jack <x6719620@gmail.com> > --- > drivers/bcma/host_pci.c | 1 + > drivers/bcma/sprom.c | 2 ++ > 2 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c > index f7b0af7..b6b4b5e 100644 > --- a/drivers/bcma/host_pci.c > +++ b/drivers/bcma/host_pci.c > @@ -273,6 +273,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { > { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) }, > { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) }, > { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) }, > + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) }, > { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) }, > { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, > { 0, }, > diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c > index 9ea4627..0d546b6 100644 > --- a/drivers/bcma/sprom.c > +++ b/drivers/bcma/sprom.c > @@ -507,7 +507,9 @@ static bool bcma_sprom_onchip_available(struct bcma_bus *bus) > /* for these chips OTP is always available */ > present = true; > break; > + case BCMA_CHIP_ID_BCM43227: > case BCMA_CHIP_ID_BCM43228: > + case BCMA_CHIP_ID_BCM43428: > present = chip_status & BCMA_CC_CHIPST_43228_OTP_PRESENT; > break; > default: > -- > 1.7.7 > >
2012/8/22 John W. Linville <linville@tuxdriver.com>: > What are the prerequisite patches for this one? It seems to be based > on something other than wireless-next. Sorry for problem, please drop this. I'll double re-check and submit version that applies.
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index f7b0af7..b6b4b5e 100644 --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c @@ -273,6 +273,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, { 0, }, diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c index 9ea4627..0d546b6 100644 --- a/drivers/bcma/sprom.c +++ b/drivers/bcma/sprom.c @@ -507,7 +507,9 @@ static bool bcma_sprom_onchip_available(struct bcma_bus *bus) /* for these chips OTP is always available */ present = true; break; + case BCMA_CHIP_ID_BCM43227: case BCMA_CHIP_ID_BCM43228: + case BCMA_CHIP_ID_BCM43428: present = chip_status & BCMA_CC_CHIPST_43228_OTP_PRESENT; break; default: