Commit 2981dcf3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Paul Burton:
 "The main MIPS changes for 5.5:

   - Atomics-related code sees some rework & cleanup, most notably
     allowing Loongson LL/SC errata workarounds to be more bulletproof &
     their correctness to be checked at build time.

   - Command line setup code is simplified somewhat, resolving various
     corner cases.

   - MIPS kernels can now be built with kcov code coverage support.

   - We can now build with CONFIG_FORTIFY_SOURCE=y.

   - Miscellaneous cleanups.

  And some platform specific changes:

   - We now disable some broken TLB functionality on certain Ingenic
     systems, and JZ4780 systems gain some devicetree nodes to support
     more devices.

   - Loongson support sees a number of cleanups, and we gain initial
     support for Loongson 3A R4 systems.

   - We gain support for MediaTek MT7688-based GARDENA Smart Gateway
     systems.

   - SGI IP27 (Origin 2*) see a number of fixes, cleanups &
     simplifications.

   - SGI IP30 (Octane) systems are now supported"

* tag 'mips_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (107 commits)
  MIPS: SGI-IP27: Enable ethernet phy on second Origin 200 module
  MIPS: PCI: Fix fake subdevice ID for IOC3
  MIPS: Ingenic: Disable abandoned HPTLB function.
  MIPS: PCI: remember nasid changed by set interrupt affinity
  MIPS: SGI-IP27: Fix crash, when CPUs are disabled via nr_cpus parameter
  mips: add support for folded p4d page tables
  mips: drop __pXd_offset() macros that duplicate pXd_index() ones
  mips: fix build when "48 bits virtual memory" is enabled
  MIPS: math-emu: Reuse name array in debugfs_fpuemu()
  MIPS: allow building with kcov coverage
  MIPS: Loongson64: Drop setup_pcimap
  MIPS: Loongson2ef: Convert to early_printk_8250
  MIPS: Drop CPU_SUPPORTS_UNCACHED_ACCELERATED
  MIPS: Loongson{2ef, 32, 64} convert to generic fw cmdline
  MIPS: Drop pmon.h
  MIPS: Loongson: Unify LOONGSON3/LOONGSON64 Kconfig usage
  MIPS: Loongson: Rename LOONGSON1 to LOONGSON32
  MIPS: Loongson: Fix return value of loongson_hwmon_init
  MIPS: add support for SGI Octane (IP30)
  MIPS: PCI: make phys_to_dma/dma_to_phys for pci-xtalk-bridge common
  ...
parents 5ef30d74 a8d0f11e

Documentation/devicetree/bindings/mips/ralink.txt

+14 −0
Original line number Diff line number Diff line
@@ -16,3 +16,17 @@ value must be one of the following values: 
  ralink,mt7620a-soc

  ralink,mt7620n-soc

  ralink,mt7628a-soc

  ralink,mt7688a-soc



2. Boards



GARDENA smart Gateway (MT7688)



This board is based on the MediaTek MT7688 and equipped with 128 MiB

of DDR and 8 MiB of flash (SPI NOR) and additional 128MiB SPI NAND

storage.



------------------------------

Required root node properties:

- compatible = "gardena,smart-gateway-mt7688", "ralink,mt7688a-soc",

		"ralink,mt7628a-soc";

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -343,6 +343,8 @@ patternProperties: 
    description: Freescale Semiconductor

  "^fujitsu,.*":

    description: Fujitsu Ltd.

  "^gardena,.*":

    description: GARDENA GmbH

  "^gateworks,.*":

    description: Gateworks Corporation

  "^gcw,.*":

Documentation/driver-api/nvmem.rst

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ To facilitate such consumers NVMEM framework provides below apis:: 
  struct nvmem_device *nvmem_device_get(struct device *dev, const char *name);

  struct nvmem_device *devm_nvmem_device_get(struct device *dev,

					   const char *name);

  struct nvmem_device *nvmem_device_find(void *data,

			int (*match)(struct device *dev, const void *data));

  void nvmem_device_put(struct nvmem_device *nvmem);

  int nvmem_device_read(struct nvmem_device *nvmem, unsigned int offset,

		      size_t bytes, void *buf);

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -10900,18 +10900,18 @@ F: arch/mips/include/asm/mach-loongson32/ 
F:	drivers/*/*loongson1*

F:	drivers/*/*/*loongson1*













MIPS/LOONGSON2 ARCHITECTURE













MIPS/LOONGSON2EF ARCHITECTURE















M:	Jiaxun Yang <jiaxun.yang@flygoat.com>















L:	linux-mips@vger.kernel.org















S:	Maintained













F:	arch/mips/loongson64/fuloong-2e/













F:	arch/mips/loongson64/lemote-2f/













F:	arch/mips/include/asm/mach-loongson64/













F:	arch/mips/loongson2ef/













F:	arch/mips/include/asm/mach-loongson2ef/















F:	drivers/*/*loongson2*















F:	drivers/*/*/*loongson2*



























MIPS/LOONGSON3 ARCHITECTURE













MIPS/LOONGSON64 ARCHITECTURE















M:	Huacai Chen <chenhc@lemote.com>













M:	Jiaxun Yang <jiaxun.yang@flygoat.com>















L:	linux-mips@vger.kernel.org















S:	Maintained















F:	arch/mips/loongson64/

































arch/mips/Kbuild.platforms



+2
−0






























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@ platforms += jazz













platforms += jz4740















platforms += lantiq















platforms += lasat













platforms += loongson2ef















platforms += loongson32















platforms += loongson64















platforms += mti-malta









@@ -30,6 +31,7 @@ platforms += ralink













platforms += rb532















platforms += sgi-ip22















platforms += sgi-ip27













platforms += sgi-ip30















platforms += sgi-ip32















platforms += sibyte















platforms += sni









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE