Skip to content

Commit 6c833c0

Browse files
committed
Merge tag 'devicetree-fixes-for-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Fix schema warnings in qcom,ipq6018-pinctrl and sdhci-msm - Convert Qualcomm SPMI PMIC to DT schema - Make secure interrupt optional for arm,mhu - Fix google,cros-ec-typec binding allowed properties - Update a bunch of bouncing email addresses * tag 'devicetree-fixes-for-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: chrome: google,cros-ec-typec: restrict allowed properties dt-bindings: Drop Dan Murphy and Ricardo Rivera-Matos dt-bindings: Drop Robert Jones dt-bindings: Drop Beniamin Bia and Stefan Popa dt-bindings: iio: Drop Bogdan Pricop dt-bindings: iio: Drop Joachim Eastwood dt-bindings: mailbox: arm,mhu: Make secure interrupt optional dt-bindings: pinctrl: qcom,ipq6018: Fix example 'gpio-ranges' size dt-bindings: Drop DT_MK_SCHEMA_FLAGS conditional selecting schema files dt-bindings: mfd: convert to yaml Qualcomm SPMI PMIC dt-bindings: mmc: sdhci-msm: Fix 'operating-points-v2 was unexpected' issue dt-bindings: display: simple-framebuffer: Drop Bartlomiej Zolnierkiewicz
2 parents 3d076fe + 8f42658 commit 6c833c0

28 files changed

+224
-124
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ quiet_cmd_chk_bindings = CHKDT $@
4242

4343
quiet_cmd_mk_schema = SCHEMA $@
4444
cmd_mk_schema = f=$$(mktemp) ; \
45-
$(if $(DT_MK_SCHEMA_FLAGS), \
46-
printf '%s\n' $(real-prereqs), \
47-
$(find_all_cmd)) > $$f ; \
45+
$(find_all_cmd) > $$f ; \
4846
$(DT_MK_SCHEMA) -j $(DT_MK_SCHEMA_FLAGS) @$$f > $@ ; \
4947
rm -f $$f
5048

Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,24 @@ properties:
2020
compatible:
2121
const: google,cros-ec-typec
2222

23-
connector:
23+
'#address-cells':
24+
const: 1
25+
26+
'#size-cells':
27+
const: 0
28+
29+
patternProperties:
30+
'^connector@[0-9a-f]+$':
2431
$ref: /schemas/connector/usb-connector.yaml#
32+
unevaluatedProperties: false
33+
properties:
34+
reg:
35+
maxItems: 1
2536

2637
required:
2738
- compatible
2839

29-
additionalProperties: true #fixme
40+
additionalProperties: false
3041

3142
examples:
3243
- |+

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Simple Framebuffer Device Tree Bindings
88

99
maintainers:
10-
- Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
1110
- Hans de Goede <hdegoede@redhat.com>
1211

1312
description: |+

Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ title: Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor
88

99
maintainers:
1010
- Michael Hennerich <michael.hennerich@analog.com>
11-
- Beniamin Bia <beniamin.bia@analog.com>
1211

1312
description: |
1413
Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor

Documentation/devicetree/bindings/iio/accel/fsl,mma7455.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Freescale MMA7455 and MMA7456 three axis accelerometers
88

99
maintainers:
10-
- Joachim Eastwood <manabian@gmail.com>
1110
- Jonathan Cameron <jic23@kernel.org>
1211

1312
description:

Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Analog Devices AD7091R5 4-Channel 12-Bit ADC
88

99
maintainers:
10-
- Beniamin Bia <beniamin.bia@analog.com>
10+
- Michael Hennerich <michael.hennerich@analog.com>
1111

1212
description: |
1313
Analog Devices AD7091R5 4-Channel 12-Bit ADC

Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Analog Devices AD7606 Simultaneous Sampling ADC
88

99
maintainers:
10-
- Beniamin Bia <beniamin.bia@analog.com>
11-
- Stefan Popa <stefan.popa@analog.com>
10+
- Michael Hennerich <michael.hennerich@analog.com>
1211

1312
description: |
1413
Analog Devices AD7606 Simultaneous Sampling ADC

Documentation/devicetree/bindings/iio/adc/nxp,lpc1850-adc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: NXP LPC1850 ADC bindings
88

99
maintainers:
10-
- Joachim Eastwood <manabian@gmail.com>
10+
- Jonathan Cameron <jic23@kernel.org>
1111

1212
description:
1313
Supports the ADC found on the LPC1850 SoC.

Documentation/devicetree/bindings/iio/adc/ti,adc108s102.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Texas Instruments ADC108S102 and ADC128S102
88

99
maintainers:
10-
- Bogdan Pricop <bogdan.pricop@emutex.com>
10+
- Jonathan Cameron <jic23@kernel.org>
1111

1212
description: |
1313
Family of 8 channel, 10/12 bit, SPI, single ended ADCs.

Documentation/devicetree/bindings/iio/adc/ti,ads124s08.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Texas Instruments' ads124s08 and ads124s06 ADC chip
88

99
maintainers:
10-
- Dan Murphy <dmurphy@ti.com>
10+
- Andrew Davis <afd@ti.com>
1111

1212
properties:
1313
compatible:

0 commit comments

Comments
 (0)