diff options
| author | Paul Burton <paul.burton@mips.com> | 2019-04-09 16:19:48 -0700 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2019-04-09 16:21:13 -0700 |
| commit | ec86e545c19a5d7364b6da06dd755d43d130bf4f (patch) | |
| tree | 25315bf12649fe91c3f51563ff4bc56c75c4814c /arch/mips/bcm47xx | |
| parent | e6046b5e69a070f8a1af868bba788cf796bcd9a8 (diff) | |
| parent | f6cab793d4a70808e4946baa8f5df4ea9adacc82 (diff) | |
| download | linux-ec86e545c19a5d7364b6da06dd755d43d130bf4f.tar.bz2 | |
Merge tag 'mips_fixes_5.1_1' into mips-next
A small batch of MIPS fixes for 5.1:
- An interrupt masking fix for Loongson-based Lemote 2F systems (fixing
a regression from v3.19).
- A relocation fix for configurations in which the devicetree is stored
in an ELF section (fixing a regression from v4.7).
- Fix jump labels for MIPSr6 kernels where they previously could
inadvertently place a control transfer instruction in a forbidden slot
& take unexpected exceptions (fixing MIPSr6 support added in v4.0).
- Extend an existing USB power workaround for the Netgear WNDR3400 to v2
boards in addition to the v3 ones that already used it.
- Remove the custom MIPS32 definition of __kernel_fsid_t to make it
consistent with MIPS64 & every other architecture, in particular
resolving issues for code which tries to print the val field whose
type previously differed (though had identical memory layout).
Merged into mips-next to gain the MIPSr6 jump label fix before enabling
jump labels by default for generic kernel builds.
Signed-off-by: Paul Burton <paul.burton@mips.com>
Diffstat (limited to 'arch/mips/bcm47xx')
| -rw-r--r-- | arch/mips/bcm47xx/workarounds.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/workarounds.c b/arch/mips/bcm47xx/workarounds.c index 46eddbec8d9f..0ab95dd431b3 100644 --- a/arch/mips/bcm47xx/workarounds.c +++ b/arch/mips/bcm47xx/workarounds.c @@ -24,6 +24,7 @@ void __init bcm47xx_workarounds(void) case BCM47XX_BOARD_NETGEAR_WNR3500L: bcm47xx_workarounds_enable_usb_power(12); break; + case BCM47XX_BOARD_NETGEAR_WNDR3400V2: case BCM47XX_BOARD_NETGEAR_WNDR3400_V3: bcm47xx_workarounds_enable_usb_power(21); break; |