Skip to content

Commit

Permalink
Merge tag 'devicetree-fixes-for-6.0-1' of git://git.kernel.org/pub/sc…
Browse files Browse the repository at this point in the history
…m/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
  • Loading branch information
Linus Torvalds committed Aug 13, 2022
2 parents 3d076fe + 8f42658 commit 6c833c0
Show file tree
Hide file tree
Showing 28 changed files with 224 additions and 124 deletions.
4 changes: 1 addition & 3 deletions Documentation/devicetree/bindings/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ quiet_cmd_chk_bindings = CHKDT $@

quiet_cmd_mk_schema = SCHEMA $@
cmd_mk_schema = f=$$(mktemp) ; \
$(if $(DT_MK_SCHEMA_FLAGS), \
printf '%s\n' $(real-prereqs), \
$(find_all_cmd)) > $$f ; \
$(find_all_cmd) > $$f ; \
$(DT_MK_SCHEMA) -j $(DT_MK_SCHEMA_FLAGS) @$$f > $@ ; \
rm -f $$f

Expand Down
15 changes: 13 additions & 2 deletions Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,24 @@ properties:
compatible:
const: google,cros-ec-typec

connector:
'#address-cells':
const: 1

'#size-cells':
const: 0

patternProperties:
'^connector@[0-9a-f]+$':
$ref: /schemas/connector/usb-connector.yaml#
unevaluatedProperties: false
properties:
reg:
maxItems: 1

required:
- compatible

additionalProperties: true #fixme
additionalProperties: false

examples:
- |+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Simple Framebuffer Device Tree Bindings

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

description: |+
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ title: Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor

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

description: |
Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale MMA7455 and MMA7456 three axis accelerometers

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

description:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Analog Devices AD7091R5 4-Channel 12-Bit ADC

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

description: |
Analog Devices AD7091R5 4-Channel 12-Bit ADC
Expand Down
3 changes: 1 addition & 2 deletions Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Analog Devices AD7606 Simultaneous Sampling ADC

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

description: |
Analog Devices AD7606 Simultaneous Sampling ADC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: NXP LPC1850 ADC bindings

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

description:
Supports the ADC found on the LPC1850 SoC.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Texas Instruments ADC108S102 and ADC128S102

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

description: |
Family of 8 channel, 10/12 bit, SPI, single ended ADCs.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Texas Instruments' ads124s08 and ads124s06 ADC chip

maintainers:
- Dan Murphy <dmurphy@ti.com>
- Andrew Davis <afd@ti.com>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ title: HMC425A 6-bit Digital Step Attenuator

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

description: |
Digital Step Attenuator IIO device with gpio interface.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale FXOS8700 Inertial Measurement Unit

maintainers:
- Robert Jones <rjones@gateworks.com>
- Jonathan Cameron <jic23@kernel.org>

description: |
Accelerometer and magnetometer combo device with an i2c and SPI interface.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Common properties for the multicolor LED class.

maintainers:
- Dan Murphy <dmurphy@ti.com>
- Andrew Davis <afd@ti.com>

description: |
Bindings for multi color LEDs show how to describe current outputs of
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/leds/leds-lp50xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: LED driver for LP50XX RGB LED from Texas Instruments.

maintainers:
- Dan Murphy <dmurphy@ti.com>
- Andrew Davis <afd@ti.com>

description: |
The LP50XX is multi-channel, I2C RGB LED Drivers that can group RGB LEDs into
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/mailbox/arm,mhu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ properties:
maxItems: 1

interrupts:
minItems: 2
items:
- description: low-priority non-secure
- description: high-priority non-secure
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ description: |
maintainers:
- Tim Harvey <tharvey@gateworks.com>
- Robert Jones <rjones@gateworks.com>

properties:
$nodename:
Expand Down
94 changes: 0 additions & 94 deletions Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt

This file was deleted.

Loading

0 comments on commit 6c833c0

Please sign in to comment.