Skip to content

Commit b775d6c

Browse files
torvaldstorvalds
committed
Merge tag 'mips_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer: - add support for TP-Link HC220 G5 v1 - add support for Wifi/Bluetooth on CI20 - rework Ralink clock and reset handling - cleanups and fixes * tag 'mips_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (58 commits) MIPS: Loongson64: DTS: Add RTC support to Loongson-2K1000 MIPS: Loongson64: DTS: Add RTC support to LS7A PCH MIPS: OCTEON: octeon-usb: cleanup divider calculation MIPS: OCTEON: octeon-usb: introduce dwc3_octeon_{read,write}q MIPS: OCTEON: octeon-usb: move gpio config to separate function MIPS: OCTEON: octeon-usb: use bitfields for shim register MIPS: OCTEON: octeon-usb: use bitfields for host config register MIPS: OCTEON: octeon-usb: use bitfields for control register MIPS: OCTEON: octeon-usb: add all register offsets mips: ralink: match all supported system controller compatible strings MIPS: dec: prom: Address -Warray-bounds warning MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts clk: ralink: mtmips: Fix uninitialized use of ret in mtmips_register_{fixed,factor}_clocks() mips: ralink: introduce commonly used remap node function mips: pci-mt7620: use dev_info() to log PCIe device detection result mips: pci-mt7620: do not print NFTS register value as error log MAINTAINERS: add Mediatek MTMIPS Clock maintainer mips: ralink: get cpu rate from new driver code mips: ralink: remove reset related code mips: ralink: mt7620: remove clock related code ...
2 parents 18f38fe + e47084e commit b775d6c

56 files changed

Lines changed: 2093 additions & 1137 deletions

Some content is hidden

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

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3716,8 +3716,8 @@
37163716

37173717
nohibernate [HIBERNATION] Disable hibernation and resume.
37183718

3719-
nohlt [ARM,ARM64,MICROBLAZE,SH] Forces the kernel to busy wait
3720-
in do_idle() and not use the arch_cpu_idle()
3719+
nohlt [ARM,ARM64,MICROBLAZE,MIPS,SH] Forces the kernel to
3720+
busy wait in do_idle() and not use the arch_cpu_idle()
37213721
implementation; requires CONFIG_GENERIC_IDLE_POLL_SETUP
37223722
to be effective. This is useful on platforms where the
37233723
sleep(SH) or wfi(ARM,ARM64) instructions do not work
@@ -3852,7 +3852,7 @@
38523852
nosmp [SMP] Tells an SMP kernel to act as a UP kernel,
38533853
and disable the IO APIC. legacy for "maxcpus=0".
38543854

3855-
nosmt [KNL,S390] Disable symmetric multithreading (SMT).
3855+
nosmt [KNL,MIPS,S390] Disable symmetric multithreading (SMT).
38563856
Equivalent to smt=1.
38573857

38583858
[KNL,X86] Disable symmetric multithreading (SMT).
@@ -5770,7 +5770,7 @@
57705770
1: Fast pin select (default)
57715771
2: ATC IRMode
57725772

