Skip to content

Commit

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

Pull Devicetree fixes from Rob Herring:

 - Fix for dependency tracking caused by unittest interaction

 - Fix some schema errors in Tegra memory controller schema

 - Update Maxime Ripard's email address

 - Review fixes to TI cpsw-switch

 - Add wakeup-source prop for STM32 rproc. Got dropped in the schema
   conversion.

* tag 'devicetree-fixes-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of/platform: Unconditionally pause/resume sync state during kernel init
  dt-bindings: memory-controllers: tegra: Fix type references
  dt-bindings: Change maintainer address
  dt-bindings: net: ti: cpsw-switch: update to fix comments
  dt-bindings: remoteproc: stm32: add wakeup-source property
  • Loading branch information
torvalds committed Dec 13, 2019
2 parents dd79b53 + ee9b280 commit 1482e66
Show file tree
Hide file tree
Showing 50 changed files with 66 additions and 67 deletions.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/sunxi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner platforms device tree bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
$nodename:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A64 Display Engine Bus Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
$nodename:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A23 RSB Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#address-cells":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner Clock Control Unit Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#clock-cells":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 Security System Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A31 MIPI-DSI Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#address-cells": true
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: Ronbo RB070D30 DSI Display Panel

maintainers:
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 DMA Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: "dma-controller.yaml#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A64 DMA Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: "dma-controller.yaml#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A31 DMA Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: "dma-controller.yaml#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A31 P2WI (Push/Pull 2 Wires Interface) Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: /schemas/i2c/i2c-controller.yaml#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A33 Thermal Sensor Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#io-channel-cells":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 LRADC Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 Interrupt Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: /schemas/interrupt-controller.yaml#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A20 Non-Maskable Interrupt Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: /schemas/interrupt-controller.yaml#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 CMOS Sensor Interface (CSI) Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

description: |-
The Allwinner A10 and later has a CMOS Sensor Interface to retrieve
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 Infrared Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: "rc.yaml#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ patternProperties:
maximum: 1066000000

nvidia,emem-configuration:
$ref: /schemas/types.yaml#/definitions/uint32-array
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32-array
description: |
Values to be written to the EMEM register block. See section
"15.6.1 MC Registers" in the TRM.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ patternProperties:
maximum: 900000000

nvidia,emc-auto-cal-interval:
$ref: /schemas/types.yaml#/definitions/uint32
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32
description:
Pad calibration interval in microseconds.
minimum: 0
Expand All @@ -78,7 +79,8 @@ patternProperties:
Mode Register 0.

nvidia,emc-zcal-cnt-long:
$ref: /schemas/types.yaml#/definitions/uint32
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32
description:
Number of EMC clocks to wait before issuing any commands after
sending ZCAL_MRW_CMD.
Expand All @@ -96,7 +98,8 @@ patternProperties:
FBIO "read" FIFO periodic resetting enabled.

nvidia,emc-configuration:
$ref: /schemas/types.yaml#/definitions/uint32-array
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32-array
description:
EMC timing characterization data. These are the registers
(see section "18.13.2 EMC Registers" in the TRM) whose values
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ patternProperties:
maximum: 900000000

nvidia,emem-configuration:
$ref: /schemas/types.yaml#/definitions/uint32-array
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32-array
description: |
Values to be written to the EMEM register block. See section
"18.13.1 MC Registers" in the TRM.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 Resistive Touchscreen Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#thermal-sensor-cells":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ allOf:

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#address-cells": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ allOf:

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#address-cells": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ allOf:

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 MDIO Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: "mdio.yaml#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ allOf:

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A83t EMAC Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 CAN Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
compatible:
Expand Down
22 changes: 7 additions & 15 deletions Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/net/ti,cpsw-switch.yaml#
Expand Down Expand Up @@ -44,7 +44,6 @@ properties:
description: CPSW functional clock

clock-names:
maxItems: 1
items:
- const: fck

Expand All @@ -70,7 +69,6 @@ properties:
Phandle to the system control device node which provides access to
efuse IO range with MAC addresses


ethernet-ports:
type: object
properties:
Expand All @@ -82,32 +80,27 @@ properties:
patternProperties:
"^port@[0-9]+$":
type: object
minItems: 1
maxItems: 2
description: CPSW external ports

allOf:
- $ref: ethernet-controller.yaml#

properties:
reg:
maxItems: 1
enum: [1, 2]
items:
- enum: [1, 2]
description: CPSW port number

phys:
$ref: /schemas/types.yaml#definitions/phandle-array
maxItems: 1
description: phandle on phy-gmii-sel PHY

label:
$ref: /schemas/types.yaml#/definitions/string-array
maxItems: 1
description: label associated with this port

ti,dual-emac-pvid:
$ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
allOf:
- $ref: /schemas/types.yaml#/definitions/uint32
minimum: 1
maximum: 1024
description:
Expand Down Expand Up @@ -136,7 +129,6 @@ properties:
description: CPTS reference clock

clock-names:
maxItems: 1
items:
- const: cpts

Expand Down Expand Up @@ -201,7 +193,7 @@ examples:
phys = <&phy_gmii_sel 1>;
phy-handle = <&ethphy0_sw>;
phy-mode = "rgmii";
ti,dual_emac_pvid = <1>;
ti,dual-emac-pvid = <1>;
};
cpsw_port2: port@2 {
Expand All @@ -211,7 +203,7 @@ examples:
phys = <&phy_gmii_sel 2>;
phy-handle = <&ethphy1_sw>;
phy-mode = "rgmii";
ti,dual_emac_pvid = <2>;
ti,dual-emac-pvid = <2>;
};
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 Security ID Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: "nvmem.yaml#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A31 MIPI D-PHY Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#phy-cells":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 Pin Controller Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#gpio-cells":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Allwinner A10 PWM Device Tree Bindings

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>
- Maxime Ripard <[email protected]>

properties:
"#pwm-cells":
Expand Down
Loading

0 comments on commit 1482e66

Please sign in to comment.