Skip to content

Commit 5977aa6

Browse files
torvaldstorvalds
committed
Merge tag 'mips_6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer: - DT cleanups - fix for early use of kzalloc on mt7621 platform - cleanups and fixes * tag 'mips_6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (21 commits) MIPS: OCTEON: warn only once if deprecated link status is being used MIPS: BCM63xx: Add check for NULL for clk in clk_enable platform/mips: Adjust Kconfig to keep consistency MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of strncpy() MIPS: mscc: jaguar2: Fix pca9545 i2c-mux node names mips/pci: use devm_platform_ioremap_resource() mips: ralink: mt7621: do not use kzalloc too early mips: ralink: mt7621: soc queries and tests as functions mips: ralink: mt7621: define MT7621_SYSC_BASE with __iomem MIPS: Restore symbol versions for copy_page_cpu and clear_page_cpu mips: dts: remove label = "cpu" from DSA dt-binding mips: ralink: mt7621: change DSA port labels to generic naming mips: ralink: mt7621: fix phy-mode of external phy on GB-PC2 MIPS: vpe-cmp: fix possible memory leak while module exiting MIPS: vpe-mt: fix possible memory leak while module exiting dt-bindings: mips: brcm: add Broadcom SoCs bindings dt-bindings: mips: add CPU bindings for MIPS architecture mips: dts: brcm: bcm7435: add "interrupt-names" for NAND controller mips: dts: bcm63268: add TWD block timer MIPS: Use "grep -E" instead of "egrep" ...
2 parents e6b160b + 4c587a9 commit 5977aa6

25 files changed

Lines changed: 313 additions & 133 deletions

File tree

‎Documentation/devicetree/bindings/mips/brcm/brcm,bmips.txt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Documentation/devicetree/bindings/mips/brcm/soc.yaml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mips/brcm/soc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom cable/DSL/settop platforms
8+
9+
maintainers:
10+
- Florian Fainelli <f.fainelli@gmail.com>
11+
12+
description: |
13+
Boards Broadcom cable/DSL/settop SoC shall have the following properties.
14+
The experimental -viper variants are for running Linux on the 3384's
15+
BMIPS4355 cable modem CPU instead of the BMIPS5000 application processor.
16+
17+
properties:
18+
$nodename:
19+
const: '/'
20+
21+
compatible:
22+
enum:
23+
- brcm,bcm3368
24+
- brcm,bcm3384
25+
- brcm,bcm33843
26+
- brcm,bcm3384-viper
27+
- brcm,bcm33843-viper
28+
- brcm,bcm6328
29+
- brcm,bcm6358
30+
- brcm,bcm6362
31+
- brcm,bcm6368
32+
- brcm,bcm63168
33+
- brcm,bcm63268
34+
- brcm,bcm7125
35+
- brcm,bcm7346
36+
- brcm,bcm7358
37+
- brcm,bcm7360
38+
- brcm,bcm7362
39+
- brcm,bcm7420
40+
- brcm,bcm7425
41+
42+
cpus:
43+
type: object
44+
additionalProperties: false
45+
properties:
46+
'#address-cells':
47+
const: 1
48+
49+
'#size-cells':
50+
const: 0
51+
52+
mips-hpt-frequency:
53+
description: MIPS counter high precision timer frequency.
54+
This is common to all CPUs in the system so it lives
55+
under the "cpus" node.
56+
$ref: /schemas/types.yaml#/definitions/uint32
57+
58+
patternProperties:
59+
"^cpu@[0-9]$":
60+
type: object
61+
$ref: /schemas/mips/cpus.yaml#
62+
unevaluatedProperties: false
63+
64+
required:
65+
- mips-hpt-frequency
66+
67+
additionalProperties: true
68+
69+
examples:
70+
- |
71+
/ {
72+
compatible = "brcm,bcm3368";
73+
#address-cells = <1>;
74+
#size-cells = <1>;
75+
model = "Broadcom 3368";
76+
77+
cpus {
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
mips-hpt-frequency = <150000000>;
82+
83+
cpu@0 {
84+
compatible = "brcm,bmips4350";
85+
device_type = "cpu";
86+
reg = <0>;
87+
};
88+
89+
cpu@1 {
90+
compatible = "brcm,bmips4350";
91+
device_type = "cpu";
92+
reg = <1>;
93+
};
94+
};
95+
};
96+
...

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

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mips/cpus.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MIPS CPUs bindings
8+
9+
maintainers:
10+
- Thomas Bogendoerfer <tsbogend@alpha.franken.de>
11+
- 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
12+
13+
description: |
14+
The device tree allows to describe the layout of CPUs in a system through
15+
the "cpus" node, which in turn contains a number of subnodes (ie "cpu")
16+
defining properties for every CPU.
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- brcm,bmips3300
22+
- brcm,bmips4350
23+
- brcm,bmips4380
24+
- brcm,bmips5000
25+
- brcm,bmips5200
26+
- ingenic,xburst-mxu1.0
27+
- ingenic,xburst-fpu1.0-mxu1.1
28+
- ingenic,xburst-fpu2.0-mxu2.0
29+
- ingenic,xburst2-fpu2.1-mxu2.1-smt
30+
- loongson,gs264
31+
- mips,m14Kc
32+
- mips,mips4Kc
33+
- mips,mips4KEc
34+
- mips,mips24Kc
35+
- mips,mips24KEc
36+
- mips,mips74Kc
37+
- mips,mips1004Kc
38+
- mti,interaptiv
39+
- mti,mips24KEc
40+
- mti,mips14KEc
41+
- mti,mips14Kc
42+
43+
reg:
44+
maxItems: 1
45+
46+
clocks:
47+
maxItems: 1
48+
49+
device_type: true
50+
51+
allOf:
52+
- if:
53+
properties:
54+
compatible:
55+
contains:
56+
enum:
57+
- ingenic,xburst-mxu1.0
58+
- ingenic,xburst-fpu1.0-mxu1.1
59+
- ingenic,xburst-fpu2.0-mxu2.0
60+
- ingenic,xburst2-fpu2.1-mxu2.1-smt
61+
then:
62+
required:
63+
- device_type
64+
- clocks
65+
66+
required:
67+
- compatible
68+
- reg
69+
70+
additionalProperties: false
71+
72+
examples:
73+
- |
74+
cpus {
75+
#size-cells = <0>;
76+
#address-cells = <1>;
77+
78+
cpu@0 {
79+
compatible = "mips,mips1004Kc";
80+
device_type = "cpu";
81+
reg = <0>;
82+
};
83+
84+
cpu@1 {
85+
compatible = "mips,mips1004Kc";
86+
device_type = "cpu";
87+
reg = <1>;
88+
};
89+
};
90+
91+
- |
92+
// Example 2 (Ingenic CPU)
93+
#include <dt-bindings/clock/ingenic,jz4780-cgu.h>
94+
95+
cpus {
96+
#address-cells = <1>;
97+
#size-cells = <0>;
98+
99+
cpu@0 {
100+
compatible = "ingenic,xburst-fpu1.0-mxu1.1";
101+
device_type = "cpu";
102+
reg = <0>;
103+
104+
clocks = <&cgu JZ4780_CLK_CPU>;
105+
};
106+
107+
cpu@1 {
108+
compatible = "ingenic,xburst-fpu1.0-mxu1.1";
109+
device_type = "cpu";
110+
reg = <1>;
111+
112+
clocks = <&cgu JZ4780_CLK_CORE1>;
113+
};
114+
};
115+
...

