| commit | a921cd7c6215cef0d1c9b2522eea50ff7317f7e2 | [log] [tgz] |
|---|---|---|
| author | Daniel Mentz <danielmentz@google.com> | Fri Dec 16 15:03:46 2016 -0800 |
| committer | Daniel Mentz <danielmentz@google.com> | Tue Jan 10 10:54:03 2017 -0800 |
| tree | f61a0cde9df8c6416101d76afc5fa9ab5daa234a | |
| parent | faea4514615d440da92e60f46026b362186b6100 [diff] |
mwifiex: make Marvell 8997 work on QSR1000 Change-Id: I83c452dbe705652f375501c8b9c5eb38a1b8a4e2
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 0c7937e..b4306d3 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2783,6 +2783,10 @@ } } +#ifdef CONFIG_ARCH_QSR1000 + pdev->irq = 28; +#endif + if (pci_enable_msi(pdev) != 0) pci_disable_msi(pdev); else
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h index 2592e63..b07333b 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.h +++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -258,7 +258,11 @@ .fw_dump_end = 0xcff, .fw_dump_host_ready = 0xcc, .fw_dump_read_done = 0xdd, +#ifdef CONFIG_ARCH_QSR1000 + .msix_support = 0, +#else .msix_support = 1, +#endif }; static struct memory_type_mapping mem_type_mapping_tbl_w8897[] = {