Commit d77771c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Thomas Bogendoerfer:

 - added support for Netgear WNR3500L v2

 - removed support for VR41xx SoC and platforms based on it

 - cleanups and fixes

* tag 'mips_6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (25 commits)
  MIPS: tlbex: Explicitly compare _PAGE_NO_EXEC against 0
  Revert "MIPS: octeon: Remove vestiges of CONFIG_CAVIUM_RESERVE32"
  MIPS: Introduce CAVIUM_RESERVE32 Kconfig option
  MIPS: msi-octeon: eliminate kernel-doc warnings
  MIPS: Fix comment typo
  MIPS: BMIPS: Utilize cfe_die() for invalid DTB
  MIPS: CFE: Add cfe_die()
  MIPS: Fixed __debug_virt_addr_valid()
  MIPS: BCM47XX: Add support for Netgear WNR3500L v2
  MIPS: Remove VR41xx support
  MIPS: dts: align gpio-key node names with dtschema
  MIPS: dts: correct gpio-keys names and properties
  MIPS: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK
  MIPS: Make phys_to_virt utilize __va()
  MIPS: vdso: Utilize __pa() for gic_pfn
  MIPS: mm: Use the bitmap API to allocate bitmaps
  MIPS: math-emu: Use the bitmap API to allocate bitmaps
  MIPS: Loongson64: Fix section mismatch warning
  mips: cavium-octeon: Fix missing of_node_put() in octeon2_usb_clocks_start
  MIPS: mscc: ocelot: enable FDMA usage
  ...
parents cae4199f 74de14fe

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13613,6 +13613,7 @@ F: Documentation/devicetree/bindings/mips/ 
F:	Documentation/mips/

F:	arch/mips/

F:	drivers/platform/mips/

F:	include/dt-bindings/mips/









MIPS BOSTON DEVELOPMENT BOARD









M:	Paul Burton <paulburton@kernel.org>
































arch/mips/Kbuild.platforms



+0
−1






























Original line number
Diff line number
Diff line







@@ -33,7 +33,6 @@ platform-$(CONFIG_SIBYTE_BCM1x55)	+= sibyte/







platform-$(CONFIG_SIBYTE_BCM1x80)	+= sibyte/









platform-$(CONFIG_SNI_RM)		+= sni/









platform-$(CONFIG_MACH_TX49XX)		+= txx9/









platform-$(CONFIG_MACH_VR41XX)		+= vr41xx/



















# include the platform specific files









include $(patsubst %/, $(srctree)/arch/mips/%/Platform, $(platform-y))
























arch/mips/Kconfig



+1
−23






























Original line number
Diff line number
Diff line







@@ -293,6 +293,7 @@ config BMIPS_GENERIC







	select HARDIRQS_SW_RESEND









	select HAVE_PCI









	select PCI_DRIVERS_GENERIC









	select FW_CFE









	help









	  Build a generic DT-based kernel image that boots on select









	  BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top








@@ -587,14 +588,6 @@ config MACH_PIC32







	  Microchip PIC32 is a family of general-purpose 32 bit MIPS core









	  microcontrollers.



















config MACH_VR41XX









	bool "NEC VR4100 series based machines"









	select CEVT_R4K









	select CSRC_R4K









	select SYS_HAS_CPU_VR41XX









	select SYS_SUPPORTS_MIPS16









	select GPIOLIB



















config MACH_NINTENDO64









	bool "Nintendo 64 console"









	select CEVT_R4K








@@ -1011,7 +1004,6 @@ source "arch/mips/ralink/Kconfig"







source "arch/mips/sgi-ip27/Kconfig"









source "arch/mips/sibyte/Kconfig"









source "arch/mips/txx9/Kconfig"









source "arch/mips/vr41xx/Kconfig"









source "arch/mips/cavium-octeon/Kconfig"









source "arch/mips/loongson2ef/Kconfig"









source "arch/mips/loongson32/Kconfig"








@@ -1578,17 +1570,6 @@ config CPU_R3000







	  might be a safe bet.  If the resulting kernel does not work,









	  try to recompile with R3000.



















config CPU_VR41XX









	bool "R41xx"









	depends on SYS_HAS_CPU_VR41XX









	select CPU_SUPPORTS_32BIT_KERNEL









	select CPU_SUPPORTS_64BIT_KERNEL









	help









	  The options selects support for the NEC VR4100 series of processors.









	  Only choose this option if you have one of these processors as a









	  kernel built with this option will not run on any other type of









	  processor or vice versa.



















config CPU_R4300









	bool "R4300"









	depends on SYS_HAS_CPU_R4300








@@ -1904,9 +1885,6 @@ config SYS_HAS_CPU_P5600







config SYS_HAS_CPU_R3000









	bool



















config SYS_HAS_CPU_VR41XX









	bool



















config SYS_HAS_CPU_R4300









	bool










































arch/mips/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -159,7 +159,6 @@ cflags-y += $(call as-option,-Wa$(comma)-mno-fix-loongson3-llsc,)







#









cflags-$(CONFIG_CPU_R3000)	+= -march=r3000









cflags-$(CONFIG_CPU_R4300)	+= -march=r4300 -Wa,--trap









cflags-$(CONFIG_CPU_VR41XX)	+= -march=r4100 -Wa,--trap









cflags-$(CONFIG_CPU_R4X00)	+= -march=r4600 -Wa,--trap









cflags-$(CONFIG_CPU_TX49XX)	+= -march=r4600 -Wa,--trap









cflags-$(CONFIG_CPU_MIPS32_R1)	+= -march=mips32 -Wa,--trap
































arch/mips/alchemy/devboards/pm.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -17,7 +17,7 @@







 * Generic suspend userspace interface for Alchemy development boards.









 * This code exports a few sysfs nodes under /sys/power/db1x/ which









 * can be used by userspace to en/disable all au1x-provided wakeup









 * sources and configure the timeout after which the the TOYMATCH2 irq









 * sources and configure the timeout after which the TOYMATCH2 irq









 * is to trigger a wakeup.









 */