tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

b43: use correct firmware for newer cores

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Rafał Miłecki and committed by
John W. Linville e41596a1 d0ce2d17

+9 -3
+9 -3
drivers/net/wireless/b43/main.c
··· 2121 2121 filename = "ucode13"; 2122 2122 else if (rev == 14) 2123 2123 filename = "ucode14"; 2124 - else if (rev >= 15) 2124 + else if (rev == 15) 2125 2125 filename = "ucode15"; 2126 + else if ((rev >= 16) && (rev <= 20)) 2127 + filename = "ucode16_mimo"; 2126 2128 else 2127 2129 goto err_no_ucode; 2128 2130 err = b43_do_request_fw(ctx, filename, &fw->ucode); ··· 2167 2165 goto err_no_initvals; 2168 2166 break; 2169 2167 case B43_PHYTYPE_N: 2170 - if ((rev >= 11) && (rev <= 12)) 2168 + if (rev >= 16) 2169 + filename = "n0initvals16"; 2170 + else if ((rev >= 11) && (rev <= 12)) 2171 2171 filename = "n0initvals11"; 2172 2172 else 2173 2173 goto err_no_initvals; ··· 2213 2209 goto err_no_initvals; 2214 2210 break; 2215 2211 case B43_PHYTYPE_N: 2216 - if ((rev >= 11) && (rev <= 12)) 2212 + if (rev >= 16) 2213 + filename = "n0bsinitvals16"; 2214 + else if ((rev >= 11) && (rev <= 12)) 2217 2215 filename = "n0bsinitvals11"; 2218 2216 else 2219 2217 goto err_no_initvals;