Skip to content

Commit 1c83601

Browse files
committed
Merge tag 'mips_6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer: - Add support for multi-cluster configuration - Add quirks for enabling multi-cluster mode on EyeQ6 - Add DTS clocks for ralink - Cleanup realtek DTS - Other cleanups and fixes * tag 'mips_6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (35 commits) MIPS: config: omega2+, vocore2: enable CLK_MTMIPS arch: mips: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX MIPS: cm: Fix warning if MIPS_CM is disabled MIPS: Fix Macro name MIPS: ds1287: Match ds1287_set_base_clock() function types MIPS: cevt-ds1287: Add missing ds1287.h include MIPS: dec: Declare which_prom() as static MIPS: Loongson2ef: Replace deprecated strncpy() with strscpy() mips: dts: ralink: mt7628a: update system controller node and its consumers mips: dts: ralink: mt7620a: update system controller node and its consumers mips: dts: ralink: rt3883: update system controller node and its consumers mips: dts: ralink: rt3050: update system controller node and its consumers mips: dts: ralink: rt2880: update system controller node and its consumers dt-bindings: clock: add clock definitions for Ralink SoCs MIPS: Use arch specific syscall name match function mips: dts: realtek: Add restart to Cisco SG220-26P mips: dts: realtek: Add RTL838x SoC peripherals mips: dts: realtek: Replace uart clock property mips: dts: realtek: Correct uart interrupt-parent mips: dts: realtek: Add SoC IRQ node for RTL838x ...
2 parents f90f214 + 855912b commit 1c83601

Some content is hidden

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

51 files changed

+836
-235
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ description: |
1818
These SoCs have an XTAL from where the cpu clock is
1919
provided as well as derived clocks for the bus and the peripherals.
2020
21+
Each clock is assigned an identifier and client nodes use this identifier
22+
to specify the clock which they consume.
23+
24+
All these identifiers could be found in:
25+
[1]: <include/dt-bindings/clock/mediatek,mtmips-sysc.h>.
26+
2127
properties:
2228
compatible:
2329
items:
@@ -38,7 +44,8 @@ properties:
3844

3945
'#clock-cells':
4046
description:
41-
The first cell indicates the clock number.
47+
The first cell indicates the clock number, see [1] for available
48+
clocks.
4249
const: 1
4350

4451
'#reset-cells':
@@ -56,6 +63,8 @@ additionalProperties: false
5663

