Commit 02de58b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree fixes from Rob Herring:

 - Fix handling of HOST_EXTRACFLAGS for dtc

 - Several warning fixes for DT bindings

* tag 'devicetree-fixes-for-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  scripts/dtc: only append to HOST_EXTRACFLAGS instead of overwriting
  dt-bindings: Fix 'reg' size issues in zynqmp examples
  ARM: dts: bcm2835: Change firmware compatible from simple-bus to simple-mfd
  dt-bindings: leds: cznic,turris-omnia-leds: fix error in binding
  dt-bindings: crypto: sa2ul: fix a DT binding check warning
parents 90fb7027 efe84d40

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ properties: 
  compatible:

    items:

      - const: raspberrypi,bcm2835-firmware

      - const: simple-bus

      - const: simple-mfd



  mboxes:

    $ref: '/schemas/types.yaml#/definitions/phandle'
@@ -57,7 +57,7 @@ required: 
examples:

  - |

    firmware {

        compatible = "raspberrypi,bcm2835-firmware", "simple-bus";

        compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";

        mboxes = <&mailbox>;



        firmware_clocks: clocks {

Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ examples: 


    main_crypto: crypto@4e00000 {

        compatible = "ti,j721-sa2ul";

        reg = <0x0 0x4e00000 0x0 0x1200>;

        reg = <0x4e00000 0x1200>;

        power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>;

        dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,

               <&main_udmap 0x4001>;

Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml

+4 −4
Original line number Diff line number Diff line
@@ -145,10 +145,10 @@ examples: 


    display@fd4a0000 {

        compatible = "xlnx,zynqmp-dpsub-1.7";

        reg = <0x0 0xfd4a0000 0x0 0x1000>,

              <0x0 0xfd4aa000 0x0 0x1000>,

              <0x0 0xfd4ab000 0x0 0x1000>,

              <0x0 0xfd4ac000 0x0 0x1000>;

        reg = <0xfd4a0000 0x1000>,

              <0xfd4aa000 0x1000>,

              <0xfd4ab000 0x1000>,

              <0xfd4ac000 0x1000>;

        reg-names = "dp", "blend", "av_buf", "aud";

        interrupts = <0 119 4>;

        interrupt-parent = <&gic>;

Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ examples: 


    dma: dma-controller@fd4c0000 {

      compatible = "xlnx,zynqmp-dpdma";

      reg = <0x0 0xfd4c0000 0x0 0x1000>;

      reg = <0xfd4c0000 0x1000>;

      interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;

      interrupt-parent = <&gic>;

      clocks = <&dpdma_clk>;

Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ properties: 
    const: 0



patternProperties:

  "^multi-led[0-9a-f]$":

  "^multi-led@[0-9a-b]$":

    type: object

    allOf:

      - $ref: leds-class-multicolor.yaml#

CRA Git | Maintained and supported by SUSTech CRA and CCSE