Merge tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull Devicetree fixes from Rob Herring: - Another round of whack-a-mole removing 'allOf', redundant cases of 'maxItems' and incorrect 'reg' sizes - Fix support for yaml.h in non-standard paths * tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: Remove redundant 'maxItems' dt-bindings: Fix more incorrect 'reg' property sizes in examples dt-bindings: phy: qcom: Fix missing 'ranges' and example addresses dt-bindings: Remove more cases of 'allOf' containing a '$ref' scripts/dtc: use pkg-config to include <yaml.h> in non-standard path

Merge tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull Devicetree fixes from Rob Herring: - Another round of whack-a-mole removing 'allOf', redundant cases of 'maxItems' and incorrect 'reg' sizes - Fix support for yaml.h in non-standard paths * tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: Remove redundant 'maxItems' dt-bindings: Fix more incorrect 'reg' property sizes in examples dt-bindings: phy: qcom: Fix missing 'ranges' and example addresses dt-bindings: Remove more cases of 'allOf' containing a '$ref' scripts/dtc: use pkg-config to include <yaml.h> in non-standard path
4071b856 · Linus Torvalds · 7de26c41 · 8440d4a7 · 4071b856 · 4071b856
Commit 4071b856 authored Jun 12, 2020 by Linus Torvalds
51 changed files
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml
@@ -85,9 +85,8 @@ properties:
      CPU power good signal from external PMIC to PMC is enabled.
  nvidia,suspend-mode:
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [0, 1, 2]
-      - enum: [0, 1, 2]
    description:
      The suspend mode that the platform should use.
      Mode 0 is for LP0, CPU + Core voltage off and DRAM in self-refresh

--- a/Documentation/devicetree/bindings/ata/sata_highbank.yaml
+++ b/Documentation/devicetree/bindings/ata/sata_highbank.yaml
@@ -40,28 +40,25 @@ properties:
  calxeda,led-order:
    description: Maps port numbers to offsets within the SGPIO bitstream.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
-      - $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 1
-      - minItems: 1
+    maxItems: 8
-        maxItems: 8
  calxeda,port-phys:
    description: |
      phandle-combophy and lane assignment, which maps each SATA port to a
      combophy and a lane within that combophy
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
-      - $ref: /schemas/types.yaml#/definitions/phandle-array
+    minItems: 1
-      - minItems: 1
+    maxItems: 8
-        maxItems: 8
  calxeda,tx-atten:
    description: |
      Contains TX attenuation override codes, one per port.
      The upper 24 bits of each entry are always 0 and thus ignored.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
-      - $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 1
-      - minItems: 1
+    maxItems: 8
-        maxItems: 8
  calxeda,sgpio-gpio:
    description: |

