Skip to content

Commit 4071b85

Browse files
committed
Merge tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull Devicetree fixes from Rob Herring: - Another round of whack-a-mole removing 'allOf', redundant cases of 'maxItems' and incorrect 'reg' sizes - Fix support for yaml.h in non-standard paths * tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: Remove redundant 'maxItems' dt-bindings: Fix more incorrect 'reg' property sizes in examples dt-bindings: phy: qcom: Fix missing 'ranges' and example addresses dt-bindings: Remove more cases of 'allOf' containing a '$ref' scripts/dtc: use pkg-config to include <yaml.h> in non-standard path
2 parents 7de26c4 + 8440d4a commit 4071b85

Some content is hidden

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

51 files changed

+273
-363
lines changed

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ properties:
8585
CPU power good signal from external PMIC to PMC is enabled.
8686

8787
nvidia,suspend-mode:
88-
allOf:
89-
- $ref: /schemas/types.yaml#/definitions/uint32
90-
- enum: [0, 1, 2]
88+
$ref: /schemas/types.yaml#/definitions/uint32
89+
enum: [0, 1, 2]
9190
description:
9291
The suspend mode that the platform should use.
9392
Mode 0 is for LP0, CPU + Core voltage off and DRAM in self-refresh

Documentation/devicetree/bindings/ata/sata_highbank.yaml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,25 @@ properties:
4040
4141
calxeda,led-order:
4242
description: Maps port numbers to offsets within the SGPIO bitstream.
43-
allOf:
44-
- $ref: /schemas/types.yaml#/definitions/uint32-array
45-
- minItems: 1
46-
maxItems: 8
43+
$ref: /schemas/types.yaml#/definitions/uint32-array
44+
minItems: 1
45+
maxItems: 8
4746

4847
calxeda,port-phys:
4948
description: |
5049
phandle-combophy and lane assignment, which maps each SATA port to a
5150
combophy and a lane within that combophy
52-
allOf:
53-
- $ref: /schemas/types.yaml#/definitions/phandle-array
54-
- minItems: 1
55-
maxItems: 8
51+
$ref: /schemas/types.yaml#/definitions/phandle-array
52+
minItems: 1
53+
maxItems: 8
5654

5755
calxeda,tx-atten:
5856
description: |
5957
Contains TX attenuation override codes, one per port.
6058
The upper 24 bits of each entry are always 0 and thus ignored.
61-
allOf:
62-
- $ref: /schemas/types.yaml#/definitions/uint32-array
63-
- minItems: 1
64-
maxItems: 8
59+
$ref: /schemas/types.yaml#/definitions/uint32-array
60+
minItems: 1
61+
maxItems: 8
6562

6663
calxeda,sgpio-gpio:
6764
description: |

Documentation/devicetree/bindings/bus/baikal,bt1-apb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ examples:
7171
7272
bus@1f059000 {
7373
compatible = "baikal,bt1-apb", "simple-bus";
74-
reg = <0 0x1f059000 0 0x1000>,
75-
<0 0x1d000000 0 0x2040000>;
74+
reg = <0x1f059000 0x1000>,
75+
<0x1d000000 0x2040000>;
7676
reg-names = "ehb", "nodev";
7777
#address-cells = <1>;
7878
#size-cells = <1>;

Documentation/devicetree/bindings/bus/baikal,bt1-axi.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ examples:
8585
8686
bus@1f05a000 {
8787
compatible = "baikal,bt1-axi", "simple-bus";
88-
reg = <0 0x1f05a000 0 0x1000>,
89-
<0 0x1f04d110 0 0x8>;
88+
reg = <0x1f05a000 0x1000>,
89+
<0x1f04d110 0x8>;
9090
reg-names = "qos", "ehb";
9191
#address-cells = <1>;
9292
#size-cells = <1>;

Documentation/devicetree/bindings/clock/imx6q-clock.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ properties:
2323
items:
2424
- description: CCM interrupt request 1
2525
- description: CCM interrupt request 2
26-
maxItems: 2
2726

2827
'#clock-cells':
2928
const: 1

Documentation/devicetree/bindings/clock/imx6sl-clock.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ properties:
2323
items:
2424
- description: CCM interrupt request 1
2525
- description: CCM interrupt request 2
26-
maxItems: 2
2726

2827
'#clock-cells':
2928
const: 1

Documentation/devicetree/bindings/clock/imx6sll-clock.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ properties:
2323
items:
2424
- description: CCM interrupt request 1
2525
- description: CCM interrupt request 2
26-
maxItems: 2
2726

2827
'#clock-cells':
2928
const: 1

Documentation/devicetree/bindings/clock/imx6sx-clock.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ properties:
2323
items:
2424
- description: CCM interrupt request 1
2525
- description: CCM interrupt request 2
26-
maxItems: 2
2726

2827
'#clock-cells':
2928
const: 1

Documentation/devicetree/bindings/clock/imx6ul-clock.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ properties:
2323
items:
2424
- description: CCM interrupt request 1
2525
- description: CCM interrupt request 2
26-
maxItems: 2
2726

2827
'#clock-cells':
2928
const: 1

Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ examples:
106106
#include <dt-bindings/power/rk3288-power.h>
107107
vopb: vopb@ff930000 {
108108
compatible = "rockchip,rk3288-vop";
109-
reg = <0x0 0xff930000 0x0 0x19c>,
110-
<0x0 0xff931000 0x0 0x1000>;
109+
reg = <0xff930000 0x19c>,
110+
<0xff931000 0x1000>;
111111
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
112112
clocks = <&cru ACLK_VOP0>,
113113
<&cru DCLK_VOP0>,

0 commit comments

Comments
 (0)