Skip to content

Commit

Permalink
Merge tag 'devicetree-fixes-for-5.17-1' of git://git.kernel.org/pub/s…
Browse files Browse the repository at this point in the history
…cm/linux/kernel/git/robh/linux

Pull devicetree fixes and cleanups from Rob Herring:

 - Fix a regression when probing a child device reusing the parent
   device's DT node pointer

 - Refactor of_parse_phandle*() variants to static inlines

 - Drop Enric Balletbo i Serra as a maintainer

 - Fix DT schemas with arrays incorrectly encoded as a matrix

 - Drop unneeded pinctrl properties from schemas

 - Add SPI peripheral schema to SPI based displays

 - Clean-up several schema examples

 - Clean-up trivial-devices.yaml comments

 - Add missing, in use vendor prefixes: Wingtech, Thundercomm, Huawei,
   F(x)tec, 8devices

* tag 'devicetree-fixes-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: google,cros-ec: drop Enric Balletbo i Serra from maintainers
  dt-bindings: display: bridge: drop Enric Balletbo i Serra from maintainers
  of: Check 'of_node_reused' flag on of_match_device()
  of: property: define of_property_read_u{8,16,32,64}_array() unconditionally
  of: base: make small of_parse_phandle() variants static inline
  dt-bindings: mfd: cirrus,madera: Fix 'interrupts' in example
  dt-bindings: Fix array schemas encoded as matrices
  dt-bindings: Drop unnecessary pinctrl properties
  dt-bindings: rtc: st,stm32-rtc: Make each example a separate entry
  dt-bindings: mmc: arm,pl18x: Make each example a separate entry
  dt-bindings: display: Add SPI peripheral schema to SPI based displays
  scripts/dtc: dtx_diff: remove broken example from help text
  dt-bindings: trivial-devices: fix double spaces in comments
  dt-bindings: trivial-devices: fix swapped comments
  dt-bindings: vendor-prefixes: add Wingtech
  dt-bindings: vendor-prefixes: add Thundercomm
  dt-bindings: vendor-prefixes: add Huawei
  dt-bindings: vendor-prefixes: add F(x)tec
  dt-bindings: vendor-prefixes: add 8devices
  dt-bindings: power: reset: gpio-restart: Correct default priority
  • Loading branch information
torvalds committed Jan 22, 2022
2 parents 636b528 + 18a86e5 commit 0809edb
Show file tree
Hide file tree
Showing 38 changed files with 362 additions and 482 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Analogix ANX7814 SlimPort (Full-HD Transmitter)

maintainers:
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
- Andrzej Hajda <andrzej.hajda@intel.com>
- Neil Armstrong <narmstrong@baylibre.com>
- Robert Foss <robert.foss@linaro.org>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ title: ChromeOS EC ANX7688 HDMI to DP Converter through Type-C Port

maintainers:
- Nicolas Boichat <drinkcat@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>

description: |
ChromeOS EC ANX7688 is a display bridge that converts HDMI 2.0 to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ title: MIPI DSI to eDP Video Format Converter Device Tree Bindings

maintainers:
- Nicolas Boichat <drinkcat@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>

description: |
The PS8640 is a low power MIPI-to-eDP video format converter supporting
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Asia Better Technology 3.0" (320x480 pixels) 24-bit IPS LCD panel

description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers:
- Paul Cercueil <paul@crapouillou.net>

allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ description: |
960 TFT source driver pins and 240 TFT gate driver pins, VCOM, VCOML and
VCOMH outputs.
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Innolux EJ030NA 3.0" (320x480 pixels) 24-bit TFT LCD panel

description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers:
- Paul Cercueil <paul@crapouillou.net>

allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: King Display KD035G6-54NT 3.5" (320x240 pixels) 24-bit TFT LCD panel

description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers:
- Paul Cercueil <paul@crapouillou.net>

allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: LG.Philips LB035Q02 Panel

description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers:
- Tomi Valkeinen <tomi.valkeinen@ti.com>

allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Samsung LD9040 AMOLED LCD parallel RGB panel with SPI control bus

