From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Sep 2019 16:30:30 +0000 (-0700)
Subject: Merge tag 'mips_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
X-Git-Tag: v5.15~5455
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c6bd5de3c2e5bc8a17451e281ed2613375a7fd5;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mips_5.4' of git://git./linux/kernel/git/mips/linux

Pull MIPS updates from Paul Burton:
 "Main MIPS changes:

   - boot_mem_map is removed, providing a nice cleanup made possible by
     the recent removal of bootmem.

   - Some fixes to atomics, in general providing compiler barriers for
     smp_mb__{before,after}_atomic plus fixes specific to Loongson CPUs
     or MIPS32 systems using cmpxchg64().

   - Conversion to the new generic VDSO infrastructure courtesy of
     Vincenzo Frascino.

   - Removal of undefined behavior in set_io_port_base(), fixing the
     behavior of some MIPS kernel configurations when built with recent
     clang versions.

   - Initial MIPS32 huge page support, functional on at least Ingenic
     SoCs.

   - pte_special() is now supported for some configurations, allowing
     among other things generic fast GUP to be used.

   - Miscellaneous fixes & cleanups.

  And platform specific changes:

   - Major improvements to Ingenic SoC support from Paul Cercueil,
     mostly enabled by the inclusion of the new TCU (timer-counter unit)
     drivers he's spent a very patient year or so working on. Plus some
     fixes for X1000 SoCs from Zhou Yanjie.

   - Netgear R6200 v1 systems are now supported by the bcm47xx platform.

   - DT updates for BMIPS, Lantiq & Microsemi Ocelot systems"

* tag 'mips_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (89 commits)
  MIPS: Detect bad _PFN_SHIFT values
  MIPS: Disable pte_special() for MIPS32 with RiXi
  MIPS: ralink: deactivate PCI support for SOC_MT7621
  mips: compat: vdso: Use legacy syscalls as fallback
  MIPS: Drop Loongson _CACHE_* definitions
  MIPS: tlbex: Remove cpu_has_local_ebase
  MIPS: tlbex: Simplify r3k check
  MIPS: Select R3k-style TLB in Kconfig
  MIPS: PCI: refactor ioc3 special handling
  mips: remove ioremap_cachable
  mips/atomic: Fix smp_mb__{before,after}_atomic()
  mips/atomic: Fix loongson_llsc_mb() wreckage
  mips/atomic: Fix cmpxchg64 barriers
  MIPS: Octeon: remove duplicated include from dma-octeon.c
  firmware: bcm47xx_nvram: Allow COMPILE_TEST
  firmware: bcm47xx_nvram: Correct size_t printf format
  MIPS: Treat Loongson Extensions as ASEs
  MIPS: Remove dev_err() usage after platform_get_irq()
  MIPS: dts: mscc: describe the PTP ready interrupt
  MIPS: dts: mscc: describe the PTP register range
  ...
---

5c6bd5de3c2e5bc8a17451e281ed2613375a7fd5
diff --cc Documentation/index.rst
index b5fd87e,87214fe..b843e31
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -144,16 -138,12 +144,15 @@@ implementation
  .. toctree::
     :maxdepth: 2
  
--   sh/index
     arm/index
     arm64/index
     ia64/index
     m68k/index
-    powerpc/index
     mips/index
 +   nios2/nios2
 +   openrisc/index
 +   parisc/index
++   powerpc/index
     riscv/index
     s390/index
     sh/index
diff --cc Documentation/mips/index.rst
index fd9023c,321b479..a93c2f6
--- a/Documentation/mips/index.rst
+++ b/Documentation/mips/index.rst
@@@ -1,17 -1,11 +1,20 @@@
  .. SPDX-License-Identifier: GPL-2.0
  
- =================
- MIPS architecture
- =================
+ ===========================
+ MIPS-specific Documentation
+ ===========================
  
  .. toctree::
 -   :maxdepth: 1
 +   :maxdepth: 2
+    :numbered:
+ 
+    ingenic-tcu
 +
 +   au1xxx_ide
 +
 +.. only::  subproject and html
 +
 +   Indices
 +   =======
 +
 +   * :ref:`genindex`
diff --cc arch/mips/Kconfig
index 904c096,2f7c050..cc8e2b1
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -43,8 -44,7 +44,8 @@@ config MIP
  	select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
  	select HAVE_ARCH_SECCOMP_FILTER
  	select HAVE_ARCH_TRACEHOOK
- 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
+ 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
 +	select HAVE_ASM_MODVERSIONS
  	select HAVE_EBPF_JIT if (!CPU_MICROMIPS)
  	select HAVE_CONTEXT_TRACKING
  	select HAVE_COPY_THREAD_TLS
diff --cc drivers/video/fbdev/Makefile
index aab7155,49502d6..aa63527
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@@ -116,7 -116,7 +116,6 @@@ obj-y                             += om
  obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
  obj-$(CONFIG_FB_CARMINE)          += carminefb.o
  obj-$(CONFIG_FB_MB862XX)	  += mb862xx/
- obj-$(CONFIG_FB_JZ4740)		  += jz4740_fb.o
 -obj-$(CONFIG_FB_NUC900)           += nuc900fb.o
  obj-$(CONFIG_FB_PUV3_UNIGFX)      += fb-puv3.o
  obj-$(CONFIG_FB_HYPERV)		  += hyperv_fb.o
  obj-$(CONFIG_FB_OPENCORES)	  += ocfb.o