Skip to content

L
linux
Commit 0809edba authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'devicetree-fixes-for-5.17-1' of git://git.kernel.org/pub/scm/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
parents 636b5284 18a86e59
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 362 additions and 482 deletions
Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml
View file @ 0809edba
...@@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Analogix ANX7814 SlimPort (Full-HD Transmitter) title: Analogix ANX7814 SlimPort (Full-HD Transmitter)
maintainers: 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: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/bridge/google,cros-ec-anx7688.yaml
View file @ 0809edba
...@@ -8,7 +8,6 @@ title: ChromeOS EC ANX7688 HDMI to DP Converter through Type-C Port ...@@ -8,7 +8,6 @@ title: ChromeOS EC ANX7688 HDMI to DP Converter through Type-C Port
maintainers: maintainers:
- Nicolas Boichat <drinkcat@chromium.org> - Nicolas Boichat <drinkcat@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
description: | description: |
ChromeOS EC ANX7688 is a display bridge that converts HDMI 2.0 to ChromeOS EC ANX7688 is a display bridge that converts HDMI 2.0 to
......
Documentation/devicetree/bindings/display/bridge/ps8640.yaml
View file @ 0809edba
...@@ -8,7 +8,6 @@ title: MIPI DSI to eDP Video Format Converter Device Tree Bindings ...@@ -8,7 +8,6 @@ title: MIPI DSI to eDP Video Format Converter Device Tree Bindings
maintainers: maintainers:
- Nicolas Boichat <drinkcat@chromium.org> - Nicolas Boichat <drinkcat@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
description: | description: |
The PS8640 is a low power MIPI-to-eDP video format converter supporting The PS8640 is a low power MIPI-to-eDP video format converter supporting
......
Documentation/devicetree/bindings/display/panel/abt,y030xx067a.yaml
View file @ 0809edba
...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -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 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: maintainers:
- Paul Cercueil <paul@crapouillou.net> - Paul Cercueil <paul@crapouillou.net>
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/panel/ilitek,ili9322.yaml
View file @ 0809edba
...@@ -15,11 +15,9 @@ description: | ...@@ -15,11 +15,9 @@ description: |
960 TFT source driver pins and 240 TFT gate driver pins, VCOM, VCOML and 960 TFT source driver pins and 240 TFT gate driver pins, VCOM, VCOML and
VCOMH outputs. VCOMH outputs.
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/panel/innolux,ej030na.yaml
View file @ 0809edba
...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Innolux EJ030NA 3.0" (320x480 pixels) 24-bit TFT LCD panel 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: maintainers:
- Paul Cercueil <paul@crapouillou.net> - Paul Cercueil <paul@crapouillou.net>
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml
View file @ 0809edba
...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -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 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: maintainers:
- Paul Cercueil <paul@crapouillou.net> - Paul Cercueil <paul@crapouillou.net>
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/panel/lgphilips,lb035q02.yaml
View file @ 0809edba
...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: LG.Philips LB035Q02 Panel 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: maintainers:
- Tomi Valkeinen <tomi.valkeinen@ti.com> - Tomi Valkeinen <tomi.valkeinen@ti.com>
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/panel/samsung,ld9040.yaml
View file @ 0809edba
...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Samsung LD9040 AMOLED LCD parallel RGB panel with SPI control bus 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: maintainers:
- Andrzej Hajda <a.hajda@samsung.com> - Andrzej Hajda <a.hajda@samsung.com>
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
...@@ -63,8 +60,6 @@ examples: ...@@ -63,8 +60,6 @@ examples:
lcd@0 { lcd@0 {
compatible = "samsung,ld9040"; compatible = "samsung,ld9040";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>; reg = <0>;
vdd3-supply = <&ldo7_reg>; vdd3-supply = <&ldo7_reg>;
......
Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.yaml
View file @ 0809edba
...@@ -12,6 +12,7 @@ maintainers: ...@@ -12,6 +12,7 @@ maintainers:
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/leds/backlight/common.yaml# - $ref: /schemas/leds/backlight/common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/panel/sitronix,st7789v.yaml
View file @ 0809edba
...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Sitronix ST7789V RGB panel with SPI control bus 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: maintainers:
- Maxime Ripard <mripard@kernel.org> - Maxime Ripard <mripard@kernel.org>
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/panel/sony,acx565akm.yaml
View file @ 0809edba
...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -6,15 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Sony ACX565AKM SDI Panel 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: maintainers:
- Tomi Valkeinen <tomi.valkeinen@ti.com> - Tomi Valkeinen <tomi.valkeinen@ti.com>
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/panel/tpo,td.yaml
View file @ 0809edba
...@@ -6,16 +6,13 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -6,16 +6,13 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Toppoly TD Panels title: Toppoly TD Panels
description: |
The panel must obey the rules for a SPI slave device as specified in
spi/spi-controller.yaml
maintainers: maintainers:
- Marek Belisko <marek@goldelico.com> - Marek Belisko <marek@goldelico.com>
- H. Nikolaus Schaller <hns@goldelico.com> - H. Nikolaus Schaller <hns@goldelico.com>
allOf: allOf:
- $ref: panel-common.yaml# - $ref: panel-common.yaml#
- $ref: /schemas/spi/spi-peripheral-props.yaml#
properties: properties:
compatible: compatible:
......
Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml
View file @ 0809edba
...@@ -26,14 +26,6 @@ properties: ...@@ -26,14 +26,6 @@ properties:
clock-names: clock-names:
const: hclk const: hclk
pinctrl-0:
maxItems: 2
pinctrl-names:
const: default
description:
Switch the iomux for the HPD/I2C pins to HDMI function.
power-domains: power-domains:
maxItems: 1 maxItems: 1
......
Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.yaml
View file @ 0809edba
...@@ -8,7 +8,6 @@ title: ChromeOS EC USB Type-C cable and accessories detection ...@@ -8,7 +8,6 @@ title: ChromeOS EC USB Type-C cable and accessories detection
maintainers: maintainers:
- Benson Leung <bleung@chromium.org> - Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
description: | description: |
On ChromeOS systems with USB Type C ports, the ChromeOS Embedded Controller is On ChromeOS systems with USB Type C ports, the ChromeOS Embedded Controller is
......
Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml
View file @ 0809edba
...@@ -10,7 +10,6 @@ title: I2C bus that tunnels through the ChromeOS EC (cros-ec) ...@@ -10,7 +10,6 @@ title: I2C bus that tunnels through the ChromeOS EC (cros-ec)
maintainers: maintainers:
- Doug Anderson <dianders@chromium.org> - Doug Anderson <dianders@chromium.org>
- Benson Leung <bleung@chromium.org> - Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
description: | description: |
On some ChromeOS board designs we've got a connection to the EC On some ChromeOS board designs we've got a connection to the EC
......
Documentation/devicetree/bindings/iio/proximity/google,cros-ec-mkbp-proximity.yaml
View file @ 0809edba
...@@ -10,7 +10,6 @@ title: ChromeOS EC MKBP Proximity Sensor ...@@ -10,7 +10,6 @@ title: ChromeOS EC MKBP Proximity Sensor
maintainers: maintainers:
- Stephen Boyd <swboyd@chromium.org> - Stephen Boyd <swboyd@chromium.org>
- Benson Leung <bleung@chromium.org> - Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
description: | description: |
Google's ChromeOS EC sometimes has the ability to detect user proximity. Google's ChromeOS EC sometimes has the ability to detect user proximity.
......
Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml
View file @ 0809edba
...@@ -10,7 +10,6 @@ title: ChromeOS EC Keyboard ...@@ -10,7 +10,6 @@ title: ChromeOS EC Keyboard
maintainers: maintainers:
- Simon Glass <sjg@chromium.org> - Simon Glass <sjg@chromium.org>
- Benson Leung <bleung@chromium.org> - Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
description: | description: |
Google's ChromeOS EC Keyboard is a simple matrix keyboard Google's ChromeOS EC Keyboard is a simple matrix keyboard
......
Documentation/devicetree/bindings/input/gpio-keys.yaml
View file @ 0809edba
...@@ -88,12 +88,6 @@ patternProperties: ...@@ -88,12 +88,6 @@ patternProperties:
which can be disabled to suppress events from the button. which can be disabled to suppress events from the button.
type: boolean type: boolean
pinctrl-0:
maxItems: 1
pinctrl-names:
maxItems: 1
required: required:
- linux,code - linux,code
......
Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
View file @ 0809edba
...@@ -81,14 +81,12 @@ properties: ...@@ -81,14 +81,12 @@ properties:
data-lanes: data-lanes:
description: description:
Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines. Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines.
minItems: 1
items: items:
minItems: 1 - const: 1
maxItems: 4 - const: 2
items: - const: 3
- const: 1 - const: 4
- const: 2
- const: 3
- const: 4
required: required:
- data-lanes - data-lanes
......
Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml
View file @ 0809edba
...@@ -87,14 +87,12 @@ properties: ...@@ -87,14 +87,12 @@ properties:
properties: properties:
data-lanes: data-lanes:
minItems: 1
items: items:
minItems: 1 - const: 1
maxItems: 4 - const: 2
items: - const: 3
- const: 1 - const: 4
- const: 2
- const: 3
- const: 4
required: required:
- data-lanes - data-lanes
......
Documentation/devicetree/bindings/mfd/cirrus,madera.yaml
View file @ 0809edba
...@@ -245,8 +245,7 @@ examples: ...@@ -245,8 +245,7 @@ examples:
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupts = <&host_irq1>; interrupts = <4 1 0>;
interrupt-parent = <&gic>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
......
Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
View file @ 0809edba
...@@ -8,7 +8,6 @@ title: ChromeOS Embedded Controller ...@@ -8,7 +8,6 @@ title: ChromeOS Embedded Controller
maintainers: maintainers:
- Benson Leung <bleung@chromium.org> - Benson Leung <bleung@chromium.org>
- Enric Balletbo i Serra <enric.balletbo@collabora.com>
- Guenter Roeck <groeck@chromium.org> - Guenter Roeck <groeck@chromium.org>
description: description:
......
Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
View file @ 0809edba
...@@ -185,6 +185,9 @@ examples: ...@@ -185,6 +185,9 @@ examples:
clock-names = "mclk", "apb_pclk"; clock-names = "mclk", "apb_pclk";
}; };
- |
#include <dt-bindings/interrupt-controller/irq.h>
mmc@80126000 { mmc@80126000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x80126000 0x1000>; reg = <0x80126000 0x1000>;
...@@ -206,12 +209,12 @@ examples: ...@@ -206,12 +209,12 @@ examples:
vqmmc-supply = <&vmmci>; vqmmc-supply = <&vmmci>;
}; };
- |
mmc@101f6000 { mmc@101f6000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
reg = <0x101f6000 0x1000>; reg = <0x101f6000 0x1000>;
clocks = <&sdiclk>, <&pclksdi>; clocks = <&sdiclk>, <&pclksdi>;
clock-names = "mclk", "apb_pclk"; clock-names = "mclk", "apb_pclk";
interrupt-parent = <&vica>;
interrupts = <22>; interrupts = <22>;
max-frequency = <400000>; max-frequency = <400000>;
bus-width = <4>; bus-width = <4>;
...@@ -226,6 +229,7 @@ examples: ...@@ -226,6 +229,7 @@ examples:
vmmc-supply = <&vmmc_regulator>; vmmc-supply = <&vmmc_regulator>;
}; };
- |
mmc@52007000 { mmc@52007000 {
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x10153180>; arm,primecell-periphid = <0x10153180>;
......
Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
View file @ 0809edba
...@@ -76,33 +76,31 @@ properties: ...@@ -76,33 +76,31 @@ properties:
M_CAN user manual for details. M_CAN user manual for details.
$ref: /schemas/types.yaml#/definitions/int32-array $ref: /schemas/types.yaml#/definitions/int32-array
items: items:
items: - description: The 'offset' is an address offset of the Message RAM where
- description: The 'offset' is an address offset of the Message RAM where the following elements start from. This is usually set to 0x0 if
the following elements start from. This is usually set to 0x0 if you're using a private Message RAM.
you're using a private Message RAM. default: 0
default: 0 - description: 11-bit Filter 0-128 elements / 0-128 words
- description: 11-bit Filter 0-128 elements / 0-128 words minimum: 0
minimum: 0 maximum: 128
maximum: 128 - description: 29-bit Filter 0-64 elements / 0-128 words
- description: 29-bit Filter 0-64 elements / 0-128 words minimum: 0
minimum: 0 maximum: 64
maximum: 64 - description: Rx FIFO 0 0-64 elements / 0-1152 words
- description: Rx FIFO 0 0-64 elements / 0-1152 words minimum: 0
minimum: 0 maximum: 64
maximum: 64 - description: Rx FIFO 1 0-64 elements / 0-1152 words
- description: Rx FIFO 1 0-64 elements / 0-1152 words minimum: 0
minimum: 0 maximum: 64
maximum: 64 - description: Rx Buffers 0-64 elements / 0-1152 words
- description: Rx Buffers 0-64 elements / 0-1152 words minimum: 0
minimum: 0 maximum: 64
maximum: 64 - description: Tx Event FIFO 0-32 elements / 0-64 words
- description: Tx Event FIFO 0-32 elements / 0-64 words minimum: 0
minimum: 0 maximum: 32
maximum: 32 - description: Tx Buffers 0-32 elements / 0-576 words
- description: Tx Buffers 0-32 elements / 0-576 words minimum: 0
minimum: 0 maximum: 32
maximum: 32
maxItems: 1
power-domains: power-domains:
description: description:
......
Documentation/devicetree/bindings/net/ethernet-controller.yaml
View file @ 0809edba
...@@ -17,9 +17,8 @@ properties: ...@@ -17,9 +17,8 @@ properties:
description: description:
Specifies the MAC address that was assigned to the network device. Specifies the MAC address that was assigned to the network device.
$ref: /schemas/types.yaml#/definitions/uint8-array $ref: /schemas/types.yaml#/definitions/uint8-array
items: minItems: 6
- minItems: 6 maxItems: 6
maxItems: 6
mac-address: mac-address:
description: description:
...@@ -28,9 +27,8 @@ properties: ...@@ -28,9 +27,8 @@ properties:
to the device by the boot program is different from the to the device by the boot program is different from the
local-mac-address property. local-mac-address property.
$ref: /schemas/types.yaml#/definitions/uint8-array $ref: /schemas/types.yaml#/definitions/uint8-array
items: minItems: 6
- minItems: 6 maxItems: 6
maxItems: 6
max-frame-size: max-frame-size:
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
...@@ -164,33 +162,30 @@ properties: ...@@ -164,33 +162,30 @@ properties:
type: array type: array
then: then:
deprecated: true deprecated: true
minItems: 1
maxItems: 1
items: items:
items: - minimum: 0
- minimum: 0 maximum: 31
maximum: 31 description:
description: Emulated PHY ID, choose any but unique to the all
Emulated PHY ID, choose any but unique to the all specified fixed-links
specified fixed-links
- enum: [0, 1]
- enum: [0, 1] description:
description: Duplex configuration. 0 for half duplex or 1 for
Duplex configuration. 0 for half duplex or 1 for full duplex
full duplex
- enum: [10, 100, 1000, 2500, 10000]
- enum: [10, 100, 1000, 2500, 10000] description:
description: Link speed in Mbits/sec.
Link speed in Mbits/sec.
- enum: [0, 1]
- enum: [0, 1] description:
description: Pause configuration. 0 for no pause, 1 for pause
Pause configuration. 0 for no pause, 1 for pause
- enum: [0, 1]
- enum: [0, 1] description:
description: Asymmetric pause configuration. 0 for no asymmetric
Asymmetric pause configuration. 0 for no asymmetric pause, 1 for asymmetric pause
pause, 1 for asymmetric pause
- if: - if:
......
Documentation/devicetree/bindings/nvmem/nvmem.yaml
View file @ 0809edba
...@@ -50,16 +50,15 @@ patternProperties: ...@@ -50,16 +50,15 @@ patternProperties:
Offset and size in bytes within the storage device. Offset and size in bytes within the storage device.
bits: bits:
maxItems: 1 $ref: /schemas/types.yaml#/definitions/uint32-array
items: items:
items: - minimum: 0
- minimum: 0 maximum: 7
maximum: 7 description:
description: Offset in bit within the address range specified by reg.
Offset in bit within the address range specified by reg. - minimum: 1
- minimum: 1 description:
description: Size in bit within the address range specified by reg.
Size in bit within the address range specified by reg.
required: required:
- reg - reg
......
Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.yaml
View file @ 0809edba
...@@ -51,15 +51,6 @@ properties: ...@@ -51,15 +51,6 @@ properties:
appropriate of the LOCHNAGARx_PIN_NUM_GPIOS define, see [3]. appropriate of the LOCHNAGARx_PIN_NUM_GPIOS define, see [3].
maxItems: 1 maxItems: 1
pinctrl-0:
description:
A phandle to the default pinctrl state.
pinctrl-names:
description:
A pinctrl state named "default" must be defined.
const: default
pin-settings: pin-settings:
type: object type: object
patternProperties: patternProperties:
......
Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml
View file @ 0809edba
...@@ -30,16 +30,6 @@ description: | ...@@ -30,16 +30,6 @@ description: |
Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
properties: properties:
pinctrl-0:
description:
A phandle to the node containing the subnodes containing default
configurations.
pinctrl-names:
description:
A pinctrl state named "default" must be defined.
const: default
pin-settings: pin-settings:
description: description:
One subnode is required to contain the default settings. It One subnode is required to contain the default settings. It
......
Documentation/devicetree/bindings/power/reset/gpio-restart.yaml
View file @ 0809edba
...@@ -43,7 +43,7 @@ properties: ...@@ -43,7 +43,7 @@ properties:
priority: priority:
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
description: | description: |
A priority ranging from 0 to 255 (default 128) according to the following guidelines: A priority ranging from 0 to 255 (default 129) according to the following guidelines:
0: Restart handler of last resort, with limited restart capabilities. 0: Restart handler of last resort, with limited restart capabilities.
128: Default restart handler; use if no other restart handler is expected to be available, 128: Default restart handler; use if no other restart handler is expected to be available,
...@@ -51,7 +51,7 @@ properties: ...@@ -51,7 +51,7 @@ properties:
255: Highest priority restart handler, will preempt all other restart handlers. 255: Highest priority restart handler, will preempt all other restart handlers.
minimum: 0 minimum: 0
maximum: 255 maximum: 255
default: 128 default: 129
active-delay: active-delay:
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
......
Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml
View file @ 0809edba
...@@ -127,6 +127,7 @@ examples: ...@@ -127,6 +127,7 @@ examples:
st,syscfg = <&pwrcfg 0x00 0x100>; st,syscfg = <&pwrcfg 0x00 0x100>;
}; };
- |
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/stm32mp1-clks.h> #include <dt-bindings/clock/stm32mp1-clks.h>
rtc@5c004000 { rtc@5c004000 {
......
Documentation/devicetree/bindings/sound/samsung-i2s.yaml
View file @ 0809edba
...@@ -110,12 +110,6 @@ properties: ...@@ -110,12 +110,6 @@ properties:
Internal DMA register base address of the audio Internal DMA register base address of the audio
subsystem (used in secondary sound source). subsystem (used in secondary sound source).
pinctrl-0:
description: Should specify pin control groups used for this controller.
pinctrl-names:
const: default
power-domains: power-domains:
maxItems: 1 maxItems: 1
......
Documentation/devicetree/bindings/trivial-devices.yaml
View file @ 0809edba
...@@ -31,7 +31,7 @@ properties: ...@@ -31,7 +31,7 @@ properties:
- enum: - enum:
# SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert and Over Temperature Pin # SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert and Over Temperature Pin
- ad,ad7414 - ad,ad7414
# ADM9240: Complete System Hardware Monitor for uProcessor-Based Systems # ADM9240: Complete System Hardware Monitor for uProcessor-Based Systems
- ad,adm9240 - ad,adm9240
# AD5110 - Nonvolatile Digital Potentiometer # AD5110 - Nonvolatile Digital Potentiometer
- adi,ad5110 - adi,ad5110
...@@ -43,7 +43,7 @@ properties: ...@@ -43,7 +43,7 @@ properties:
- adi,adp5589 - adi,adp5589
# AMS iAQ-Core VOC Sensor # AMS iAQ-Core VOC Sensor
- ams,iaq-core - ams,iaq-core
# i2c serial eeprom (24cxx) # i2c serial eeprom (24cxx)
- at,24c08 - at,24c08
# i2c trusted platform module (TPM) # i2c trusted platform module (TPM)
- atmel,at97sc3204t - atmel,at97sc3204t
...@@ -303,9 +303,9 @@ properties: ...@@ -303,9 +303,9 @@ properties:
- skyworks,sky81452 - skyworks,sky81452
# Socionext SynQuacer TPM MMIO module # Socionext SynQuacer TPM MMIO module
- socionext,synquacer-tpm-mmio - socionext,synquacer-tpm-mmio
# i2c serial eeprom (24cxx)
- sparkfun,qwiic-joystick
# SparkFun Qwiic Joystick (COM-15168) with i2c interface # SparkFun Qwiic Joystick (COM-15168) with i2c interface
- sparkfun,qwiic-joystick
# i2c serial eeprom (24cxx)
- st,24c256 - st,24c256
# Ambient Light Sensor with SMBUS/Two Wire Serial Interface # Ambient Light Sensor with SMBUS/Two Wire Serial Interface
- taos,tsl2550 - taos,tsl2550
......
Documentation/devicetree/bindings/vendor-prefixes.yaml
View file @ 0809edba
...@@ -25,6 +25,8 @@ patternProperties: ...@@ -25,6 +25,8 @@ patternProperties:
# Keep list in alphabetical order. # Keep list in alphabetical order.
"^70mai,.*": "^70mai,.*":
description: 70mai Co., Ltd. description: 70mai Co., Ltd.
"^8dev,.*":
description: 8devices, UAB
"^abb,.*": "^abb,.*":
description: ABB description: ABB
"^abilis,.*": "^abilis,.*":
...@@ -441,6 +443,8 @@ patternProperties: ...@@ -441,6 +443,8 @@ patternProperties:
description: Freescale Semiconductor description: Freescale Semiconductor
"^fujitsu,.*": "^fujitsu,.*":
description: Fujitsu Ltd. description: Fujitsu Ltd.
"^fxtec,.*":
description: FX Technology Ltd.
"^gardena,.*": "^gardena,.*":
description: GARDENA GmbH description: GARDENA GmbH
"^gateworks,.*": "^gateworks,.*":
...@@ -515,6 +519,8 @@ patternProperties: ...@@ -515,6 +519,8 @@ patternProperties:
description: HannStar Display Co. description: HannStar Display Co.
"^holtek,.*": "^holtek,.*":
description: Holtek Semiconductor, Inc. description: Holtek Semiconductor, Inc.
"^huawei,.*":
description: Huawei Technologies Co., Ltd.
"^hugsun,.*": "^hugsun,.*":
description: Shenzhen Hugsun Technology Co. Ltd. description: Shenzhen Hugsun Technology Co. Ltd.
"^hwacom,.*": "^hwacom,.*":
...@@ -1207,6 +1213,8 @@ patternProperties: ...@@ -1207,6 +1213,8 @@ patternProperties:
description: THine Electronics, Inc. description: THine Electronics, Inc.
"^thingyjp,.*": "^thingyjp,.*":
description: thingy.jp description: thingy.jp
"^thundercomm,.*":
description: Thundercomm Technology Co., Ltd.
"^ti,.*": "^ti,.*":
description: Texas Instruments description: Texas Instruments
"^tianma,.*": "^tianma,.*":
...@@ -1334,6 +1342,8 @@ patternProperties: ...@@ -1334,6 +1342,8 @@ patternProperties:
description: Wiligear, Ltd. description: Wiligear, Ltd.
"^winbond,.*": "^winbond,.*":
description: Winbond Electronics corp. description: Winbond Electronics corp.
"^wingtech,.*":
description: Wingtech Technology Co., Ltd.
"^winlink,.*": "^winlink,.*":
description: WinLink Co., Ltd description: WinLink Co., Ltd
"^winstar,.*": "^winstar,.*":
......
drivers/of/base.c
View file @ 0809edba
...@@ -1420,15 +1420,18 @@ int of_phandle_iterator_args(struct of_phandle_iterator *it, ...@@ -1420,15 +1420,18 @@ int of_phandle_iterator_args(struct of_phandle_iterator *it,
return count; return count;
} }
static int __of_parse_phandle_with_args(const struct device_node *np, int __of_parse_phandle_with_args(const struct device_node *np,
const char *list_name, const char *list_name,
const char *cells_name, const char *cells_name,
int cell_count, int index, int cell_count, int index,
struct of_phandle_args *out_args) struct of_phandle_args *out_args)
{ {
struct of_phandle_iterator it; struct of_phandle_iterator it;
int rc, cur_index = 0; int rc, cur_index = 0;
if (index < 0)
return -EINVAL;
/* Loop over the phandles until all the requested entry is found */ /* Loop over the phandles until all the requested entry is found */
of_for_each_phandle(&it, rc, np, list_name, cells_name, cell_count) { of_for_each_phandle(&it, rc, np, list_name, cells_name, cell_count) {
/* /*
...@@ -1471,82 +1474,7 @@ static int __of_parse_phandle_with_args(const struct device_node *np, ...@@ -1471,82 +1474,7 @@ static int __of_parse_phandle_with_args(const struct device_node *np,
of_node_put(it.node); of_node_put(it.node);
return rc; return rc;
} }
EXPORT_SYMBOL(__of_parse_phandle_with_args);
/**
* of_parse_phandle - Resolve a phandle property to a device_node pointer
* @np: Pointer to device node holding phandle property
* @phandle_name: Name of property holding a phandle value
* @index: For properties holding a table of phandles, this is the index into
* the table
*
* Return: The device_node pointer with refcount incremented. Use
* of_node_put() on it when done.
*/
struct device_node *of_parse_phandle(const struct device_node *np,
const char *phandle_name, int index)
{
struct of_phandle_args args;
if (index < 0)
return NULL;
if (__of_parse_phandle_with_args(np, phandle_name, NULL, 0,
index, &args))
return NULL;
return args.np;
}
EXPORT_SYMBOL(of_parse_phandle);
/**
* of_parse_phandle_with_args() - Find a node pointed by phandle in a list
* @np: pointer to a device tree node containing a list
* @list_name: property name that contains a list
* @cells_name: property name that specifies phandles' arguments count
* @index: index of a phandle to parse out
* @out_args: optional pointer to output arguments structure (will be filled)
*
* This function is useful to parse lists of phandles and their arguments.
* Returns 0 on success and fills out_args, on error returns appropriate
* errno value.
*
* Caller is responsible to call of_node_put() on the returned out_args->np
* pointer.
*
* Example::
*
* phandle1: node1 {
* #list-cells = <2>;
* };
*
* phandle2: node2 {
* #list-cells = <1>;
* };
*
* node3 {
* list = <&phandle1 1 2 &phandle2 3>;
* };
*
* To get a device_node of the ``node2`` node you may call this:
* of_parse_phandle_with_args(node3, "list", "#list-cells", 1, &args);
*/
int of_parse_phandle_with_args(const struct device_node *np, const char *list_name,
const char *cells_name, int index,
struct of_phandle_args *out_args)
{
int cell_count = -1;
if (index < 0)
return -EINVAL;
/* If cells_name is NULL we assume a cell count of 0 */
if (!cells_name)
cell_count = 0;
return __of_parse_phandle_with_args(np, list_name, cells_name,
cell_count, index, out_args);
}
EXPORT_SYMBOL(of_parse_phandle_with_args);
/** /**
* of_parse_phandle_with_args_map() - Find a node pointed by phandle in a list and remap it * of_parse_phandle_with_args_map() - Find a node pointed by phandle in a list and remap it
...@@ -1732,47 +1660,6 @@ int of_parse_phandle_with_args_map(const struct device_node *np, ...@@ -1732,47 +1660,6 @@ int of_parse_phandle_with_args_map(const struct device_node *np,
} }
EXPORT_SYMBOL(of_parse_phandle_with_args_map); EXPORT_SYMBOL(of_parse_phandle_with_args_map);
/**
* of_parse_phandle_with_fixed_args() - Find a node pointed by phandle in a list
* @np: pointer to a device tree node containing a list
* @list_name: property name that contains a list
* @cell_count: number of argument cells following the phandle
* @index: index of a phandle to parse out
* @out_args: optional pointer to output arguments structure (will be filled)
*
* This function is useful to parse lists of phandles and their arguments.
* Returns 0 on success and fills out_args, on error returns appropriate
* errno value.
*
* Caller is responsible to call of_node_put() on the returned out_args->np
* pointer.
*
* Example::
*
* phandle1: node1 {
* };
*
* phandle2: node2 {
* };
*
* node3 {
* list = <&phandle1 0 2 &phandle2 2 3>;
* };
*
* To get a device_node of the ``node2`` node you may call this:
* of_parse_phandle_with_fixed_args(node3, "list", 2, 1, &args);
*/
int of_parse_phandle_with_fixed_args(const struct device_node *np,
const char *list_name, int cell_count,
int index, struct of_phandle_args *out_args)
{
if (index < 0)
return -EINVAL;
return __of_parse_phandle_with_args(np, list_name, NULL, cell_count,
index, out_args);
}
EXPORT_SYMBOL(of_parse_phandle_with_fixed_args);
/** /**
* of_count_phandle_with_args() - Find the number of phandles references in a property * of_count_phandle_with_args() - Find the number of phandles references in a property
* @np: pointer to a device tree node containing a list * @np: pointer to a device tree node containing a list
......
drivers/of/device.c
View file @ 0809edba
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
const struct of_device_id *of_match_device(const struct of_device_id *matches, const struct of_device_id *of_match_device(const struct of_device_id *matches,
const struct device *dev) const struct device *dev)
{ {
if ((!matches) || (!dev->of_node)) if (!matches || !dev->of_node || dev->of_node_reused)
return NULL; return NULL;
return of_match_node(matches, dev->of_node); return of_match_node(matches, dev->of_node);
} }
......
include/linux/of.h
View file @ 0809edba
This diff is collapsed.
scripts/dtc/dtx_diff
View file @ 0809edba
...@@ -59,12 +59,8 @@ Otherwise DTx is treated as a dts source file (aka .dts). ...@@ -59,12 +59,8 @@ Otherwise DTx is treated as a dts source file (aka .dts).
or '/include/' to be processed. or '/include/' to be processed.
If DTx_1 and DTx_2 are in different architectures, then this script If DTx_1 and DTx_2 are in different architectures, then this script
may not work since \${ARCH} is part of the include path. Two possible may not work since \${ARCH} is part of the include path. The following
workarounds: workaround can be used:
`basename $0` \\
<(ARCH=arch_of_dtx_1 `basename $0` DTx_1) \\
<(ARCH=arch_of_dtx_2 `basename $0` DTx_2)
`basename $0` ARCH=arch_of_dtx_1 DTx_1 >tmp_dtx_1.dts `basename $0` ARCH=arch_of_dtx_1 DTx_1 >tmp_dtx_1.dts
`basename $0` ARCH=arch_of_dtx_2 DTx_2 >tmp_dtx_2.dts `basename $0` ARCH=arch_of_dtx_2 DTx_2 >tmp_dtx_2.dts
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7