Commit a36a383d authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/linus' into dt/next

parents 7971f4be f437ade3
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -85,4 +85,5 @@ examples:
                        <&pd IMX_SC_R_DSP_RAM>;
        mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";
        mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>;
        memory-region = <&dsp_reserved>;
    };
+3 −4
Original line number Diff line number Diff line
@@ -43,13 +43,9 @@ properties:

  dvdd-supply:
    description: DVdd voltage supply
    items:
      - const: dvdd

  avdd-supply:
    description: AVdd voltage supply
    items:
      - const: avdd

  adi,rejection-60-Hz-enable:
    description: |
@@ -99,6 +95,9 @@ required:
examples:
  - |
    spi0 {
      #address-cells = <1>;
      #size-cells = <0>;

      adc@0 {
        compatible = "adi,ad7192";
        reg = <0>;
+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ properties:
          - rc-genius-tvgo-a11mce
          - rc-gotview7135
          - rc-hauppauge
          - rc-hauppauge
          - rc-hisi-poplar
          - rc-hisi-tv-demo
          - rc-imon-mce
+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ properties:
      - description: exclusive PHY reset line
      - description: shared reset line between the PCIe PHY and PCIe controller

  resets-names:
  reset-names:
    items:
      - const: phy
      - const: pcie