Skip to content

Commit 8bc9e65

Browse files
committed
Merge tag 'devicetree-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: - Add a kselftest to check for unprobed DT devices - Fix address translation for some 3 address cells cases - Refactor firmware node refcounting for AMBA bus - Add bindings for qcom,sm4450-pdc, Qualcomm Kryo 465 CPU, and Freescale QMC HDLC - Add Marantec vendor prefix - Convert qcom,pm8921-keypad, cnxt,cx92755-wdt, da9062-wdt, and atmel,at91rm9200-wdt bindings to DT schema - Several additionalProperties/unevaluatedProperties on child node schemas fixes - Drop reserved-memory bindings which now live in dtschema project - Fix a reference to rockchip,inno-usb2phy.yaml - Remove backlight nodes from display panel examples - Expand example for using DT_SCHEMA_FILES - Merge simple LVDS panel bindings to one binding doc * tag 'devicetree-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (34 commits) dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Add support for QMC HDLC dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Add 'additionalProperties: false' in child nodes dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Fix example property name dt-bindings: arm,coresight-cti: Add missing additionalProperties on child nodes dt-bindings: arm,coresight-cti: Drop type for 'cpu' property dt-bindings: soundwire: Add reference to soundwire-controller.yaml schema dt-bindings: input: syna,rmi4: Make "additionalProperties: true" explicit media: dt-bindings: ti,ds90ub960: Add missing type for "i2c-alias" dt-bindings: input: qcom,pm8921-keypad: convert to YAML format of: overlay: unittest: overlay_bad_unresolved: Spelling s/ok/okay/ of: address: Consolidate bus .map() functions of: address: Store number of bus flag cells rather than bool of: unittest: Add tests for address translations of: address: Remove duplicated functions of: address: Fix address translation when address-size is greater than 2 dt-bindings: watchdog: cnxt,cx92755-wdt: convert txt to yaml dt-bindings: watchdog: da9062-wdt: convert txt to yaml dt-bindings: watchdog: fsl,scu-wdt: Document imx8dl dt-bindings: watchdog: atmel,at91rm9200-wdt: convert txt to yaml dt-bindings: usb: rockchip,dwc3: update inno usb2 phy binding name ...
2 parents f9ae180 + fe61262 commit 8bc9e65

Some content is hidden

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

50 files changed

+902
-656
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DT_MK_SCHEMA ?= dt-mk-schema
66
DT_SCHEMA_LINT = $(shell which yamllint || \
77
echo "warning: python package 'yamllint' not installed, skipping" >&2)
88

9-
DT_SCHEMA_MIN_VERSION = 2022.3
9+
DT_SCHEMA_MIN_VERSION = 2023.9
1010

1111
PHONY += check_dtschema_version
1212
check_dtschema_version:

Documentation/devicetree/bindings/arm/arm,coresight-cti.yaml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,8 @@ properties:
9292
maxItems: 1
9393

9494
cpu:
95-
$ref: /schemas/types.yaml#/definitions/phandle
9695
description:
97-
Handle to cpu this device is associated with. This must appear in the
98-
base cti node if compatible string arm,coresight-cti-v8-arch is used,
99-
or may appear in a trig-conns child node when appropriate.
96+
Handle to cpu this CTI is associated with.
10097

10198
power-domains:
10299
maxItems: 1
@@ -113,12 +110,12 @@ properties:
113110
description:
114111
defines a phandle reference to an associated CoreSight trace device.
115112
When the associated trace device is enabled, then the respective CTI
116-
will be enabled. Use in a trig-conns node, or in CTI base node when
117-
compatible string arm,coresight-cti-v8-arch used. If the associated
118-
device has not been registered then the node name will be stored as
119-
the connection name for later resolution. If the associated device is
120-
not a CoreSight device or not registered then the node name will remain
121-
the connection name and automatic enabling will not occur.
113+
will be enabled. Use in CTI base node when compatible string
114+
arm,coresight-cti-v8-arch used. If the associated device has not been
115+
registered then the node name will be stored as the connection name for
116+
later resolution. If the associated device is not a CoreSight device or
117+
not registered then the node name will remain the connection name and
118+
automatic enabling will not occur.
122119

123120
# size cells and address cells required if trig-conns node present.
124121
"#size-cells":
@@ -130,6 +127,8 @@ properties:
130127
patternProperties:
131128
'^trig-conns@([0-9]+)$':
132129
type: object
130+
additionalProperties: false
131+
133132
description:
134133
A trigger connections child node which describes the trigger signals
135134
between this CTI and another hardware device. This device may be a CPU,
@@ -141,6 +140,21 @@ patternProperties:
141140
reg:
142141
maxItems: 1
143142

143+
cpu:
144+
description:
145+
Handle to cpu this trigger connection is associated with.
146+
147+
arm,cs-dev-assoc:
148+
$ref: /schemas/types.yaml#/definitions/phandle
149+
description:
150+
defines a phandle reference to an associated CoreSight trace device.
151+
When the associated trace device is enabled, then the respective CTI
152+
will be enabled. If the associated device has not been registered
153+
then the node name will be stored as the connection name for later
154+
resolution. If the associated device is not a CoreSight device or
155+
not registered then the node name will remain the connection name
156+
and automatic enabling will not occur.
157+
144158
arm,trig-in-sigs:
145159
$ref: /schemas/types.yaml#/definitions/uint32-array
146160
minItems: 1

