Commit d5c0b601 authored by Linus Torvalds's avatar Linus Torvalds

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 <xinlei.lee@mediatek.com> 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
parents 33d42bde 136c6531
...@@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders ...@@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders
maintainers: maintainers:
- Laurent Pinchart <laurent.pinchart@ideasonboard.com> - Laurent Pinchart <laurent.pinchart@ideasonboard.com>
allOf:
- $ref: /schemas/sound/dai-common.yaml#
description: | description: |
The ADV7533 and ADV7535 are HDMI audio and video transmitters The ADV7533 and ADV7535 are HDMI audio and video transmitters
compatible with HDMI 1.4 and DVI 1.0. They support color space compatible with HDMI 1.4 and DVI 1.0. They support color space
...@@ -89,6 +92,9 @@ properties: ...@@ -89,6 +92,9 @@ properties:
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
enum: [ 1, 2, 3, 4 ] enum: [ 1, 2, 3, 4 ]
"#sound-dai-cells":
const: 0
ports: ports:
description: description:
The ADV7533/35 has two video ports and one audio port. The ADV7533/35 has two video ports and one audio port.
......
...@@ -51,7 +51,10 @@ properties: ...@@ -51,7 +51,10 @@ properties:
minItems: 1 minItems: 1
interrupts: interrupts:
maxItems: 1 items:
- description: LCDIF DMA interrupt
- description: LCDIF Error interrupt
minItems: 1
power-domains: power-domains:
maxItems: 1 maxItems: 1
...@@ -131,6 +134,21 @@ allOf: ...@@ -131,6 +134,21 @@ allOf:
then: then:
required: required:
- power-domains - power-domains
- if:
properties:
compatible:
contains:
enum:
- fsl,imx23-lcdif
then:
properties:
interrupts:
minItems: 2
maxItems: 2
else:
properties:
interrupts:
maxItems: 1
examples: examples:
- | - |
......
...@@ -10,7 +10,6 @@ maintainers: ...@@ -10,7 +10,6 @@ maintainers:
- Chun-Kuang Hu <chunkuang.hu@kernel.org> - Chun-Kuang Hu <chunkuang.hu@kernel.org>
- Philipp Zabel <p.zabel@pengutronix.de> - Philipp Zabel <p.zabel@pengutronix.de>
- Jitao Shi <jitao.shi@mediatek.com> - Jitao Shi <jitao.shi@mediatek.com>
- Xinlei Lee <xinlei.lee@mediatek.com>
description: | description: |
The MediaTek DSI function block is a sink of the display subsystem and can The MediaTek DSI function block is a sink of the display subsystem and can
......
...@@ -62,6 +62,9 @@ properties: ...@@ -62,6 +62,9 @@ properties:
- description: MPM pin number - description: MPM pin number
- description: GIC SPI number for the MPM pin - description: GIC SPI number for the MPM pin
'#power-domain-cells':
const: 0
required: required:
- compatible - compatible
- reg - reg
...@@ -93,4 +96,5 @@ examples: ...@@ -93,4 +96,5 @@ examples:
<86 183>, <86 183>,
<90 260>, <90 260>,
<91 260>; <91 260>;
#power-domain-cells = <0>;
}; };
...@@ -98,8 +98,9 @@ int of_reconfig_notify(unsigned long action, struct of_reconfig_data *p) ...@@ -98,8 +98,9 @@ int of_reconfig_notify(unsigned long action, struct of_reconfig_data *p)
* *
* Returns the new state of a device based on the notifier used. * Returns the new state of a device based on the notifier used.
* *
* Return: 0 on device going from enabled to disabled, 1 on device * Return: OF_RECONFIG_CHANGE_REMOVE on device going from enabled to
* going from disabled to enabled and -1 on no change. * disabled, OF_RECONFIG_CHANGE_ADD on device going from disabled to
* enabled and OF_RECONFIG_NO_CHANGE on no change.
*/ */
int of_reconfig_get_state_change(unsigned long action, struct of_reconfig_data *pr) int of_reconfig_get_state_change(unsigned long action, struct of_reconfig_data *pr)
{ {
......
#!/usr/bin/env python3 #!/usr/bin/env python3
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
import fnmatch
import os import os
import glob
import re import re
import argparse import argparse
...@@ -81,10 +81,20 @@ def print_compat(filename, compatibles): ...@@ -81,10 +81,20 @@ def print_compat(filename, compatibles):
else: else:
print(*compatibles, sep='\n') print(*compatibles, sep='\n')
def glob_without_symlinks(root, glob):
for path, dirs, files in os.walk(root):
# Ignore hidden directories
for d in dirs:
if fnmatch.fnmatch(d, ".*"):
dirs.remove(d)
for f in files:
if fnmatch.fnmatch(f, glob):
yield os.path.join(path, f)
def files_to_parse(path_args): def files_to_parse(path_args):
for f in path_args: for f in path_args:
if os.path.isdir(f): if os.path.isdir(f):
for filename in glob.iglob(f + "/**/*.c", recursive=True): for filename in glob_without_symlinks(f, "*.c"):
yield filename yield filename
else: else:
yield f yield f
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment