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

Merge branch 'dt/linus' into dt/next 

Pick a fix which didn't make it into v5.16.
parents 785576c9 b398123b

Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ examples: 
        samsung,syscon-phandle = <&pmu_system_controller>;



        /* NTC thermistor is a hwmon device */

        ncp15wb473 {

        thermistor {

            compatible = "murata,ncp15wb473";

            pullup-uv = <1800000>;

            pullup-ohm = <47000>;

Documentation/devicetree/bindings/input/gpio-keys.yaml

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ examples: 
        down {

            label = "GPIO Key DOWN";

            linux,code = <108>;

            interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

            interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

        };

    };

Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml

+2 −12
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ properties: 


            properties:

              data-lanes:

                description:

                  Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines.

                items:

                  minItems: 1

                  maxItems: 4
@@ -91,18 +93,6 @@ properties: 
            required:

              - data-lanes



            allOf:

              - if:

                  properties:

                    compatible:

                      contains:

                        const: fsl,imx7-mipi-csi2

                then:

                  properties:

                    data-lanes:

                      items:

                        maxItems: 2



      port@1:

        $ref: /schemas/graph.yaml#/properties/port

        description:

Documentation/devicetree/bindings/net/ethernet-phy.yaml

+8 −0
Original line number Diff line number Diff line
@@ -91,6 +91,14 @@ properties: 
      compensate for the board being designed with the lanes

      swapped.



  enet-phy-lane-no-swap:

    $ref: /schemas/types.yaml#/definitions/flag

    description:

      If set, indicates that PHY will disable swap of the

      TX/RX lanes. This property allows the PHY to work correcly after

      e.g. wrong bootstrap configuration caused by issues in PCB

      layout design.



  eee-broken-100tx:

    $ref: /schemas/types.yaml#/definitions/flag

    description:

Documentation/devicetree/bindings/power/supply/bq25980.yaml

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ examples: 
          reg = <0x65>;

          interrupt-parent = <&gpio1>;

          interrupts = <16 IRQ_TYPE_EDGE_FALLING>;

          ti,watchdog-timer = <0>;

          ti,watchdog-timeout-ms = <0>;

          ti,sc-ocp-limit-microamp = <2000000>;

          ti,sc-ovp-limit-microvolt = <17800000>;

          monitored-battery = <&bat>;