5764
examples:
5865
- |
66+
#include <dt-bindings/clock/mediatek,mtmips-sysc.h>
67+
5968
syscon@0 {
6069
compatible = "ralink,rt5350-sysc", "syscon";
6170
reg = <0x0 0x100>;
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mips/mti,mips-cm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MIPS Coherence Manager
8+
9+
description:
10+
The Coherence Manager (CM) is responsible for establishing the
11+
global ordering of requests from all elements of the system and
12+
sending the correct data back to the requester. It supports Cache
13+
to Cache transfers.
14+
https://training.mips.com/cps_mips/PDF/CPS_Introduction.pdf
15+
https://training.mips.com/cps_mips/PDF/Coherency_Manager.pdf
16+
17+
maintainers:
18+
- Jiaxun Yang <jiaxun.yang@flygoat.com>
19+
20+
properties:
21+
compatible:
22+
oneOf:
23+
- const: mti,mips-cm
24+
- const: mobileye,eyeq6-cm
25+
description:
26+
On EyeQ6 the HCI (Hardware Cache Initialization) information for
27+
the L2 cache in multi-cluster configuration is broken.
28+
29+
reg:
30+
description:
31+
Base address and size of the Global Configuration Registers
32+
referred to as CMGCR.They are the system programmer's interface
33+
to the Coherency Manager. Their location in the memory map is
34+
determined at core build time. In a functional system, the base
35+
address is provided by the Coprocessor 0, but some
36+
System-on-Chip (SoC) designs may not provide an accurate address
37+
that needs to be described statically.
38+
39+
maxItems: 1
40+
41+
required:
42+
- compatible
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
coherency-manager@1fbf8000 {
49+
compatible = "mti,mips-cm";
50+
reg = <0x1bde8000 0x8000>;
51+
};
52+
53+
- |
54+
coherency-manager {
55+
compatible = "mobileye,eyeq6-cm";
56+
};
57+
...

arch/mips/boot/dts/ingenic/gcw0.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"MIC1N", "Built-in Mic";
9292
simple-audio-card,pin-switches = "Speaker", "Headphones";
9393

94-
simple-audio-card,hp-det-gpio = <&gpf 21 GPIO_ACTIVE_LOW>;
94+
simple-audio-card,hp-det-gpios = <&gpf 21 GPIO_ACTIVE_LOW>;
9595
simple-audio-card,aux-devs = <&speaker_amp>, <&headphones_amp>;
9696

9797
simple-audio-card,bitclock-master = <&dai_codec>;

arch/mips/boot/dts/ingenic/rs90.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
"Speaker", "OUTR";
149149
simple-audio-card,pin-switches = "Speaker";
150150

151-
simple-audio-card,hp-det-gpio = <&gpd 16 GPIO_ACTIVE_LOW>;
151+
simple-audio-card,hp-det-gpios = <&gpd 16 GPIO_ACTIVE_LOW>;
152152
simple-audio-card,aux-devs = <&amp>;
153153

154154
simple-audio-card,bitclock-master = <&dai_codec>;

arch/mips/boot/dts/mobileye/eyeq6h.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
#interrupt-cells = <1>;
3333
};
3434

