Skip to content

Commit 4f86a6b

Browse files
committed
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
2 parents 92f90cc + f6eafa4 commit 4f86a6b

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ patternProperties:
3939
'^phy@[a-f0-9]+$':
4040
$ref: ../phy/bcm-ns-usb2-phy.yaml
4141

42-
'^pin-controller@[a-f0-9]+$':
42+
'^pinctrl@[a-f0-9]+$':
4343
$ref: ../pinctrl/brcm,ns-pinmux.yaml
4444

4545
'^syscon@[a-f0-9]+$':
@@ -94,7 +94,7 @@ examples:
9494
reg = <0x180 0x4>;
9595
};
9696
97-
pin-controller@1c0 {
97+
pinctrl@1c0 {
9898
compatible = "brcm,bcm4708-pinmux";
9999
reg = <0x1c0 0x24>;
100100
reg-names = "cru_gpio_control";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ properties:
126126
clock-frequency:
127127
const: 12288000
128128

129-
lochnagar-pinctrl:
129+
pinctrl:
130130
type: object
131131
$ref: /schemas/pinctrl/cirrus,lochnagar.yaml#
132132

@@ -255,7 +255,7 @@ required:
255255
- reg
256256
- reset-gpios
257257
- lochnagar-clk
258-
- lochnagar-pinctrl
258+
- pinctrl
259259

260260
additionalProperties: false
261261

@@ -293,7 +293,7 @@ examples:
293293
clock-frequency = <32768>;
294294
};
295295
296-
lochnagar-pinctrl {
296+
pinctrl {
297297
compatible = "cirrus,lochnagar-pinctrl";
298298
299299
gpio-controller;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ properties:
3737
max bit rate supported in bps
3838
minimum: 1
3939

40+
mux-states:
41+
description:
42+
mux controller node to route the signals from controller to
43+
transceiver.
44+
maxItems: 1
45+
4046
required:
4147
- compatible
4248
- '#phy-cells'
@@ -53,4 +59,5 @@ examples:
5359
max-bitrate = <5000000>;
5460
standby-gpios = <&wakeup_gpio1 16 GPIO_ACTIVE_LOW>;
5561
enable-gpios = <&main_gpio1 67 GPIO_ACTIVE_HIGH>;
62+
mux-states = <&mux0 1>;
5663
};

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ properties:
107107

108108
additionalProperties: false
109109

110-
allOf:
111-
- $ref: "pinctrl.yaml#"
112-
113110
required:
114111
- pinctrl-0
115112
- pinctrl-names

0 commit comments

Comments
 (0)