Skip to content

Commit c5951e7

Browse files
committed
Merge tag 'mips_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS changes from Paul Burton: "Nothing too big or scary in here: - Support mremap() for the VDSO, primarily to allow CRIU to restore the VDSO to its checkpointed location. - Restore the MIPS32 cBPF JIT, after having reverted the enablement of the eBPF JIT for MIPS32 systems in the 5.5 cycle. - Improve cop0 counter synchronization behaviour whilst onlining CPUs by running with interrupts disabled. - Better match FPU behaviour when emulating multiply-accumulate instructions on pre-r6 systems that implement IEEE754-2008 style MACs. - Loongson64 kernels now build using the MIPS64r2 ISA, allowing them to take advantage of instructions introduced by r2. - Support for the Ingenic X1000 SoC & the really nice little CU Neo development board that's using it. - Support for WMAC on GARDENA Smart Gateway devices. - Lots of cleanup & refactoring of SGI IP27 (Origin 2*) support in preparation for introducing IP35 (Origin 3*) support. - Various Kconfig & Makefile cleanups" * tag 'mips_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (60 commits) MIPS: PCI: Add detection of IOC3 on IO7, IO8, IO9 and Fuel MIPS: Loongson64: Disable exec hazard MIPS: Loongson64: Bump ISA level to MIPSR2 MIPS: Make DIEI support as a config option MIPS: OCTEON: octeon-irq: fix spelling mistake "to" -> "too" MIPS: asm: local: add barriers for Loongson MIPS: Loongson64: Select mac2008 only feature MIPS: Add MAC2008 Support Revert "MIPS: Add custom serial.h with BASE_BAUD override for generic kernel" MIPS: sort MIPS and MIPS_GENERIC Kconfig selects alphabetically (again) MIPS: make CPU_HAS_LOAD_STORE_LR opt-out MIPS: generic: don't unconditionally select PINCTRL MIPS: don't explicitly select LIBFDT in Kconfig MIPS: sync-r4k: do slave counter synchronization with disabled HW interrupts MIPS: SGI-IP30: Check for valid pointer before using it MIPS: syscalls: fix indentation of the 'SYSNR' message MIPS: boot: fix typo in 'vmlinux.lzma.its' target MIPS: fix indentation of the 'RELOCS' message dt-bindings: Document loongson vendor-prefix MIPS: CU1000-Neo: Refresh defconfig to support HWMON and WiFi. ...
2 parents b7e573b + 2c42887 commit c5951e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+3888
-1239
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mips/ingenic/devices.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ingenic XBurst based Platforms Device Tree Bindings
8+
9+
maintainers:
10+
- 周琰杰 (Zhou Yanjie) <[email protected]>
11+
description: |
12+
Devices with a Ingenic XBurst CPU shall have the following properties.
13+
14+
properties:
15+
$nodename:
16+
const: '/'
17+
compatible:
18+
oneOf:
19+
20+
- description: Qi Hardware Ben NanoNote
21+
items:
22+
- const: qi,lb60
23+
24+
- description: Game Consoles Worldwide GCW Zero
25+
items:
26+
- const: gcw,zero
27+
28+
- description: MIPS Creator CI20
29+
items:
30+
- const: img,ci20
31+
32+
- description: YSH & ATIL General Board CU Neo
33+
items:
34+
- const: yna,cu1000-neo
35+
...

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,8 @@ patternProperties:
555555
description: Logic PD, Inc.
556556
"^longcheer,.*":
557557
description: Longcheer Technology (Shanghai) Co., Ltd.
558+
"^loongson,.*":
559+
description: Loongson Technology Corporation Limited
558560
"^lsi,.*":
559561
description: LSI Corp. (LSI Logic)
560562
"^lwn,.*":
@@ -1084,6 +1086,8 @@ patternProperties:
10841086
description: Shenzhen Xunlong Software CO.,Limited
10851087
"^xylon,.*":
10861088
description: Xylon
1089+
"^yna,.*":
1090+
description: YSH & ATIL
10871091
"^yones-toptech,.*":
10881092
description: Yones Toptech Co., Ltd.
10891093
"^ysoft,.*":

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11116,7 +11116,6 @@ F: drivers/usb/image/microtek.*
1111611116
MIPS
1111711117
M: Ralf Baechle <[email protected]>
1111811118
M: Paul Burton <[email protected]>
11119-
M: James Hogan <[email protected]>
1112011119
1112111120
W: http://www.linux-mips.org/
1112211121
T: git git://git.linux-mips.org/pub/scm/ralf/linux.git

0 commit comments

Comments
 (0)