Documentation/devicetree/bindings/arm/cpus.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ properties:
190190
- qcom,kryo280
191191
- qcom,kryo360
192192
- qcom,kryo385
193+
- qcom,kryo465
193194
- qcom,kryo468
194195
- qcom,kryo485
195196
- qcom,kryo560

Documentation/devicetree/bindings/arm/psci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ properties:
101101
patternProperties:
102102
"^power-domain-":
103103
$ref: /schemas/power/power-domain.yaml#
104+
unevaluatedProperties: false
104105

105106
type: object
106107
description: |

Documentation/devicetree/bindings/display/ilitek,ili9486.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ examples:
5050
- |
5151
#include <dt-bindings/gpio/gpio.h>
5252
53-
backlight: backlight {
54-
compatible = "gpio-backlight";
55-
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
56-
};
5753
spi {
5854
#address-cells = <1>;
5955
#size-cells = <0>;

Documentation/devicetree/bindings/display/panel/ilitek,ili9163.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ examples:
4848
- |
4949
#include <dt-bindings/gpio/gpio.h>
5050
51-
backlight: backlight {
52-
compatible = "gpio-backlight";
53-
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
54-
};
5551
spi {
5652
#address-cells = <1>;
5753
#size-cells = <0>;
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/panel-simple-lvds-dual-ports.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Simple LVDS panels with one power supply and dual LVDS ports
8+
9+
maintainers:
10+
- Liu Ying <victor.liu@nxp.com>
11+
- Thierry Reding <thierry.reding@gmail.com>
12+
- Sam Ravnborg <sam@ravnborg.org>
13+
14+
description: |
15+
This binding file is a collection of the LVDS panels that
16+
has dual LVDS ports and requires only a single power-supply.
17+
The first port receives odd pixels, and the second port receives even pixels.
18+
There are optionally a backlight and an enable GPIO.
19+
The panel may use an OF graph binding for the association to the display,
20+
or it may be a direct child node of the display.
21+
22+
If the panel is more advanced a dedicated binding file is required.
23+
24+
allOf:
25+
- $ref: panel-common.yaml#
26+
27+
properties:
28+
29+
compatible:
30+
enum:
31+
# compatible must be listed in alphabetical order, ordered by compatible.
32+
# The description in the comment is mandatory for each compatible.
33+
34+
# AU Optronics Corporation 13.3" FHD (1920x1080) TFT LCD panel
35+
- auo,g133han01
36+
# AU Optronics Corporation 18.5" FHD (1920x1080) TFT LCD panel
37+
- auo,g185han01
38+
# AU Optronics Corporation 19.0" (1280x1024) TFT LCD panel
39+
- auo,g190ean01
40+
# Kaohsiung Opto-Electronics Inc. 10.1" WUXGA (1920 x 1200) LVDS TFT LCD panel
41+
- koe,tx26d202vm0bwa
42+
# NLT Technologies, Ltd. 15.6" FHD (1920x1080) LVDS TFT LCD panel
43+
- nlt,nl192108ac18-02d
44+
45+
ports:
46+
$ref: /schemas/graph.yaml#/properties/ports
47+
48+
properties:
49+
port@0:
50+
$ref: /schemas/graph.yaml#/$defs/port-base
51+
unevaluatedProperties: false
52+
description: The first sink port.
53+
54+
properties:
55+
dual-lvds-odd-pixels:
56+
type: boolean
57+
description: The first sink port for odd pixels.
58+
59+
required:
60+
- dual-lvds-odd-pixels
61+
62+
port@1:
63+
$ref: /schemas/graph.yaml#/$defs/port-base
64+
unevaluatedProperties: false
65+
description: The second sink port.
66+
67+
properties:
68+
dual-lvds-even-pixels:
69+
type: boolean
70+
description: The second sink port for even pixels.
71+
72+
required:
73+
- dual-lvds-even-pixels
74+
75+
required:
76+
- port@0
77+
- port@1
78+
79+
backlight: true
80+
enable-gpios: true
81+
power-supply: true
82+
83+
additionalProperties: false
84+
85+
required:
86+
- compatible
87+
- ports
88+
- power-supply
89+
90+
examples:
91+
- |
92+
panel: panel-lvds {
93+
compatible = "koe,tx26d202vm0bwa";
94+
power-supply = <&vdd_lcd_reg>;
95+
96+
ports {
97+
#address-cells = <1>;
98+
#size-cells = <0>;
99+
100+
port@0 {
101+
dual-lvds-odd-pixels;
102+
reg = <0>;
103+
104+
panel_lvds0_in: endpoint {
105+
remote-endpoint = <&lvds0_out>;
106+
};
107+
};
108+
109+
port@1 {
110+
dual-lvds-even-pixels;
111+
reg = <1>;
112+
113+
panel_lvds1_in: endpoint {
114+
remote-endpoint = <&lvds1_out>;
115+
};
116+
};
117+
};
118+
};

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,8 @@ properties:
6565
- auo,g104sn02
6666
# AU Optronics Corporation 12.1" (1280x800) TFT LCD panel
6767
- auo,g121ean01
68-
# AU Optronics Corporation 13.3" FHD (1920x1080) TFT LCD panel
69-
- auo,g133han01
7068
# AU Optronics Corporation 15.6" (1366x768) TFT LCD panel
7169
- auo,g156xtn01
72-
# AU Optronics Corporation 18.5" FHD (1920x1080) TFT LCD panel
73-
- auo,g185han01
74-
# AU Optronics Corporation 19.0" (1280x1024) TFT LCD panel
75-
- auo,g190ean01
7670
# AU Optronics Corporation 31.5" FHD (1920x1080) TFT LCD panel
7771
- auo,p320hvn03
7872
# AU Optronics Corporation 21.5" FHD (1920x1080) color TFT LCD panel
@@ -204,8 +198,6 @@ properties:
204198
- kingdisplay,kd116n21-30nv-a010
205199
# Kaohsiung Opto-Electronics Inc. 5.7" QVGA (320 x 240) TFT LCD panel
206200
- koe,tx14d24vm1bpa
207-
# Kaohsiung Opto-Electronics Inc. 10.1" WUXGA (1920 x 1200) LVDS TFT LCD panel
208-
- koe,tx26d202vm0bwa
209201
# Kaohsiung Opto-Electronics. TX31D200VM0BAA 12.3" HSXGA LVDS panel
210202
- koe,tx31d200vm0baa
211203
# Kyocera Corporation 7" WVGA (800x480) transmissive color TFT
@@ -254,8 +246,6 @@ properties:
254246
- neweast,wjfh116008a
255247
# Newhaven Display International 480 x 272 TFT LCD panel
256248
- newhaven,nhd-4.3-480272ef-atxl
257-
# NLT Technologies, Ltd. 15.6" FHD (1920x1080) LVDS TFT LCD panel
258-
- nlt,nl192108ac18-02d
259249
# New Vision Display 7.0" 800 RGB x 480 TFT LCD panel
260250
- nvd,9128
261251
# OKAYA Electric America, Inc. RS800480T-7X0GP 7" WVGA LCD panel

Documentation/devicetree/bindings/display/sitronix,st7735r.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ examples:
5454
- |
5555
#include <dt-bindings/gpio/gpio.h>
5656
57-
backlight: backlight {
58-
compatible = "gpio-backlight";
59-
gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
60-
};
61-
6257
spi {
6358
#address-cells = <1>;
6459
#size-cells = <0>;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/qcom,pm8921-keypad.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm PM8921 PMIC KeyPad
8+
9+
maintainers:
10+
- Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
11+
12+
allOf:
13+
- $ref: input.yaml#
14+
- $ref: matrix-keymap.yaml#
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- qcom,pm8058-keypad
20+
- qcom,pm8921-keypad
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
items:
27+
- description: key sense
28+
- description: key stuck
29+
30+
wakeup-source:
31+
type: boolean
32+
description: use any event on keypad as wakeup event
33+
34+
linux,keypad-wakeup:
35+
type: boolean
36+
deprecated: true
37+
description: legacy version of the wakeup-source property
38+
39+
debounce:
40+
description:
41+
Time in microseconds that key must be pressed or
42+
released for state change interrupt to trigger.
43+
$ref: /schemas/types.yaml#/definitions/uint32
44+
45+
scan-delay:
46+
$ref: /schemas/types.yaml#/definitions/uint32
47+
description: time in microseconds to pause between successive scans of the
48+
matrix array
49+
50+
row-hold:
51+
$ref: /schemas/types.yaml#/definitions/uint32
52+
description: time in nanoseconds to pause between scans of each row in the
53+
matrix array.
54+
55+
required:
56+
- compatible
57+
- reg
58+
- interrupts
59+
- linux,keymap
60+
61+
unevaluatedProperties: false
62+
63+
examples:
64+
- |
65+
#include <dt-bindings/input/input.h>
66+
#include <dt-bindings/interrupt-controller/irq.h>
67+
pmic {
68+
#address-cells = <1>;
69+
#size-cells = <0>;
70+
71+
keypad@148 {
72+
compatible = "qcom,pm8921-keypad";
73+
reg = <0x148>;
74+
interrupt-parent = <&pmicintc>;
75+
interrupts = <74 IRQ_TYPE_EDGE_RISING>, <75 IRQ_TYPE_EDGE_RISING>;
76+
linux,keymap = <
77+
MATRIX_KEY(0, 0, KEY_VOLUMEUP)
78+
MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
79+
MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
80+
MATRIX_KEY(0, 3, KEY_CAMERA)
81+
>;
82+
keypad,num-rows = <1>;
83+
keypad,num-columns = <5>;
84+
debounce = <15>;
85+
scan-delay = <32>;
86+
row-hold = <91500>;
87+
};
88+
};
89+
...

0 commit comments

Comments
 (0)