Commit f248d687 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/urgent 



To pick up more UAPI updates to sync with tools/.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 3b2f17ad 011ff616

Documentation/devicetree/bindings/clock/idt,versaclock5.yaml

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ properties: 
    maxItems: 2



  idt,xtal-load-femtofarads:

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

    minimum: 9000

    maximum: 22760

    description: Optional load capacitor for XTAL1 and XTAL2
@@ -84,7 +83,6 @@ patternProperties: 
        enum: [ 1800000, 2500000, 3300000 ]

      idt,slew-percent:

        description: The Slew rate control for CMOS single-ended.

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

        enum: [ 80, 85, 90, 100 ]



required:

Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ patternProperties: 


      st,adc-channel-names:

        description: List of single-ended channel names.

        $ref: /schemas/types.yaml#/definitions/string-array



      st,filter-order:

        description: |

Documentation/devicetree/bindings/input/input.yaml

+0 −1
Original line number Diff line number Diff line
@@ -38,6 +38,5 @@ properties: 
      Duration in seconds which the key should be kept pressed for device to

      reset automatically. Device with key pressed reset feature can specify

      this property.

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



additionalProperties: true

Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ properties: 
      this interconnect to send RPMh commands.



  qcom,bcm-voter-names:

    $ref: /schemas/types.yaml#/definitions/string-array

    description: |

      Names for each of the qcom,bcm-voters specified.

Documentation/devicetree/bindings/leds/leds-bcm6328.txt

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ This controller is present on BCM6318, BCM6328, BCM6362 and BCM63268. 
In these SoCs it's possible to control LEDs both as GPIOs or by hardware.

However, on some devices there are Serial LEDs (LEDs connected to a 74x164

controller), which can either be controlled by software (exporting the 74x164

as spi-gpio. See Documentation/devicetree/bindings/gpio/gpio-74x164.txt), or

by hardware using this driver.

as spi-gpio. See Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml),

or by hardware using this driver.

Some of these Serial LEDs are hardware controlled (e.g. ethernet LEDs) and

exporting the 74x164 as spi-gpio prevents those LEDs to be hardware

controlled, so the only chance to keep them working is by using this driver.