description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers:
- Andrzej Hajda <a.hajda@samsung.com>

allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down Expand Up @@ -63,8 +60,6 @@ examples:
lcd@0 {
compatible = "samsung,ld9040";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
vdd3-supply = <&ldo7_reg>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ maintainers:
allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/leds/backlight/common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Sitronix ST7789V RGB panel with SPI control bus

description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers:
- Maxime Ripard <mripard@kernel.org>

allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Sony ACX565AKM SDI Panel

description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers:
- Tomi Valkeinen <tomi.valkeinen@ti.com>

allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
5 changes: 1 addition & 4 deletions Documentation/devicetree/bindings/display/panel/tpo,td.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Toppoly TD Panels

description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers:
- Marek Belisko <marek@goldelico.com>
- H. Nikolaus Schaller <hns@goldelico.com>

allOf:
- $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ properties:
clock-names:
const: hclk

pinctrl-0:
maxItems: 2

pinctrl-names:
const: default
description:
Switch the iomux for the HPD/I2C pins to HDMI function.

power-domains:
maxItems: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ title: ChromeOS EC USB Type-C cable and accessories detection

maintainers:
- Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>

description: |
On ChromeOS systems with USB Type C ports, the ChromeOS Embedded Controller is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ title: I2C bus that tunnels through the ChromeOS EC (cros-ec)
maintainers:
- Doug Anderson <dianders@chromium.org>
- Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>

description: |
On some ChromeOS board designs we've got a connection to the EC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ title: ChromeOS EC MKBP Proximity Sensor
maintainers:
- Stephen Boyd <swboyd@chromium.org>
- Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>

description: |
Google's ChromeOS EC sometimes has the ability to detect user proximity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ title: ChromeOS EC Keyboard
maintainers:
- Simon Glass <sjg@chromium.org>
- Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>

description: |
Google's ChromeOS EC Keyboard is a simple matrix keyboard
Expand Down
6 changes: 0 additions & 6 deletions Documentation/devicetree/bindings/input/gpio-keys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ patternProperties:
which can be disabled to suppress events from the button.
type: boolean

pinctrl-0:
maxItems: 1

pinctrl-names:
maxItems: 1

required:
- linux,code

Expand Down
12 changes: 5 additions & 7 deletions Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,12 @@ properties:
data-lanes:
description:
Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines.
minItems: 1
items:
minItems: 1
maxItems: 4
items:
- const: 1
- const: 2
- const: 3
- const: 4
- const: 1
- const: 2
- const: 3
- const: 4

required:
- data-lanes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,12 @@ properties:

properties:
data-lanes:
minItems: 1
items:
minItems: 1
maxItems: 4
items:
- const: 1
- const: 2
- const: 3
- const: 4
- const: 1
- const: 2
- const: 3
- const: 4

required:
- data-lanes
Expand Down
3 changes: 1 addition & 2 deletions Documentation/devicetree/bindings/mfd/cirrus,madera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,7 @@ examples:
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <&host_irq1>;
interrupt-parent = <&gic>;
interrupts = <4 1 0>;
gpio-controller;
#gpio-cells = <2>;
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ title: ChromeOS Embedded Controller

maintainers:
- Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
- Guenter Roeck <groeck@chromium.org>

description:
Expand Down
6 changes: 5 additions & 1 deletion Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ examples:
clock-names = "mclk", "apb_pclk";
};
- |
#include <dt-bindings/interrupt-controller/irq.h>
mmc@80126000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80126000 0x1000>;
Expand All @@ -206,12 +209,12 @@ examples:
vqmmc-supply = <&vmmci>;
};
- |
mmc@101f6000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x101f6000 0x1000>;
clocks = <&sdiclk>, <&pclksdi>;
clock-names = "mclk", "apb_pclk";
interrupt-parent = <&vica>;
interrupts = <22>;
max-frequency = <400000>;
bus-width = <4>;
Expand All @@ -226,6 +229,7 @@ examples:
vmmc-supply = <&vmmc_regulator>;
};
- |
mmc@52007000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x10153180>;
Expand Down
Loading

0 comments on commit 0809edb

Please sign in to comment.