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

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
...@@ -39,7 +39,7 @@ patternProperties: ...@@ -39,7 +39,7 @@ patternProperties:
'^phy@[a-f0-9]+$': '^phy@[a-f0-9]+$':
$ref: ../phy/bcm-ns-usb2-phy.yaml $ref: ../phy/bcm-ns-usb2-phy.yaml
'^pin-controller@[a-f0-9]+$': '^pinctrl@[a-f0-9]+$':
$ref: ../pinctrl/brcm,ns-pinmux.yaml $ref: ../pinctrl/brcm,ns-pinmux.yaml
'^syscon@[a-f0-9]+$': '^syscon@[a-f0-9]+$':
...@@ -94,7 +94,7 @@ examples: ...@@ -94,7 +94,7 @@ examples:
reg = <0x180 0x4>; reg = <0x180 0x4>;
}; };
pin-controller@1c0 { pinctrl@1c0 {
compatible = "brcm,bcm4708-pinmux"; compatible = "brcm,bcm4708-pinmux";
reg = <0x1c0 0x24>; reg = <0x1c0 0x24>;
reg-names = "cru_gpio_control"; reg-names = "cru_gpio_control";
......
...@@ -126,7 +126,7 @@ properties: ...@@ -126,7 +126,7 @@ properties:
clock-frequency: clock-frequency:
const: 12288000 const: 12288000
lochnagar-pinctrl: pinctrl:
type: object type: object
$ref: /schemas/pinctrl/cirrus,lochnagar.yaml# $ref: /schemas/pinctrl/cirrus,lochnagar.yaml#
...@@ -255,7 +255,7 @@ required: ...@@ -255,7 +255,7 @@ required:
- reg - reg
- reset-gpios - reset-gpios
- lochnagar-clk - lochnagar-clk
- lochnagar-pinctrl - pinctrl
additionalProperties: false additionalProperties: false
...@@ -293,7 +293,7 @@ examples: ...@@ -293,7 +293,7 @@ examples:
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
lochnagar-pinctrl { pinctrl {
compatible = "cirrus,lochnagar-pinctrl"; compatible = "cirrus,lochnagar-pinctrl";
gpio-controller; gpio-controller;
......
...@@ -37,6 +37,12 @@ properties: ...@@ -37,6 +37,12 @@ properties:
max bit rate supported in bps max bit rate supported in bps
minimum: 1 minimum: 1
mux-states:
description:
mux controller node to route the signals from controller to
transceiver.
maxItems: 1
required: required:
- compatible - compatible
- '#phy-cells' - '#phy-cells'
...@@ -53,4 +59,5 @@ examples: ...@@ -53,4 +59,5 @@ examples:
max-bitrate = <5000000>; max-bitrate = <5000000>;
standby-gpios = <&wakeup_gpio1 16 GPIO_ACTIVE_LOW>; standby-gpios = <&wakeup_gpio1 16 GPIO_ACTIVE_LOW>;
enable-gpios = <&main_gpio1 67 GPIO_ACTIVE_HIGH>; enable-gpios = <&main_gpio1 67 GPIO_ACTIVE_HIGH>;
mux-states = <&mux0 1>;
}; };
...@@ -107,9 +107,6 @@ properties: ...@@ -107,9 +107,6 @@ properties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- pinctrl-0 - pinctrl-0
- pinctrl-names - pinctrl-names
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment