Skip to content

Commit

Permalink
Automatic merge of 'master' into merge (2023-12-11 10:24)
Browse files Browse the repository at this point in the history
  • Loading branch information
mpe committed Dec 10, 2023
2 parents 1d9ceee + a39b6ac commit 3c0fd43
Show file tree
Hide file tree
Showing 381 changed files with 3,724 additions and 1,965 deletions.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Changbin Du <[email protected]> <[email protected]>
Changbin Du <[email protected]> <[email protected]>
Chao Yu <[email protected]> <[email protected]>
Chao Yu <[email protected]> <[email protected]>
Chester Lin <[email protected]> <[email protected]>
Chris Chiu <[email protected]> <[email protected]>
Chris Chiu <[email protected]> <[email protected]>
Chris Lew <[email protected]> <[email protected]>
Expand Down
8 changes: 8 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -2944,6 +2944,14 @@ D: IPX development and support
N: Venkatesh Pallipadi (Venki)
D: x86/HPET

N: Antti Palosaari
E: [email protected]
D: Various DVB drivers
W: https://palosaari.fi/linux/
S: Yliopistokatu 1 D 513
S: FI-90570 Oulu
S: FINLAND

N: Kyungmin Park
E: [email protected]
D: Samsung S5Pv210 and Exynos4210 mobile platforms
Expand Down
9 changes: 9 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-optee-devices
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@ Description:
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
are free to create needed API under optee-ta-<uuid> directory.

What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
Date: November 2023
KernelVersion: 6.7
Contact: [email protected]
Description:
Allows to distinguish whether an OP-TEE based TA/device requires user-space
tee-supplicant to function properly or not. This attribute will be present for
devices which depend on tee-supplicant to be running.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders
maintainers:
- Laurent Pinchart <[email protected]>

allOf:
- $ref: /schemas/sound/dai-common.yaml#

description: |
The ADV7533 and ADV7535 are HDMI audio and video transmitters
compatible with HDMI 1.4 and DVI 1.0. They support color space
Expand Down Expand Up @@ -89,6 +92,9 @@ properties:
$ref: /schemas/types.yaml#/definitions/uint32
enum: [ 1, 2, 3, 4 ]

"#sound-dai-cells":
const: 0

ports:
description:
The ADV7533/35 has two video ports and one audio port.
Expand Down
20 changes: 19 additions & 1 deletion Documentation/devicetree/bindings/display/fsl,lcdif.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ properties:
minItems: 1

interrupts:
maxItems: 1
items:
- description: LCDIF DMA interrupt
- description: LCDIF Error interrupt
minItems: 1

power-domains:
maxItems: 1
Expand Down Expand Up @@ -131,6 +134,21 @@ allOf:
then:
required:
- power-domains
- if:
properties:
compatible:
contains:
enum:
- fsl,imx23-lcdif
then:
properties:
interrupts:
minItems: 2
maxItems: 2
else:
properties:
interrupts:
maxItems: 1

examples:
- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ maintainers:
- Chun-Kuang Hu <[email protected]>
- Philipp Zabel <[email protected]>
- Jitao Shi <[email protected]>
- Xinlei Lee <[email protected]>

description: |
The MediaTek DSI function block is a sink of the display subsystem and can
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ properties:
- description: MPM pin number
- description: GIC SPI number for the MPM pin

'#power-domain-cells':
const: 0

required:
- compatible
- reg
Expand Down Expand Up @@ -93,4 +96,5 @@ examples:
<86 183>,
<90 260>,
<91 260>;
#power-domain-cells = <0>;
};
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/perf/riscv,pmu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ properties:
bitmap of all MHPMCOUNTERx that can monitor the range of events

dependencies:
"riscv,event-to-mhpmevent": [ "riscv,event-to-mhpmcounters" ]
riscv,event-to-mhpmevent: [ "riscv,event-to-mhpmcounters" ]

required:
- compatible
Expand Down
10 changes: 4 additions & 6 deletions Documentation/devicetree/bindings/pwm/imx-pwm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ allOf:

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

compatible:
oneOf:
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/soc/rockchip/grf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ allOf:
- rockchip,rk3399-grf
- rockchip,rk3399-pmugrf
- rockchip,rk3568-pmugrf
- rockchip,rk3588-pmugrf
- rockchip,rv1108-grf
- rockchip,rv1108-pmugrf

Expand Down
2 changes: 1 addition & 1 deletion Documentation/networking/tcp_ao.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ also [6.1]::
when it is no longer considered permitted.

Linux TCP-AO will try its best to prevent you from removing a key that's
being used, considering it a key management failure. But sine keeping
being used, considering it a key management failure. But since keeping
an outdated key may become a security issue and as a peer may
unintentionally prevent the removal of an old key by always setting
it as RNextKeyID - a forced key removal mechanism is provided, where
Expand Down
2 changes: 1 addition & 1 deletion Documentation/trace/coresight/coresight.rst
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Misc:
Device Tree Bindings
--------------------

See Documentation/devicetree/bindings/arm/arm,coresight-\*.yaml for details.
See ``Documentation/devicetree/bindings/arm/arm,coresight-*.yaml`` for details.

As of this writing drivers for ITM, STMs and CTIs are not provided but are
expected to be added as the solution matures.
Expand Down
Loading

0 comments on commit 3c0fd43

Please sign in to comment.