Skip to content

Commit 8fce905

Browse files
committed
Merge tag 'devicetree-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Fix warnings from enabling more dtc warnings which landed in the merge window and didn't get fixed in time. - Fix some document references from DT schema conversions - Fix kmemleak errors in DT unittests * tag 'devicetree-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (23 commits) kbuild: check libyaml installation for 'make dt_binding_check' of: unittest: kmemleak in duplicate property update of: overlay: kmemleak in dup_and_fixup_symbol_prop() of: unittest: kmemleak in of_unittest_overlay_high_level() of: unittest: kmemleak in of_unittest_platform_populate() of: unittest: kmemleak on changeset destroy MAINTAINERS: dt: fix pointers for ARM Integrator, Versatile and RealView MAINTAINERS: dt: update display/allwinner file entry dt-bindings: iio: dac: AD5570R fix bindings errors dt-bindings: Fix misspellings of "Analog Devices" dt-bindings: pwm: Fix cros-ec-pwm example dtc 'reg' warning docs: dt: rockchip,dwc3.txt: fix a pointer to a renamed file docs: dt: fix a broken reference for a file converted to json docs: dt: qcom,dwc3.txt: fix cross-reference for a converted file docs: dt: fix broken reference to phy-cadence-torrent.yaml dt-bindings: interrupt-controller: Fix loongson,parent_int_map property schema dt-bindings: hwmon: Fix incorrect $id paths dt-bindings: Fix dtc warnings on reg and ranges in examples dt-bindings: BD718x7 - add missing I2C bus properties dt-bindings: clock: syscon-icst: Remove unneeded unit name ...
2 parents 95988fb + 0903060 commit 8fce905

29 files changed

+162
-115
lines changed

Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ properties:
4242
description:
4343
See section 2.3.9 of the DeviceTree Specification.
4444

45+
'#address-cells': true
46+
47+
'#size-cells': true
48+
4549
required:
4650
- "#interconnect-cells"
4751
- compatible
@@ -59,6 +63,8 @@ examples:
5963
compatible = "allwinner,sun5i-a13-mbus";
6064
reg = <0x01c01000 0x1000>;
6165
clocks = <&ccu CLK_MBUS>;
66+
#address-cells = <1>;
67+
#size-cells = <1>;
6268
dma-ranges = <0x00000000 0x40000000 0x20000000>;
6369
#interconnect-cells = <1>;
6470
};

Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ required:
9191