--- a/Documentation/devicetree/bindings/bus/baikal,bt1-apb.yaml
+++ b/Documentation/devicetree/bindings/bus/baikal,bt1-apb.yaml
@@ -71,8 +71,8 @@ examples:
    bus@1f059000 {
      compatible = "baikal,bt1-apb", "simple-bus";
-      reg = <0 0x1f059000 0 0x1000>,
+      reg = <0x1f059000 0x1000>,
-            <0 0x1d000000 0 0x2040000>;
+            <0x1d000000 0x2040000>;
      reg-names = "ehb", "nodev";
      #address-cells = <1>;
      #size-cells = <1>;

--- a/Documentation/devicetree/bindings/bus/baikal,bt1-axi.yaml
+++ b/Documentation/devicetree/bindings/bus/baikal,bt1-axi.yaml
@@ -85,8 +85,8 @@ examples:
    bus@1f05a000 {
      compatible = "baikal,bt1-axi", "simple-bus";
-      reg = <0 0x1f05a000 0 0x1000>,
+      reg = <0x1f05a000 0x1000>,
-            <0 0x1f04d110 0 0x8>;
+            <0x1f04d110 0x8>;
      reg-names = "qos", "ehb";
      #address-cells = <1>;
      #size-cells = <1>;

--- a/Documentation/devicetree/bindings/clock/imx6q-clock.yaml
+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.yaml
@@ -23,7 +23,6 @@ properties:
    items:
      - description: CCM interrupt request 1
      - description: CCM interrupt request 2
-    maxItems: 2
  '#clock-cells':
    const: 1

--- a/Documentation/devicetree/bindings/clock/imx6sl-clock.yaml
+++ b/Documentation/devicetree/bindings/clock/imx6sl-clock.yaml
@@ -23,7 +23,6 @@ properties:
    items:
      - description: CCM interrupt request 1
      - description: CCM interrupt request 2
-    maxItems: 2
  '#clock-cells':
    const: 1

--- a/Documentation/devicetree/bindings/clock/imx6sll-clock.yaml
+++ b/Documentation/devicetree/bindings/clock/imx6sll-clock.yaml
@@ -23,7 +23,6 @@ properties:
    items:
      - description: CCM interrupt request 1
      - description: CCM interrupt request 2
-    maxItems: 2
  '#clock-cells':
    const: 1

--- a/Documentation/devicetree/bindings/clock/imx6sx-clock.yaml
+++ b/Documentation/devicetree/bindings/clock/imx6sx-clock.yaml
@@ -23,7 +23,6 @@ properties:
    items:
      - description: CCM interrupt request 1
      - description: CCM interrupt request 2
-    maxItems: 2
  '#clock-cells':
    const: 1

--- a/Documentation/devicetree/bindings/clock/imx6ul-clock.yaml
+++ b/Documentation/devicetree/bindings/clock/imx6ul-clock.yaml
@@ -23,7 +23,6 @@ properties:
    items:
      - description: CCM interrupt request 1
      - description: CCM interrupt request 2
-    maxItems: 2
  '#clock-cells':
    const: 1

--- a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml
+++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml
@@ -106,8 +106,8 @@ examples:
    #include <dt-bindings/power/rk3288-power.h>
    vopb: vopb@ff930000 {
      compatible = "rockchip,rk3288-vop";
-      reg = <0x0 0xff930000 0x0 0x19c>,
+      reg = <0xff930000 0x19c>,
-            <0x0 0xff931000 0x0 0x1000>;
+            <0xff931000 0x1000>;
      interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
      clocks = <&cru ACLK_VOP0>,
               <&cru DCLK_VOP0>,

--- a/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
+++ b/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
@@ -63,11 +63,10 @@ patternProperties:
      snps,nr-gpios:
        description: The number of GPIO pins exported by the port.
+        $ref: /schemas/types.yaml#/definitions/uint32
        default: 32
-        allOf:
+        minimum: 1
-          - $ref: /schemas/types.yaml#/definitions/uint32
+        maximum: 32
-          - minimum: 1
-            maximum: 32
      interrupts:
        description: |

--- a/Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
+++ b/Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
@@ -67,8 +67,7 @@ properties:
      1 - direct_sync
      2 - scaled_sync
      3 - pulse_sync
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
    minimum: 0
    maximum: 3

--- a/Documentation/devicetree/bindings/iio/light/amstaos,tsl2563.yaml
+++ b/Documentation/devicetree/bindings/iio/light/amstaos,tsl2563.yaml
@@ -25,9 +25,8 @@ properties:
  amstaos,cover-comp-gain:
    description: Multiplier for gain compensation
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [1, 16]
-      - enum: [1, 16]
 required:
  - compatible

--- a/Documentation/devicetree/bindings/input/iqs269a.yaml
+++ b/Documentation/devicetree/bindings/input/iqs269a.yaml
--- a/Documentation/devicetree/bindings/interrupt-controller/loongson,pch-msi.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/loongson,pch-msi.yaml
@@ -25,19 +25,17 @@ properties:
    description:
      u32 value of the base of parent HyperTransport vector allocated
      to PCH MSI.
-    allOf:
+    $ref: "/schemas/types.yaml#/definitions/uint32"
-      - $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 0
-      - minimum: 0
+    maximum: 255
-        maximum: 255
  loongson,msi-num-vecs:
    description:
      u32 value of the number of parent HyperTransport vectors allocated
      to PCH MSI.
-    allOf:
+    $ref: "/schemas/types.yaml#/definitions/uint32"
-      - $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 1
-      - minimum: 1
+    maximum: 256
-        maximum: 256
  msi-controller: true

--- a/Documentation/devicetree/bindings/interrupt-controller/loongson,pch-pic.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/loongson,pch-pic.yaml
@@ -25,10 +25,9 @@ properties:
    description:
      u32 value of the base of parent HyperTransport vector allocated
      to PCH PIC.
-    allOf:
+    $ref: "/schemas/types.yaml#/definitions/uint32"
-      - $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 0
-      - minimum: 0
+    maximum: 192
-        maximum: 192
  interrupt-controller: true

--- a/Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml
+++ b/Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml
@@ -31,9 +31,8 @@ properties:
  reg-size:
    description: The access width of the register in bytes. Defaults to 1.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [1, 2, 4, 8]
-      - enum: [1, 2, 4, 8]
  reg-spacing:
    $ref: /schemas/types.yaml#/definitions/uint32
@@ -43,9 +42,8 @@ properties:
    description: |
      The amount of bits to shift the register content to the right to get
      the data into bit zero.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    maximum: 56
-      - maximum: 56
 required:
  - compatible

--- a/Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml
+++ b/Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml
@@ -57,8 +57,7 @@ properties:
    description: |
      mA; per-string current limit.
      This property is supported only for WLED3.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
    default: 20
    minimum: 0
    maximum: 25
@@ -74,38 +73,33 @@ properties:
  qcom,current-boost-limit:
    description: |
      mA; boost current limit.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
  qcom,switching-freq:
    description: |
      kHz; switching frequency.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [ 600, 640, 685, 738, 800, 872, 960, 1066, 1200, 1371, 1600, 1920, 2400, 3200, 4800, 9600 ]
-      - enum: [ 600, 640, 685, 738, 800, 872, 960, 1066, 1200, 1371, 1600, 1920, 2400, 3200, 4800, 9600 ]
  qcom,ovp:
    description: |
      V; Over-voltage protection limit.
      This property is supported only for WLED3.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [ 27, 29, 32, 35 ]
-      - enum: [ 27, 29, 32, 35 ]
+    default: 29
-      - default: 29
  qcom,ovp-millivolt:
    description: |
      Over-voltage protection limit. This property is for WLED4 only.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [ 18100, 19600, 29600, 31100 ]
-      - enum: [ 18100, 19600, 29600, 31100 ]
+    default: 29600
-      - default: 29600
  qcom,num-strings:
    description: |
      number of led strings attached.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
  qcom,enabled-strings:
    description: |
@@ -113,8 +107,7 @@ properties:
      string of leds are operated individually. Specify the
      list of strings used by the device. Any combination of
      led strings can be used.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
-      - $ref: /schemas/types.yaml#/definitions/uint32-array
    minItems: 1
    maxItems: 4
@@ -150,10 +143,9 @@ properties:
           0 - Modulator A
           1 - Modulator B
      This property is applicable only to WLED5 peripheral.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [ 0, 1 ]
-      - enum: [ 0, 1 ]
+    default: 0
-      - default: 0
  qcom,cabc-sel:
    description: |
@@ -164,9 +156,8 @@ properties:
           2 - CABC 2
           3 - External signal (e.g. LPG) is used for dimming
      This property is applicable only to WLED5 peripheral.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [ 0, 1, 2, 3 ]
-      - enum: [ 0, 1, 2, 3 ]
 allOf:
  - if:

--- a/Documentation/devicetree/bindings/leds/leds-aw2013.yaml
+++ b/Documentation/devicetree/bindings/leds/leds-aw2013.yaml
@@ -32,8 +32,7 @@ properties:
 patternProperties:
  "^led@[0-2]$":
    type: object
-    allOf:
+    $ref: common.yaml#
-      - $ref: common.yaml#
    properties:
      reg:

--- a/Documentation/devicetree/bindings/leds/leds-sgm3140.yaml
+++ b/Documentation/devicetree/bindings/leds/leds-sgm3140.yaml
@@ -33,8 +33,7 @@ properties:
  led:
    type: object
-    allOf:
+    $ref: common.yaml#
-      - $ref: common.yaml#
 required:
  - compatible

--- a/Documentation/devicetree/bindings/mailbox/sprd-mailbox.yaml
+++ b/Documentation/devicetree/bindings/mailbox/sprd-mailbox.yaml
@@ -51,7 +51,7 @@ examples:
    #include <dt-bindings/interrupt-controller/arm-gic.h>
    mailbox: mailbox@400a0000 {
      compatible = "sprd,sc9860-mailbox";
-      reg = <0 0x400a0000 0 0x8000>, <0 0x400a8000 0 0x8000>;
+      reg = <0x400a0000 0x8000>, <0x400a8000 0x8000>;
      #mbox-cells = <1>;
      clock-names = "enable";
      clocks = <&aon_gate 53>;

--- a/Documentation/devicetree/bindings/media/i2c/ov8856.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ov8856.yaml
@@ -79,8 +79,7 @@ properties:
              - const: 4
          link-frequencies:
-            allOf:
+            $ref: /schemas/types.yaml#/definitions/uint64-array
-              - $ref: /schemas/types.yaml#/definitions/uint64-array
            description:
              Allowed data bus frequencies. 360000000, 180000000 Hz or both
              are supported by the driver.

--- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml
+++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml
@@ -61,7 +61,7 @@ examples:
    vdec: video-codec@ff660000 {
        compatible = "rockchip,rk3399-vdec";
-        reg = <0x0 0xff660000 0x0 0x400>;
+        reg = <0xff660000 0x400>;
        interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>;
        clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,
                 <&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>;

--- a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml
+++ b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml
@@ -66,7 +66,7 @@ examples:
        vpu: video-codec@ff9a0000 {
                compatible = "rockchip,rk3288-vpu";
-                reg = <0x0 0xff9a0000 0x0 0x800>;
+                reg = <0xff9a0000 0x800>;
                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "vepu", "vdpu";

--- a/Documentation/devicetree/bindings/memory-controllers/ingenic,nemc.yaml
+++ b/Documentation/devicetree/bindings/memory-controllers/ingenic,nemc.yaml
@@ -45,9 +45,8 @@ patternProperties:
        maxItems: 255
      ingenic,nemc-bus-width:
-        allOf:
+        $ref: /schemas/types.yaml#/definitions/uint32
-          - $ref: /schemas/types.yaml#/definitions/uint32
+        enum: [8, 16]
-          - enum: [8, 16]
        description: Specifies the bus width in bits.
      ingenic,nemc-tAS:

--- a/Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml
+++ b/Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml
@@ -53,7 +53,7 @@ examples:
  - |
    nfc: nand-controller@ff100000 {
        compatible = "xlnx,zynqmp-nand-controller", "arasan,nfc-v3p10";
-        reg = <0x0 0xff100000 0x0 0x1000>;
+        reg = <0xff100000 0x1000>;
        clock-names = "controller", "bus";
        clocks = <&clk200>, <&clk100>;
        interrupt-parent = <&gic>;

--- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
+++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
@@ -145,8 +145,7 @@ patternProperties:
  "^cpts@[0-9a-f]+":
    type: object
-    allOf:
+    $ref: "ti,k3-am654-cpts.yaml#"
-      - $ref: "ti,k3-am654-cpts.yaml#"
    description:
      CPSW Common Platform Time Sync (CPTS) module.

--- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml
+++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml
@@ -74,15 +74,13 @@ properties:
      - const: cpts
  ti,cpts-ext-ts-inputs:
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
    maximum: 8
    description:
      Number of hardware timestamp push inputs (HWx_TS_PUSH)
  ti,cpts-periodic-outputs:
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
    maximum: 8
    description:
      Number of timestamp Generator function outputs (TS_GENFx)
@@ -123,7 +121,7 @@ examples:
    cpts@310d0000 {
         compatible = "ti,am65-cpts";
-         reg = <0x0 0x310d0000 0x0 0x400>;
+         reg = <0x310d0000 0x400>;
         reg-names = "cpts";
         clocks = <&main_cpts_mux>;
         clock-names = "cpts";

--- a/Documentation/devicetree/bindings/pci/cdns-pcie-ep.yaml
+++ b/Documentation/devicetree/bindings/pci/cdns-pcie-ep.yaml
@@ -15,8 +15,7 @@ allOf:
 properties:
  cdns,max-outbound-regions:
    description: maximum number of outbound regions
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
    minimum: 1
    maximum: 32
    default: 32

--- a/Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml
+++ b/Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml
@@ -16,8 +16,7 @@ allOf:
 properties:
  cdns,max-outbound-regions:
    description: maximum number of outbound regions
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
    minimum: 1
    maximum: 32
    default: 32

--- a/Documentation/devicetree/bindings/phy/calxeda-combophy.yaml
+++ b/Documentation/devicetree/bindings/phy/calxeda-combophy.yaml
@@ -29,9 +29,8 @@ properties:
  phydev:
    description: device ID for programming the ComboPHY.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    maximum: 31
-      - maximum: 31
 required:
  - compatible

--- a/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml
@@ -44,6 +44,8 @@ properties:
  "#size-cells":
    enum: [ 1, 2 ]
+  ranges: true
  clocks:
    minItems: 1
    maxItems: 4
@@ -87,6 +89,7 @@ required:
  - "#clock-cells"
  - "#address-cells"
  - "#size-cells"
+  - ranges
  - clocks
  - clock-names
  - resets
@@ -281,10 +284,11 @@ examples:
    #include <dt-bindings/clock/qcom,gcc-sdm845.h>
    usb_2_qmpphy: phy-wrapper@88eb000 {
        compatible = "qcom,sdm845-qmp-usb3-uni-phy";
-        reg = <0 0x088eb000 0 0x18c>;
+        reg = <0x088eb000 0x18c>;
        #clock-cells = <1>;
-        #address-cells = <2>;
+        #address-cells = <1>;
-        #size-cells = <2>;
+        #size-cells = <1>;
+        ranges = <0x0 0x088eb000 0x2000>;
        clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK >,
                 <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
@@ -299,11 +303,11 @@ examples:
        vdda-phy-supply = <&vdda_usb2_ss_1p2>;
        vdda-pll-supply = <&vdda_usb2_ss_core>;
-        usb_2_ssphy: phy@88eb200 {
+        usb_2_ssphy: phy@200 {
-                reg = <0 0x088eb200 0 0x128>,
+                reg = <0x200 0x128>,
-                      <0 0x088eb400 0 0x1fc>,
+                      <0x400 0x1fc>,
-                      <0 0x088eb800 0 0x218>,
+                      <0x800 0x218>,
-                      <0 0x088eb600 0 0x70>;
+                      <0x600 0x70>;
                #clock-cells = <0>;
                #phy-cells = <0>;
                clocks = <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>;

--- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
@@ -34,6 +34,8 @@ properties:
  "#size-cells":
    enum: [ 1, 2 ]
+  ranges: true
  clocks:
    items:
      - description: Phy aux clock.
@@ -86,6 +88,7 @@ required:
  - "#clock-cells"
  - "#address-cells"
  - "#size-cells"
+  - ranges
  - clocks
  - clock-names
  - resets
@@ -100,12 +103,13 @@ examples:
    #include <dt-bindings/clock/qcom,gcc-sdm845.h>
    usb_1_qmpphy: phy-wrapper@88e9000 {
        compatible = "qcom,sdm845-qmp-usb3-phy";
-        reg = <0 0x088e9000 0 0x18c>,
+        reg = <0x088e9000 0x18c>,
-              <0 0x088e8000 0 0x10>;
+              <0x088e8000 0x10>;
        reg-names = "reg-base", "dp_com";
        #clock-cells = <1>;
-        #address-cells = <2>;
+        #address-cells = <1>;
-        #size-cells = <2>;
+        #size-cells = <1>;
+        ranges = <0x0 0x088e9000 0x1000>;
        clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
                 <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
@@ -120,17 +124,17 @@ examples:
        vdda-phy-supply = <&vdda_usb2_ss_1p2>;
        vdda-pll-supply = <&vdda_usb2_ss_core>;
-        usb_1_ssphy: phy@88e9200 {
+        phy@200 {
-                reg = <0 0x088e9200 0 0x128>,
+            reg = <0x200 0x128>,
-                      <0 0x088e9400 0 0x200>,
+                  <0x400 0x200>,
-                      <0 0x088e9c00 0 0x218>,
+                  <0xc00 0x218>,
-                      <0 0x088e9600 0 0x128>,
+                  <0x600 0x128>,
-                      <0 0x088e9800 0 0x200>,
+                  <0x800 0x200>,
-                      <0 0x088e9a00 0 0x100>;
+                  <0xa00 0x100>;
-                #clock-cells = <0>;
+            #clock-cells = <0>;
-                #phy-cells = <0>;
+            #phy-cells = <0>;
-                clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
+            clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
-                clock-names = "pipe0";
+            clock-names = "pipe0";
-                clock-output-names = "usb3_phy_pipe_clk_src";
+            clock-output-names = "usb3_phy_pipe_clk_src";
-            };
        };
+    };
--- a/Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml
@@ -65,7 +65,7 @@ examples:
    #include <dt-bindings/clock/qcom,gcc-sm8150.h>
    phy@88e2000 {
        compatible = "qcom,sm8150-usb-hs-phy";
-        reg = <0 0x088e2000 0 0x400>;
+        reg = <0x088e2000 0x400>;
        #phy-cells = <0>;
        clocks = <&rpmhcc RPMH_CXO_CLK>;

--- a/Documentation/devicetree/bindings/phy/renesas,usb3-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/renesas,usb3-phy.yaml
@@ -52,9 +52,8 @@ properties:
    description: |
      Enable/disable spread spectrum clock (ssc). 0 or the property doesn't
      exist means disabling the ssc. The actual value will be -<value> ppm.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [ 0, 4003, 4492, 4980 ]
-      - enum: [ 0, 4003, 4492, 4980 ]
 required:
  - compatible

--- a/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml
+++ b/Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml
@@ -27,11 +27,9 @@ properties:
      of this binary blob is kept secret by CellWise. The only way to obtain
      it is to mail two batteries to a test facility of CellWise and receive
      back a test report with the binary blob.
-    allOf:
+    $ref: /schemas/types.yaml#definitions/uint8-array
-      - $ref: /schemas/types.yaml#definitions/uint8-array
+    minItems: 64
-    items:
+    maxItems: 64
-      - minItems: 64
-        maxItems: 64
  cellwise,monitor-interval-ms:
    description:
@@ -41,10 +39,9 @@ properties:
  power-supplies:
    description:
      Specifies supplies used for charging the battery connected to this gauge
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
-      - $ref: /schemas/types.yaml#/definitions/phandle-array
+    minItems: 1
-      - minItems: 1
+    maxItems: 8 # Should be enough
-        maxItems: 8 # Should be enough
  monitored-battery:
    description:

--- a/Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml
+++ b/Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml
@@ -32,16 +32,14 @@ properties:
    description:
      The number of times to retry I2C transactions on I2C IO failure.
    default: 0
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
  sbs,poll-retry-count:
    description:
      The number of times to try looking for new status after an external
      change notification.
    default: 0
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
  sbs,battery-detect-gpios:
    description:

--- a/Documentation/devicetree/bindings/pwm/imx-pwm.yaml
+++ b/Documentation/devicetree/bindings/pwm/imx-pwm.yaml
@@ -30,13 +30,11 @@ properties:
    items:
      - description: SoC PWM ipg clock
      - description: SoC PWM per clock
-    maxItems: 2
  clock-names:
    items:
      - const: ipg
      - const: per
-    maxItems: 2
  interrupts:
    maxItems: 1

--- a/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
+++ b/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
@@ -21,8 +21,7 @@ properties:
  regulators:
    type: object
-    allOf:
+    $ref: regulator.yaml#
-      - $ref: regulator.yaml#
    description: |
      list of regulators provided by this controller, must be named
      after their hardware counterparts LDO[1-15], BUCK and BUCKBOOST
@@ -30,13 +29,11 @@ properties:
    patternProperties:
      "^LDO([1-9]|1[0-5])$":
        type: object
-        allOf:
+        $ref: regulator.yaml#
-          - $ref: regulator.yaml#
      "^BUCK|BUCKBOOST$":
        type: object
-        allOf:
+        $ref: regulator.yaml#
-          - $ref: regulator.yaml#
    additionalProperties: false

--- a/Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
@@ -29,8 +29,7 @@ description: |
 patternProperties:
  "^LDO[1-6]$":
    type: object
-    allOf:
+    $ref: regulator.yaml#
-      - $ref: regulator.yaml#
    description:
      Properties for single LDO regulator.
@@ -44,8 +43,7 @@ patternProperties:
  "^BUCK[1-6]$":
    type: object
-    allOf:
+    $ref: regulator.yaml#
-      - $ref: regulator.yaml#
    description:
      Properties for single BUCK regulator.
@@ -56,28 +54,25 @@ patternProperties:
          should be "buck1", ..., "buck6"
      rohm,dvs-run-voltage:
-        allOf:
+        $ref: "/schemas/types.yaml#/definitions/uint32"
-          - $ref: "/schemas/types.yaml#/definitions/uint32"
+        minimum: 0
-          - minimum: 0
+        maximum: 1300000
-            maximum: 1300000
        description:
          PMIC default "RUN" state voltage in uV. See below table for
          bucks which support this. 0 means disabled.
      rohm,dvs-idle-voltage:
-        allOf:
+        $ref: "/schemas/types.yaml#/definitions/uint32"
-          - $ref: "/schemas/types.yaml#/definitions/uint32"
+        minimum: 0
-          - minimum: 0
+        maximum: 1300000
-            maximum: 1300000
        description:
          PMIC default "IDLE" state voltage in uV. See below table for
          bucks which support this. 0 means disabled.
      rohm,dvs-suspend-voltage:
-        allOf:
+        $ref: "/schemas/types.yaml#/definitions/uint32"
-          - $ref: "/schemas/types.yaml#/definitions/uint32"
+        minimum: 0
-          - minimum: 0
+        maximum: 1300000
-            maximum: 1300000
        description:
          PMIC default "SUSPEND" state voltage in uV. See below table for
          bucks which support this. 0 means disabled.

--- a/Documentation/devicetree/bindings/rng/arm-cctrng.yaml
+++ b/Documentation/devicetree/bindings/rng/arm-cctrng.yaml
@@ -28,10 +28,8 @@ properties:
    description:
      Arm TrustZone CryptoCell TRNG engine has 4 ring oscillators.
      Sampling ratio values for these 4 ring oscillators. (from calibration)
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
-      - $ref: /schemas/types.yaml#/definitions/uint32-array
+    maxItems: 4
-      - items:
-          maxItems: 4
  clocks:
    maxItems: 1

--- a/Documentation/devicetree/bindings/serial/samsung_uart.yaml
+++ b/Documentation/devicetree/bindings/serial/samsung_uart.yaml
@@ -33,9 +33,8 @@ properties:
    description: |
      The size (in bytes) of the IO accesses that should be performed
      on the device.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [ 1, 4 ]
-      - enum: [ 1, 4 ]
  clocks:
    minItems: 2

--- a/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml
@@ -100,8 +100,7 @@ patternProperties:
                 supports up to 50MHz, up to four chip selects, programmable
                 data path from 4 bits to 32 bits and numerous protocol
                 variants.
-    allOf:
+    $ref: /spi/spi-controller.yaml#
-      - $ref: /spi/spi-controller.yaml#
    properties:
      compatible:
@@ -126,8 +125,7 @@ patternProperties:
  "i2c@[0-9a-f]+$":
    type: object
    description: GENI serial engine based I2C controller.
-    allOf:
+    $ref: /schemas/i2c/i2c-controller.yaml#
-      - $ref: /schemas/i2c/i2c-controller.yaml#
    properties:
      compatible:
@@ -156,8 +154,7 @@ patternProperties:
  "serial@[0-9a-f]+$":
    type: object
    description: GENI Serial Engine based UART Controller.
-    allOf:
+    $ref: /schemas/serial.yaml#
-      - $ref: /schemas/serial.yaml#
    properties:
      compatible:

--- a/Documentation/devicetree/bindings/sound/fsl,easrc.yaml
+++ b/Documentation/devicetree/bindings/sound/fsl,easrc.yaml
@@ -45,23 +45,20 @@ properties:
      - const: ctx3_tx
  firmware-name:
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/string
-      - $ref: /schemas/types.yaml#/definitions/string
+    const: imx/easrc/easrc-imx8mn.bin
-      - const: imx/easrc/easrc-imx8mn.bin
    description: The coefficient table for the filters
  fsl,asrc-rate:
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    minimum: 8000
-      - minimum: 8000
+    maximum: 192000
-      - maximum: 192000
    description: Defines a mutual sample rate used by DPCM Back Ends
  fsl,asrc-format:
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [2, 6, 10, 32, 36]
-      - enum: [2, 6, 10, 32, 36]
+    default: 2
-        default: 2
    description:
      Defines a mutual sample format used by DPCM Back Ends
@@ -83,7 +80,7 @@ examples:
    easrc: easrc@300c0000 {
           compatible = "fsl,imx8mn-easrc";
-           reg = <0x0 0x300c0000 0x0 0x10000>;
+           reg = <0x300c0000 0x10000>;
           interrupts = <0x0 122 0x4>;
           clocks = <&clk IMX8MN_CLK_ASRC_ROOT>;
           clock-names = "mem";

--- a/Documentation/devicetree/bindings/sound/simple-card.yaml
+++ b/Documentation/devicetree/bindings/sound/simple-card.yaml
@@ -13,15 +13,13 @@ definitions:
  frame-master:
    description: Indicates dai-link frame master.
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
-      - $ref: /schemas/types.yaml#/definitions/phandle-array
+    maxItems: 1
-      - maxItems: 1
  bitclock-master:
    description: Indicates dai-link bit clock master
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
-      - $ref: /schemas/types.yaml#/definitions/phandle-array
+    maxItems: 1
-      - maxItems: 1
  frame-inversion:
    description: dai-link uses frame clock inversion

--- a/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
+++ b/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
@@ -76,13 +76,12 @@ properties:
       PDMIN3 - PDMCLK latching edge used for channel 5 and 6 data
       PDMIN4 - PDMCLK latching edge used for channel 7 and 8 data
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
-      - $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 1
-      - minItems: 1
+    maxItems: 4
-        maxItems: 4
+    items:
-        items:
+      maximum: 1
-          maximum: 1
+    default: [0, 0, 0, 0]
-        default: [0, 0, 0, 0]
  ti,gpi-config:
    description: |
@@ -102,13 +101,12 @@ properties:
       7 - GPIX is configured as a PDM data input for channel 7 and channel
            (PDMDIN4)
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
-      - $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 1
-      - minItems: 1
+    maxItems: 4
-        maxItems: 4
+    items:
-        items:
+      maximum: 7
-          maximum: 7
+    default: [0, 0, 0, 0]
-        default: [0, 0, 0, 0]
 required:
  - compatible

--- a/Documentation/devicetree/bindings/thermal/socionext,uniphier-thermal.yaml
+++ b/Documentation/devicetree/bindings/thermal/socionext,uniphier-thermal.yaml
@@ -28,9 +28,8 @@ properties:
    const: 0
  socionext,tmod-calibration:
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
-      - $ref: /schemas/types.yaml#/definitions/uint32-array
+    maxItems: 2
-      - maxItems: 2
    description:
      A pair of calibrated values referred from PVT, in case that the values
      aren't set on SoC, like a reference board.

--- a/Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml
+++ b/Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml
@@ -52,21 +52,18 @@ properties:
  vhub-vendor-id:
    description: vhub Vendor ID
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    maximum: 65535
-      - maximum: 65535
  vhub-product-id:
    description: vhub Product ID
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    maximum: 65535
-      - maximum: 65535
  vhub-device-revision:
    description: vhub Device Revision in binary-coded decimal
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
+    maximum: 65535
-      - maximum: 65535
  vhub-strings:
    type: object
@@ -90,18 +87,15 @@ properties:
          manufacturer:
            description: vhub manufacturer
-            allOf:
+            $ref: /schemas/types.yaml#/definitions/string
-              - $ref: /schemas/types.yaml#/definitions/string
          product:
            description: vhub product name
-            allOf:
+            $ref: /schemas/types.yaml#/definitions/string
-              - $ref: /schemas/types.yaml#/definitions/string
          serial-number:
            description: vhub device serial number
-            allOf:
+            $ref: /schemas/types.yaml#/definitions/string
-              - $ref: /schemas/types.yaml#/definitions/string
 required:
  - compatible

--- a/Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml
@@ -64,13 +64,11 @@ properties:
     - const: hs_src
  power-domains:
-    maxItems: 2
    items:
      - description: XUSBB(device) power-domain
      - description: XUSBA(superspeed) power-domain
  power-domain-names:
-    maxItems: 2
    items:
      - const: dev
      - const: ss

--- a/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
@@ -17,8 +17,7 @@ properties:
    enum:
      - arm,smc-wdt
  arm,smc-id:
-    allOf:
+    $ref: /schemas/types.yaml#/definitions/uint32
-      - $ref: /schemas/types.yaml#/definitions/uint32
    description: |
      The ATF smc function id used by the firmware.
      Defaults to 0x82003D06 if unset.

--- a/scripts/dtc/Makefile
+++ b/scripts/dtc/Makefile
@@ -20,6 +20,9 @@ endif
 HOST_EXTRACFLAGS += -DNO_YAML
 else
 dtc-objs	+= yamltree.o
+# To include <yaml.h> installed in a non-default path
+HOSTCFLAGS_yamltree.o := $(shell pkg-config --cflags yaml-0.1)
+# To link libyaml installed in a non-default path
 HOSTLDLIBS_dtc	:= $(shell pkg-config yaml-0.1 --libs)
 endif