Skip to content

Commit d71e064

Browse files
committed
Merge tag 'mips_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer: - loongson64 irq rework - dmi support loongson - replace setup_irq() by request_irq() - jazz cleanups - minor cleanups and fixes * tag 'mips_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (44 commits) MIPS: ralink: mt7621: Fix soc_device introduction MIPS: Exclude more dsemul code when CONFIG_MIPS_FP_SUPPORT=n MIPS/tlbex: Fix LDDIR usage in setup_pw() for Loongson-3 MIPS: do not compile generic functions for CONFIG_CAVIUM_OCTEON_SOC MAINTAINERS: Update Loongson64 entry MIPS: Loongson64: Load built-in dtbs MIPS: Loongson64: Add generic dts dt-bindings: mips: Add loongson boards MIPS: Loongson64: Drop legacy IRQ code dt-bindings: interrupt-controller: Add Loongson-3 HTPIC irqchip: Add driver for Loongson-3 HyperTransport PIC controller dt-bindings: interrupt-controller: Add Loongson LIOINTC irqchip: loongson-liointc: Workaround LPC IRQ Errata irqchip: Add driver for Loongson I/O Local Interrupt Controller docs: mips: remove no longer needed au1xxx_ide.rst documentation MIPS: Alchemy: remove no longer used au1xxx_ide.h header ide: remove no longer used au1xxx-ide driver MIPS: Add support for Desktop Management Interface (DMI) firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START MIPS: ralink: mt7621: introduce 'soc_device' initialization ...
2 parents 58233cc + ba15533 commit d71e064

File tree

136 files changed

+1369
-1924
lines changed

Some content is hidden

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

136 files changed

+1369
-1924
lines changed
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/interrupt-controller/loongson,htpic.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Loongson-3 HyperTransport Interrupt Controller
8+
9+
maintainers:
10+
- Jiaxun Yang <[email protected]>
11+
12+
allOf:
13+
- $ref: /schemas/interrupt-controller.yaml#
14+
15+
description: |
16+
This interrupt controller is found in the Loongson-3 family of chips to transmit
17+
interrupts from PCH PIC connected on HyperTransport bus.
18+
19+
properties:
20+
compatible:
21+
const: loongson,htpic-1.0
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
minItems: 1
28+
maxItems: 4
29+
description: |
30+
Four parent interrupts that receive chained interrupts.
31+
32+
interrupt-controller: true
33+
34+
'#interrupt-cells':
35+
const: 1
36+
37+
required:
38+
- compatible
39+
- reg
40+
- interrupts
41+
- interrupt-controller
42+
- '#interrupt-cells'
43+
44+
examples:
45+
- |
46+
#include <dt-bindings/interrupt-controller/irq.h>
47+
htintc: interrupt-controller@1fb000080 {
48+
compatible = "loongson,htintc-1.0";
49+
reg = <0xfb000080 0x40>;
50+
interrupt-controller;
51+
#interrupt-cells = <1>;
52+
53+
interrupt-parent = <&liointc>;
54+
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
55+
<25 IRQ_TYPE_LEVEL_HIGH>,
56+
<26 IRQ_TYPE_LEVEL_HIGH>,
57+
<27 IRQ_TYPE_LEVEL_HIGH>;
58+
};
59+
...
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/interrupt-controller/loongson,liointc.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Loongson Local I/O Interrupt Controller
8+
9+
maintainers:
10+
- Jiaxun Yang <[email protected]>
11+
12+
description: |
13+
This interrupt controller is found in the Loongson-3 family of chips as the primary
14+
package interrupt controller which can route local I/O interrupt to interrupt lines
15+
of cores.
16+
17+
allOf:
18+
- $ref: /schemas/interrupt-controller.yaml#
19+
20+
properties:
21+
compatible:
22+
oneOf:
23+
- const: loongson,liointc-1.0
24+
- const: loongson,liointc-1.0a
25+
26+
reg:
27+
maxItems: 1
28+
29+
interrupt-controller: true
30+
31+
interrupts:
32+
description:
33+
Interrupt source of the CPU interrupts.
34+
minItems: 1
35+
maxItems: 4
36+
37+
interrupt-names:
38+
description: List of names for the parent interrupts.
39+
items:
40+
- const: int0
41+
- const: int1
42+
- const: int2
43+
- const: int3
44+
minItems: 1
45+
maxItems: 4
46+
47+
'#interrupt-cells':
48+
const: 2
49+
50+
'loongson,parent_int_map':
51+
description: |
52+
This property points how the children interrupts will be mapped into CPU
53+
interrupt lines. Each cell refers to a parent interrupt line from 0 to 3
54+
and each bit in the cell refers to a children interrupt fron 0 to 31.
55+
If a CPU interrupt line didn't connected with liointc, then keep it's
56+
cell with zero.
57+
allOf:
58+
- $ref: /schemas/types.yaml#/definitions/uint32-array
59+
- items:
60+
minItems: 4
61+
maxItems: 4
62+
63+
64+
required:
65+
- compatible
66+
- reg
67+
- interrupts
68+
- interrupt-controller
69+
- '#interrupt-cells'
70+
- 'loongson,parent_int_map'
71+
72+
73+
examples:
74+
- |
75+
iointc: interrupt-controller@3ff01400 {
76+
compatible = "loongson,liointc-1.0";
77+
reg = <0x3ff01400 0x64>;
78+
79+
interrupt-controller;
80+
#interrupt-cells = <2>;
81+
82+
interrupt-parent = <&cpuintc>;
83+
interrupts = <2>, <3>;
84+
interrupt-names = "int0", "int1";
85+
86+
loongson,parent_int_map = <0xf0ffffff>, /* int0 */
87+
<0x0f000000>, /* int1 */
88+
<0x00000000>, /* int2 */
89+
<0x00000000>; /* int3 */
90+
91+
};
92+
93+
...
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mips/loongson/devices.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Loongson based Platforms Device Tree Bindings
8+
9+
maintainers:
10+
- Jiaxun Yang <[email protected]>
11+
description: |
12+
Devices with a Loongson CPU shall have the following properties.
13+
14+
properties:
15+
$nodename:
16+
const: '/'
17+
compatible:
18+
oneOf:
19+
20+
- description: Generic Loongson3 Quad Core + RS780E
21+
items:
22+
- const: loongson,loongson3-4core-rs780e
23+
24+
- description: Generic Loongson3 Octa Core + RS780E
25+
items:
26+
- const: loongson,loongson3-8core-rs780e
27+
...

Documentation/mips/au1xxx_ide.rst

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

Documentation/mips/index.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ MIPS-specific Documentation
1010

1111
ingenic-tcu
1212

13-
au1xxx_ide
14-
1513
.. only:: subproject and html
1614

1715
Indices

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11202,6 +11202,7 @@ S: Maintained
1120211202
F: arch/mips/loongson64/
1120311203
F: arch/mips/include/asm/mach-loongson64/
1120411204
F: drivers/platform/mips/cpu_hwmon.c
11205+
F: drivers/irqchip/irq-loongson*
1120511206
F: drivers/*/*loongson3*
1120611207
F: drivers/*/*/*loongson3*
1120711208

0 commit comments

Comments
 (0)