5773-
smt= [KNL,S390] Set the maximum number of threads (logical
5773+
smt= [KNL,MIPS,S390] Set the maximum number of threads (logical
57745774
CPUs) to use per physical CPU on systems capable of
57755775
symmetric multithreading (SMT). Will be capped to the
57765776
actual hardware limit.

‎Documentation/devicetree/bindings/clock/mediatek,mtmips-sysc.yaml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/mediatek,mtmips-sysc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MTMIPS SoCs System Controller
8+
9+
maintainers:
10+
- Sergio Paracuellos <sergio.paracuellos@gmail.com>
11+
12+
description: |
13+
MediaTek MIPS and Ralink SoCs provides a system controller to allow
14+
to access to system control registers. These registers include clock
15+
and reset related ones so this node is both clock and reset provider
16+
for the rest of the world.
17+
18+
These SoCs have an XTAL from where the cpu clock is
19+
provided as well as derived clocks for the bus and the peripherals.
20+
21+
properties:
22+
compatible:
23+
items:
24+
- enum:
25+
- ralink,mt7620-sysc
26+
- ralink,mt7628-sysc
27+
- ralink,mt7688-sysc
28+
- ralink,rt2880-sysc
29+
- ralink,rt3050-sysc
30+
- ralink,rt3052-sysc
31+
- ralink,rt3352-sysc
32+
- ralink,rt3883-sysc
33+
- ralink,rt5350-sysc
34+
- const: syscon
35+
36+
reg:
37+
maxItems: 1
38+
39+
'#clock-cells':
40+
description:
41+
The first cell indicates the clock number.
42+
const: 1
43+
44+
'#reset-cells':
45+
description:
46+
The first cell indicates the reset bit within the register.
47+
const: 1
48+
49+
required:
50+
- compatible
51+
- reg
52+
- '#clock-cells'
53+
- '#reset-cells'
54+
55+
additionalProperties: false
56+
57+
examples:
58+
- |
59+
syscon@0 {
60+
compatible = "ralink,rt5350-sysc", "syscon";
61+
reg = <0x0 0x100>;
62+
#clock-cells = <1>;
63+
#reset-cells = <1>;
64+
};

‎Documentation/devicetree/bindings/mips/ralink.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ properties:
8080
- enum:
8181
- gnubee,gb-pc1
8282
- gnubee,gb-pc2
83+
- tplink,hc220-g5-v1
8384
- const: mediatek,mt7621-soc
8485

8586
additionalProperties: true

‎MAINTAINERS‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11442,7 +11442,6 @@ F: tools/testing/selftests/kvm/aarch64/
1144211442

1144311443
KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
1144411444
M: Huacai Chen <chenhuacai@kernel.org>
11445-
M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
1144611445
L: linux-mips@vger.kernel.org
1144711446
L: kvm@vger.kernel.org
1144811447
S: Maintained
@@ -13331,6 +13330,12 @@ S: Maintained
1333113330
F: Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
1333213331
F: drivers/i2c/busses/i2c-mt7621.c
1333313332

13333+
MEDIATEK MTMIPS CLOCK DRIVER
13334+
M: Sergio Paracuellos <sergio.paracuellos@gmail.com>
13335+
S: Maintained
13336+
F: Documentation/devicetree/bindings/clock/mediatek,mtmips-sysc.yaml
13337+
F: drivers/clk/ralink/clk-mtmips.c
13338+
1333413339
MEDIATEK NAND CONTROLLER DRIVER
1333513340
L: linux-mtd@lists.infradead.org
1333613341
S: Orphan

‎arch/mips/Kconfig‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ config MIPS
4545
select GENERIC_LIB_UCMPDI2
4646
select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC
4747
select GENERIC_SMP_IDLE_THREAD
48+
select GENERIC_IDLE_POLL_SETUP
4849
select GENERIC_TIME_VSYSCALL
4950
select GUP_GET_PXX_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT
5051
select HAS_IOPORT if !NO_IOPORT_MAP || ISA
@@ -80,7 +81,6 @@ config MIPS
8081
select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
8182
select HAVE_MOD_ARCH_SPECIFIC
8283
select HAVE_NMI
83-
select HAVE_PATA_PLATFORM
8484
select HAVE_PERF_EVENTS
8585
select HAVE_PERF_REGS
8686
select HAVE_PERF_USER_STACK_DUMP
@@ -155,9 +155,11 @@ config MIPS_GENERIC_KERNEL
155155
select SWAP_IO_SPACE
156156
select SYS_HAS_CPU_MIPS32_R1
157157
select SYS_HAS_CPU_MIPS32_R2
158+
select SYS_HAS_CPU_MIPS32_R5
158159
select SYS_HAS_CPU_MIPS32_R6
159160
select SYS_HAS_CPU_MIPS64_R1
160161
select SYS_HAS_CPU_MIPS64_R2
162+
select SYS_HAS_CPU_MIPS64_R5
161163
select SYS_HAS_CPU_MIPS64_R6
162164
select SYS_SUPPORTS_32BIT_KERNEL
163165
select SYS_SUPPORTS_64BIT_KERNEL

‎arch/mips/alchemy/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ config MIPS_DB1XXX
1414
bool "Alchemy DB1XXX / PB1XXX boards"
1515
select GPIOLIB
1616
select HAVE_PCI
17+
select HAVE_PATA_PLATFORM
1718
select SYS_SUPPORTS_LITTLE_ENDIAN
1819
select SYS_HAS_EARLY_PRINTK
1920
help

0 commit comments

Comments
 (0)