Skip to content

Commit d5c0b60

Browse files
committed
Merge tag 'devicetree-fixes-for-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Fix dt-extract-compatibles for builds with in tree build directory - Drop Xinlei Lee <[email protected]> bouncing email - Fix the of_reconfig_get_state_change() return value documentation - Add missing #power-domain-cells property to QCom MPM - Fix warnings in i.MX LCDIF and adi,adv7533 * tag 'devicetree-fixes-for-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: display: adi,adv75xx: Document #sound-dai-cells dt-bindings: lcdif: Properly describe the i.MX23 interrupts dt-bindings: interrupt-controller: Allow #power-domain-cells of: dynamic: Fix of_reconfig_get_state_change() return value documentation dt-bindings: display: mediatek: dsi: remove Xinlei's mail dt: dt-extract-compatibles: Don't follow symlinks when walking tree
2 parents 33d42bd + 136c653 commit d5c0b60

File tree

6 files changed

+44
-6
lines changed

6 files changed

+44
-6
lines changed

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 <[email protected]>
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 <[email protected]>
1111
- Philipp Zabel <[email protected]>
1212
- Jitao Shi <[email protected]>
13-
- Xinlei Lee <[email protected]>
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
};

drivers/of/dynamic.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ int of_reconfig_notify(unsigned long action, struct of_reconfig_data *p)
9898
*
9999
* Returns the new state of a device based on the notifier used.
100100
*
101-
* Return: 0 on device going from enabled to disabled, 1 on device
102-
* going from disabled to enabled and -1 on no change.
101+
* Return: OF_RECONFIG_CHANGE_REMOVE on device going from enabled to
102+
* disabled, OF_RECONFIG_CHANGE_ADD on device going from disabled to
103+
* enabled and OF_RECONFIG_NO_CHANGE on no change.
103104
*/
104105
int of_reconfig_get_state_change(unsigned long action, struct of_reconfig_data *pr)
105106
{

scripts/dtc/dt-extract-compatibles

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env python3
22
# SPDX-License-Identifier: GPL-2.0-only
33

4+
import fnmatch
45
import os
5-
import glob
66
import re
77
import argparse
88

@@ -81,10 +81,20 @@ def print_compat(filename, compatibles):
8181
else:
8282
print(*compatibles, sep='\n')
8383

84+
def glob_without_symlinks(root, glob):
85+
for path, dirs, files in os.walk(root):
86+
# Ignore hidden directories
87+
for d in dirs:
88+
if fnmatch.fnmatch(d, ".*"):
89+
dirs.remove(d)
90+
for f in files:
91+
if fnmatch.fnmatch(f, glob):
92+
yield os.path.join(path, f)
93+
8494
def files_to_parse(path_args):
8595
for f in path_args:
8696
if os.path.isdir(f):
87-
for filename in glob.iglob(f + "/**/*.c", recursive=True):
97+
for filename in glob_without_symlinks(f, "*.c"):
8898
yield filename
8999
else:
90100
yield f

0 commit comments

Comments
 (0)