‎Documentation/devicetree/bindings/mips/ingenic/ingenic,cpu.yaml‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎arch/mips/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ KBUILD_LDFLAGS += -m $(ld-emul)
318318

319319
ifdef CONFIG_MIPS
320320
CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \
321-
egrep -vw '__GNUC_(MINOR_|PATCHLEVEL_)?_' | \
321+
grep -E -vw '__GNUC_(MINOR_|PATCHLEVEL_)?_' | \
322322
sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g')
323323
endif
324324

‎arch/mips/bcm63xx/clk.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ static struct clk clk_periph = {
361361
*/
362362
int clk_enable(struct clk *clk)
363363
{
364+
if (!clk)
365+
return 0;
364366
mutex_lock(&clocks_mutex);
365367
clk_enable_unlocked(clk);
366368
mutex_unlock(&clocks_mutex);

‎arch/mips/boot/dts/brcm/bcm63268.dtsi‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@
110110
reg = <0x10000080 0x30>;
111111
ranges = <0x0 0x10000080 0x30>;
112112

113+
timer@0 {
114+
compatible = "brcm,bcm6345-timer";
115+
reg = <0x0 0x1c>;
116+
};
117+
113118
wdt: watchdog@1c {
114119
compatible = "brcm,bcm7038-wdt";
115120
reg = <0x1c 0xc>;

‎arch/mips/boot/dts/brcm/bcm7435.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@
422422
reg = <0x41c800 0x600>, <0x41d000 0x100>;
423423
interrupt-parent = <&hif_l2_intc>;
424424
interrupts = <24>, <4>;
425+
interrupt-names = "nand_ctlrdy", "flash_dma_done";
425426
status = "disabled";
426427
};
427428

‎arch/mips/boot/dts/ingenic/ci20.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@
438438
ingenic,nemc-tAW = <50>;
439439
ingenic,nemc-tSTRV = <100>;
440440

441-
reset-gpios = <&gpf 12 GPIO_ACTIVE_HIGH>;
441+
reset-gpios = <&gpf 12 GPIO_ACTIVE_LOW>;
442442
vcc-supply = <&eth0_power>;
443443

444444
interrupt-parent = <&gpe>;

‎arch/mips/boot/dts/mscc/jaguar2_pcb110.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
};
209209

210210
&i2c0 {
211-
pca9545@70 {
211+
i2c-mux@70 {
212212
compatible = "nxp,pca9545";
213213
reg = <0x70>;
214214
#address-cells = <1>;
@@ -236,7 +236,7 @@
236236
reg = <3>;
237237
};
238238
};
239-
pca9545@71 {
239+
i2c-mux@71 {
240240
compatible = "nxp,pca9545";
241241
reg = <0x71>;
242242
#address-cells = <1>;

0 commit comments

Comments
 (0)