35+
coherency-manager {
36+
compatible = "mobileye,eyeq6-cm";
37+
};
38+
3539
xtal: clock-30000000 {
3640
compatible = "fixed-clock";
3741
#clock-cells = <0>;

arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/dts-v1/;
77

8-
/include/ "mt7628a.dtsi"
8+
#include "mt7628a.dtsi"
99

1010
#include <dt-bindings/gpio/gpio.h>
1111
#include <dt-bindings/input/input.h>

arch/mips/boot/dts/ralink/mt7620a.dtsi

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
2+
#include <dt-bindings/clock/mediatek,mtmips-sysc.h>
3+
24
/ {
35
#address-cells = <1>;
46
#size-cells = <1>;
@@ -25,9 +27,11 @@
2527
#address-cells = <1>;
2628
#size-cells = <1>;
2729

28-
sysc@0 {
29-
compatible = "ralink,mt7620a-sysc";
30+
sysc: syscon@0 {
31+
compatible = "ralink,mt7620-sysc", "syscon";
3032
reg = <0x0 0x100>;
33+
#clock-cells = <1>;
34+
#reset-cells = <1>;
3135
};
3236

3337
intc: intc@200 {
@@ -50,6 +54,8 @@
5054
compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
5155
reg = <0xc00 0x100>;
5256

57+
clocks = <&sysc MT7620_CLK_UARTLITE>;
58+
5359
interrupt-parent = <&intc>;
5460
interrupts = <12>;
5561

arch/mips/boot/dts/ralink/mt7620a_eval.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/dts-v1/;
33

4-
/include/ "mt7620a.dtsi"
4+
#include "mt7620a.dtsi"
55

66
/ {
77
compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";

arch/mips/boot/dts/ralink/mt7628a.dtsi

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2+
#include <dt-bindings/clock/mediatek,mtmips-sysc.h>
23

34
/ {
45
#address-cells = <1>;
@@ -16,11 +17,6 @@
1617
};
1718
};
1819

19-
resetc: reset-controller {
20-
compatible = "ralink,rt2880-reset";
21-
#reset-cells = <1>;
22-
};
23-
2420
cpuintc: interrupt-controller {
2521
#address-cells = <0>;
2622
#interrupt-cells = <1>;
@@ -36,9 +32,11 @@
3632
#address-cells = <1>;
3733
#size-cells = <1>;
3834

39-
sysc: system-controller@0 {
40-
compatible = "ralink,mt7620a-sysc", "syscon";
35+
sysc: syscon@0 {
36+
compatible = "ralink,mt7628-sysc", "syscon";
4137
reg = <0x0 0x60>;
38+
#clock-cells = <1>;
39+
#reset-cells = <1>;
4240
};
4341

4442
pinmux: pinmux@60 {
@@ -138,7 +136,7 @@
138136
compatible = "mediatek,mt7621-wdt";
139137
reg = <0x100 0x30>;
140138

141-
resets = <&resetc 8>;
139+
resets = <&sysc 8>;
142140
reset-names = "wdt";
143141

144142
interrupt-parent = <&intc>;
@@ -154,7 +152,7 @@
154152
interrupt-controller;
155153
#interrupt-cells = <1>;
156154

157-
resets = <&resetc 9>;
155+
resets = <&sysc 9>;
158156
reset-names = "intc";
159157

160158
interrupt-parent = <&cpuintc>;
@@ -190,7 +188,9 @@
190188
pinctrl-names = "default";
191189
pinctrl-0 = <&pinmux_spi_spi>;
192190

193-
resets = <&resetc 18>;
191+
clocks = <&sysc MT76X8_CLK_SPI1>;
192+
193+
resets = <&sysc 18>;
194194
reset-names = "spi";
195195

196196
#address-cells = <1>;
@@ -206,7 +206,9 @@
206206
pinctrl-names = "default";
207207
pinctrl-0 = <&pinmux_i2c_i2c>;
208208

209-
resets = <&resetc 16>;
209+
clocks = <&sysc MT76X8_CLK_I2C>;
210+
211+
resets = <&sysc 16>;
210212
reset-names = "i2c";
211213

212214
#address-cells = <1>;
@@ -222,7 +224,9 @@
222224
pinctrl-names = "default";
223225
pinctrl-0 = <&pinmux_uart0_uart>;
224226

225-
resets = <&resetc 12>;
227+
clocks = <&sysc MT76X8_CLK_UART0>;
228+
229+
resets = <&sysc 12>;
226230
reset-names = "uart0";
227231

228232
interrupt-parent = <&intc>;
@@ -238,7 +242,9 @@
238242
pinctrl-names = "default";
239243
pinctrl-0 = <&pinmux_uart1_uart>;
240244

241-
resets = <&resetc 19>;
245+
clocks = <&sysc MT76X8_CLK_UART1>;
246+
247+
resets = <&sysc 19>;
242248
reset-names = "uart1";
243249

244250
interrupt-parent = <&intc>;
@@ -254,7 +260,9 @@
254260
pinctrl-names = "default";
255261
pinctrl-0 = <&pinmux_uart2_uart>;
256262

257-
resets = <&resetc 20>;
263+
clocks = <&sysc MT76X8_CLK_UART2>;
264+
265+
resets = <&sysc 20>;
258266
reset-names = "uart2";
259267

260268
interrupt-parent = <&intc>;
@@ -271,7 +279,7 @@
271279
#phy-cells = <0>;
272280

273281
ralink,sysctl = <&sysc>;
274-
resets = <&resetc 22 &resetc 25>;
282+
resets = <&sysc 22 &sysc 25>;
275283
reset-names = "host", "device";
276284
};
277285

@@ -290,6 +298,8 @@
290298
compatible = "mediatek,mt7628-wmac";
291299
reg = <0x10300000 0x100000>;
292300

301+
clocks = <&sysc MT76X8_CLK_WMAC>;
302+
293303
interrupt-parent = <&cpuintc>;
294304
interrupts = <6>;
295305

arch/mips/boot/dts/ralink/omega2p.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/dts-v1/;
22

3-
/include/ "mt7628a.dtsi"
3+
#include "mt7628a.dtsi"
44

55
/ {
66
compatible = "onion,omega2+", "ralink,mt7688a-soc", "ralink,mt7628a-soc";

0 commit comments

Comments
 (0)