9292
examples:
9393
- |
94-
vco1: clock@00 {
94+
vco1: clock {
9595
compatible = "arm,impd1-vco1";
9696
#clock-cells = <0>;
9797
lock-offset = <0x08>;

Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Analog Device ADV7123 Video DAC
2-
-------------------------------
1+
Analog Devices ADV7123 Video DAC
2+
--------------------------------
33

44
The ADV7123 is a digital-to-analog converter that outputs VGA signals from a
55
parallel video input.

Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Analog Device ADV7511(W)/13/33/35 HDMI Encoders
2-
-----------------------------------------
1+
Analog Devices ADV7511(W)/13/33/35 HDMI Encoders
2+
------------------------------------------------
33

44
The ADV7511, ADV7511W, ADV7513, ADV7533 and ADV7535 are HDMI audio and video
55
transmitters compatible with HDMI 1.4 and DVI 1.0. They support color space

Documentation/devicetree/bindings/dma/adi,axi-dmac.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Analog Device AXI-DMAC DMA controller
1+
Analog Devices AXI-DMAC DMA controller
22

33
Required properties:
44
- compatible: Must be "adi,axi-dmac-1.00.a".

Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2019 Analog Devices Inc.
33
%YAML 1.2
44
---
5-
$id: http://devicetree.org/schemas/bindings/hwmon/adi,axi-fan-control.yaml#
5+
$id: http://devicetree.org/schemas/hwmon/adi,axi-fan-control.yaml#
66
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

88
title: Analog Devices AXI FAN Control Device Tree Bindings
@@ -47,7 +47,7 @@ required:
4747

4848
examples:
4949
- |
50-
fpga_axi: fpga-axi@0 {
50+
fpga_axi: fpga-axi {
5151
#address-cells = <0x2>;
5252
#size-cells = <0x1>;
5353

Documentation/devicetree/bindings/hwmon/adt7475.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/adt7475.yaml#
4+
$id: http://devicetree.org/schemas/hwmon/adt7475.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: ADT7475 hwmon sensor

Documentation/devicetree/bindings/iio/dac/ad5755.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* Analog Device AD5755 IIO Multi-Channel DAC Linux Driver
1+
* Analog Devices AD5755 IIO Multi-Channel DAC Linux Driver
22

33
Required properties:
44
- compatible: Has to contain one of the following:

Documentation/devicetree/bindings/iio/dac/adi,ad5770r.yaml

Lines changed: 46 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2020 Analog Devices Inc.
33
%YAML 1.2
44
---
5-
$id: http://devicetree.org/schemas/bindings/iio/dac/adi,ad5770r.yaml#
5+
$id: http://devicetree.org/schemas/iio/dac/adi,ad5770r.yaml#
66
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

88
title: Analog Devices AD5770R DAC device driver
@@ -49,93 +49,86 @@ properties:
4949
asserted during driver probe.
5050
maxItems: 1
5151

52-
channel0:
52+
channel@0:
5353
description: Represents an external channel which are
5454
connected to the DAC. Channel 0 can act both as a current
5555
source and sink.
5656
type: object
5757

5858
properties:
59-
num:
59+
reg:
6060
description: This represents the channel number.
61-
items:
62-
const: 0
61+
const: 0
6362

6463
adi,range-microamp:
6564
description: Output range of the channel.
6665
oneOf:
67-
- $ref: /schemas/types.yaml#/definitions/int32-array
6866
- items:
69-
- enum: [0 300000]
70-
- enum: [-60000 0]
71-
- enum: [-60000 300000]
67+
- const: 0
68+
- const: 300000
69+
- items:
70+
- const: -60000
71+
- const: 0
72+
- items:
73+
- const: -60000
74+
- const: 300000
7275

73-
channel1:
76+
channel@1:
7477
description: Represents an external channel which are
7578
connected to the DAC.
7679
type: object
7780

7881
properties:
79-
num:
82+
reg:
8083
description: This represents the channel number.
81-
items:
82-
const: 1
84+
const: 1
8385

8486
adi,range-microamp:
8587
description: Output range of the channel.
86-
oneOf:
87-
- $ref: /schemas/types.yaml#/definitions/uint32-array
88-
- items:
89-
- enum: [0 140000]
90-
- enum: [0 250000]
88+
items:
89+
- const: 0
90+
- enum: [ 140000, 250000 ]
9191

92-
channel2:
92+
channel@2:
9393
description: Represents an external channel which are
9494
connected to the DAC.
9595
type: object
9696

9797
properties:
98-
num:
98+
reg:
9999
description: This represents the channel number.
100-
items:
101-
const: 2
100+
const: 2
102101

103102
adi,range-microamp:
104103
description: Output range of the channel.
105-
oneOf:
106-
- $ref: /schemas/types.yaml#/definitions/uint32-array
107-
- items:
108-
- enum: [0 140000]
109-
- enum: [0 250000]
104+
items:
105+
- const: 0
106+
- enum: [ 55000, 150000 ]
110107

111108
patternProperties:
112109
"^channel@([3-5])$":
113110
type: object
114111
description: Represents the external channels which are connected to the DAC.
115112
properties:
116-
num:
113+
reg:
117114
description: This represents the channel number.
118-
items:
119-
minimum: 3
120-
maximum: 5
115+
minimum: 3
116+
maximum: 5
121117

122118
adi,range-microamp:
123119
description: Output range of the channel.
124-
oneOf:
125-
- $ref: /schemas/types.yaml#/definitions/uint32-array
126-
- items:
127-
- enum: [0 45000]
128-
- enum: [0 100000]
120+
items:
121+
- const: 0
122+
- enum: [ 45000, 100000 ]
129123

130124
required:
131125
- reg
132-
- diff-channels
133-
- channel0
134-
- channel1
135-
- channel2
136-
- channel3
137-
- channel4
138-
- channel5
126+
- channel@0
127+
- channel@1
128+
- channel@2
129+
- channel@3
130+
- channel@4
131+
- channel@5
139132

140133
examples:
141134
- |
@@ -144,40 +137,42 @@ examples:
144137
#size-cells = <0>;
145138
146139
ad5770r@0 {
147-
compatible = "ad5770r";
140+
compatible = "adi,ad5770r";
148141
reg = <0>;
149142
spi-max-frequency = <1000000>;
150143
vref-supply = <&vref>;
151144
adi,external-resistor;
152145
reset-gpios = <&gpio 22 0>;
146+
#address-cells = <1>;
147+
#size-cells = <0>;
153148
154149
channel@0 {
155-
num = <0>;
156-
adi,range-microamp = <(-60000) 300000>;
150+
reg = <0>;
151+
adi,range-microamp = <0 300000>;
157152
};
158153
159154
channel@1 {
160-
num = <1>;
155+
reg = <1>;
161156
adi,range-microamp = <0 140000>;
162157
};
163158
164159
channel@2 {
165-
num = <2>;
160+
reg = <2>;
166161
adi,range-microamp = <0 55000>;
167162
};
168163
169164
channel@3 {
170-
num = <3>;
165+
reg = <3>;
171166
adi,range-microamp = <0 45000>;
172167
};
173168
174169
channel@4 {
175-
num = <4>;
170+
reg = <4>;
176171
adi,range-microamp = <0 45000>;
177172
};
178173
179174
channel@5 {
180-
num = <5>;
175+
reg = <5>;
181176
adi,range-microamp = <0 45000>;
182177
};
183178
};

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ examples:
109109
- |
110110
#include <dt-bindings/gpio/gpio.h>
111111
#include <dt-bindings/interrupt-controller/arm-gic.h>
112-
i2c@00000000 {
112+
i2c {
113113
#address-cells = <1>;
114114
#size-cells = <0>;
115115
edt-ft5x06@38 {

0 commit comments

Comments
 (0)