Skip to content

Commit ef5b283

Browse files
committed
Merge tag 'kvm-riscv-fixes-6.7-1' of https://github.com/kvm-riscv/linux into kvm-master
KVM/riscv fixes for 6.7, take #1 - Fix a race condition in updating external interrupt for trap-n-emulated IMSIC swfile - Fix print_reg defaults in get-reg-list selftest
2 parents 5c2b217 + 4ad9843 commit ef5b283

File tree

386 files changed

+3906
-2073
lines changed

Some content is hidden

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

386 files changed

+3906
-2073
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
117117
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
118118
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
119119
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
120+
Chester Lin <chester62515@gmail.com> <clin@suse.com>
120121
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
121122
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
122123
Chris Lew <quic_clew@quicinc.com> <clew@codeaurora.org>

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2944,6 +2944,14 @@ D: IPX development and support
29442944
N: Venkatesh Pallipadi (Venki)
29452945
D: x86/HPET
29462946

2947+
N: Antti Palosaari
2948+
E: crope@iki.fi
2949+
D: Various DVB drivers
2950+
W: https://palosaari.fi/linux/
2951+
S: Yliopistokatu 1 D 513
2952+
S: FI-90570 Oulu
2953+
S: FINLAND
2954+
29472955
N: Kyungmin Park
29482956
E: kyungmin.park@samsung.com
29492957
D: Samsung S5Pv210 and Exynos4210 mobile platforms

Documentation/ABI/testing/sysfs-bus-optee-devices

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@ Description:
66
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
77
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
88
are free to create needed API under optee-ta-<uuid> directory.
9+
10+
What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
11+
Date: November 2023
12+
KernelVersion: 6.7
13+
Contact: op-tee@lists.trustedfirmware.org
14+
Description:
15+
Allows to distinguish whether an OP-TEE based TA/device requires user-space
16+
tee-supplicant to function properly or not. This attribute will be present for
17+
devices which depend on tee-supplicant to be running.

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders
99
maintainers:
1010
- Laurent Pinchart <laurent.pinchart@ideasonboard.com>
1111

12+
allOf:
13+
- $ref: /schemas/sound/dai-common.yaml#
14+
1215
description: |
1316
The ADV7533 and ADV7535 are HDMI audio and video transmitters
1417
compatible with HDMI 1.4 and DVI 1.0. They support color space
@@ -89,6 +92,9 @@ properties:
8992
$ref: /schemas/types.yaml#/definitions/uint32
9093
enum: [ 1, 2, 3, 4 ]
9194

95+
"#sound-dai-cells":
96+
const: 0
97+
9298
ports:
9399
description:
94100
The ADV7533/35 has two video ports and one audio port.

Documentation/devicetree/bindings/display/fsl,lcdif.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ properties:
5151
minItems: 1
5252

5353
interrupts:
54-
maxItems: 1
54+
items:
55+
- description: LCDIF DMA interrupt
56+
- description: LCDIF Error interrupt
57+
minItems: 1
5558

5659
power-domains:
5760
maxItems: 1
@@ -131,6 +134,21 @@ allOf:
131134
then:
132135
required:
133136
- power-domains
137+
- if:
138+
properties:
139+
compatible:
140+
contains:
141+
enum:
142+
- fsl,imx23-lcdif
143+
then:
144+
properties:
145+
interrupts:
146+
minItems: 2
147+
maxItems: 2
148+
else:
149+
properties:
150+
interrupts:
151+
maxItems: 1
134152

135153
examples:
136154
- |

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ maintainers:
1010
- Chun-Kuang Hu <chunkuang.hu@kernel.org>
1111
- Philipp Zabel <p.zabel@pengutronix.de>
1212
- Jitao Shi <jitao.shi@mediatek.com>
13-
- Xinlei Lee <xinlei.lee@mediatek.com>
1413

1514
description: |
1615
The MediaTek DSI function block is a sink of the display subsystem and can

Documentation/devicetree/bindings/interrupt-controller/qcom,mpm.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ properties:
6262
- description: MPM pin number
6363
- description: GIC SPI number for the MPM pin
6464

65+
'#power-domain-cells':
66+
const: 0
67+
6568
required:
6669
- compatible
6770
- reg
@@ -93,4 +96,5 @@ examples:
9396
<86 183>,
9497
<90 260>,
9598
<91 260>;
99+
#power-domain-cells = <0>;
96100
};

Documentation/devicetree/bindings/perf/riscv,pmu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ properties:
9090
bitmap of all MHPMCOUNTERx that can monitor the range of events
9191

9292
dependencies:
93-
"riscv,event-to-mhpmevent": [ "riscv,event-to-mhpmcounters" ]
93+
riscv,event-to-mhpmevent: [ "riscv,event-to-mhpmcounters" ]
9494

9595
required:
9696
- compatible

Documentation/devicetree/bindings/pwm/imx-pwm.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ allOf:
1414

1515
properties:
1616
"#pwm-cells":
17-
description: |
18-
Should be 2 for i.MX1 and 3 for i.MX27 and newer SoCs. See pwm.yaml
19-
in this directory for a description of the cells format.
20-
enum:
21-
- 2
22-
- 3
17+
description:
18+
The only third cell flag supported by this binding is
19+
PWM_POLARITY_INVERTED. fsl,imx1-pwm does not support this flags.
20+
const: 3
2321

2422
compatible:
2523
oneOf:

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ allOf:
233233
- rockchip,rk3399-grf
234234
- rockchip,rk3399-pmugrf
235235
- rockchip,rk3568-pmugrf
236+
- rockchip,rk3588-pmugrf
236237
- rockchip,rv1108-grf
237238
- rockchip,rv1108-pmugrf
238239

0 commit comments

Comments
 (0)