Commit 4f86a6b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree fixes from Rob Herring:

 - Fix pinctrl node name warnings in examples

 - Add missing 'mux-states' property in ti,tcan104x-can binding

* tag 'devicetree-fixes-for-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: phy: ti,tcan104x-can: Document mux-states property
  dt-bindings: mfd: Fix pinctrl node name warnings
parents 92f90cc9 f6eafa40

Documentation/devicetree/bindings/mfd/brcm,cru.yaml

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ patternProperties: 
  '^phy@[a-f0-9]+$':

    $ref: ../phy/bcm-ns-usb2-phy.yaml



  '^pin-controller@[a-f0-9]+$':

  '^pinctrl@[a-f0-9]+$':

    $ref: ../pinctrl/brcm,ns-pinmux.yaml



  '^syscon@[a-f0-9]+$':
@@ -94,7 +94,7 @@ examples: 
            reg = <0x180 0x4>;

        };



        pin-controller@1c0 {

        pinctrl@1c0 {

            compatible = "brcm,bcm4708-pinmux";

            reg = <0x1c0 0x24>;

            reg-names = "cru_gpio_control";

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ properties: 
      clock-frequency:

        const: 12288000



  lochnagar-pinctrl:

  pinctrl:

    type: object

    $ref: /schemas/pinctrl/cirrus,lochnagar.yaml#
@@ -255,7 +255,7 @@ required: 
  - reg

  - reset-gpios

  - lochnagar-clk

  - lochnagar-pinctrl

  - pinctrl



additionalProperties: false
@@ -293,7 +293,7 @@ examples: 
                clock-frequency = <32768>;

            };



            lochnagar-pinctrl {

            pinctrl {

                compatible = "cirrus,lochnagar-pinctrl";



                gpio-controller;

Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ properties: 
      max bit rate supported in bps

    minimum: 1



  mux-states:

    description:

      mux controller node to route the signals from controller to

      transceiver.

    maxItems: 1



required:

  - compatible

  - '#phy-cells'
@@ -53,4 +59,5 @@ examples: 
      max-bitrate = <5000000>;

      standby-gpios = <&wakeup_gpio1 16 GPIO_ACTIVE_LOW>;

      enable-gpios = <&main_gpio1 67 GPIO_ACTIVE_HIGH>;

      mux-states = <&mux0 1>;

    };

Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml

+0 −3
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ properties: 


    additionalProperties: false



allOf:

  - $ref: "pinctrl.yaml#"



required:

  - pinctrl-0

  - pinctrl-names