From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Jan 2019 20:48:25 +0000 (-0800)
Subject: Merge tag 'mips_fixes_4.21_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips... 
X-Git-Tag: v5.4.17~4434
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=47f3f4eb7834ea424b0704bffd0d3e3c8ffbc3a1;p=arm%2Flinux.git

Merge tag 'mips_fixes_4.21_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Paul Burton:
 "A few early MIPS fixes for 4.21:

   - The Broadcom BCM63xx platform sees a fix for resetting the BCM6368
     ethernet switch, and the removal of a platform device we've never
     had a driver for.

   - The Alchemy platform sees a few fixes for bitrot that occurred
     within the past few cycles.

   - We now enable vectored interrupt support for the MediaTek MT7620
     SoC, which makes sense since they're supported by the SoC but in
     this case also works around a bug relating to the location of
     exception vectors when using a recent version of U-Boot.

   - The atomic64_fetch_*_relaxed() family of functions see a fix for a
     regression in MIPS64 kernels since v4.19.

   - Cavium Octeon III CN7xxx systems will now disable their RGMII
     interfaces rather than attempt to enable them & warn about the lack
     of support for doing so, as they did since initial CN7xxx ethernet
     support was added in v4.7.

   - The Microsemi/Microchip MSCC SoCs gain a MAINTAINERS entry.

   - .mailmap now provides consistency for Dengcheng Zhu's name &
     current email address"

* tag 'mips_fixes_4.21_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: OCTEON: mark RGMII interface disabled on OCTEON III
  MIPS: Fix a R10000_LLSC_WAR logic in atomic.h
  MIPS: BCM63XX: drop unused and broken DSP platform device
  mailmap: Update name spelling and email for Dengcheng Zhu
  MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8
  MAINTAINERS: Add a maintainer for MSCC MIPS SoCs
  MIPS: Alchemy: update dma masks for devboard devices
  MIPS: Alchemy: update cpu-feature-overrides
  MIPS: Alchemy: drop DB1000 IrDA support bits
  MIPS: alchemy: cpu_all_mask is forbidden for clock event devices
  MIPS: BCM63XX: fix switch core reset on BCM6368
---

47f3f4eb7834ea424b0704bffd0d3e3c8ffbc3a1
diff --cc MAINTAINERS
index 58551782e960,50223cba6ddb..5a0d1d4a905d
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10016,8 -9801,9 +10016,9 @@@ F:	drivers/dma/at_xdmac.
  
  MICROSEMI MIPS SOCS
  M:	Alexandre Belloni <alexandre.belloni@bootlin.com>
+ M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 -L:	linux-mips@linux-mips.org
 +L:	linux-mips@vger.kernel.org
- S:	Maintained
+ S:	Supported
  F:	arch/mips/generic/board-ocelot.c
  F:	arch/mips/configs/generic/board-ocelot.config
  F:	arch/mips/boot/dts/mscc/
diff --cc arch/mips/ralink/Kconfig
index 4c8006b4a5f7,613d61763433..49c22ddd9c41
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@@ -38,7 -38,8 +38,8 @@@ choic
  
  	config SOC_MT7620
  		bool "MT7620/8"
+ 		select CPU_MIPSR2_IRQ_VI
 -		select HW_HAS_PCI
 +		select HAVE_PCI
  
  	config SOC_MT7621
  		bool "MT7621"