Skip to content

Commit 9a4305b

Browse files
linuswrobherring
authored andcommitted
pinctrl: fix up device tree bindings
After the Nomadik pin controller was force migrated to generic pin control bindings, some leftovers in the documentation need to be cleaned up. The code and device trees are already migrated. Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Rob Herring <[email protected]>
1 parent 96225fd commit 9a4305b

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,22 @@ mux function to select on those pin(s)/group(s), and various pin configuration
1616
parameters, such as input, output, pull up, pull down...
1717

1818
The name of each subnode is not important; all subnodes should be enumerated
19-
and processed purely based on their content.
19+
and processed purely based on their content. The subnodes use the generic
20+
pin multiplexing node layout from the standard pin control bindings
21+
(see pinctrl-bindings.txt):
2022

21-
Required subnode-properties:
22-
- ste,pins : An array of strings. Each string contains the name of a pin or
23-
group.
24-
25-
Optional subnode-properties:
26-
- ste,function: A string containing the name of the function to mux to the
23+
Required pin multiplexing subnode properties:
24+
- function: A string containing the name of the function to mux to the
2725
pin or group.
26+
- groups : An array of strings. Each string contains the name of a pin
27+
group that will be combined with the function to form a multiplexing
28+
set-up.
2829

29-
- ste,config: Handle of pin configuration node (e.g. ste,config = <&slpm_in_wkup_pdis>)
30+
Required pin configuration subnode properties:
31+
- pins: A string array describing the pins affected by the configuration
32+
in the node.
33+
- ste,config: Handle of pin configuration node
34+
(e.g. ste,config = <&slpm_in_wkup_pdis>)
3035

3136
- ste,input : <0/1/2>
3237
0: input with no pull
@@ -97,32 +102,32 @@ Example board file extract:
97102
uart0 {
98103
uart0_default_mux: uart0_mux {
99104
u0_default_mux {
100-
ste,function = "u0";
101-
ste,pins = "u0_a_1";
105+
function = "u0";
106+
pins = "u0_a_1";
102107
};
103108
};
104109
uart0_default_mode: uart0_default {
105110
uart0_default_cfg1 {
106-
ste,pins = "GPIO0", "GPIO2";
111+
pins = "GPIO0", "GPIO2";
107112
ste,input = <1>;
108113
};
109114

110115
uart0_default_cfg2 {
111-
ste,pins = "GPIO1", "GPIO3";
116+
pins = "GPIO1", "GPIO3";
112117
ste,output = <1>;
113118
};
114119
};
115120
uart0_sleep_mode: uart0_sleep {
116121
uart0_sleep_cfg1 {
117-
ste,pins = "GPIO0", "GPIO2";
122+
pins = "GPIO0", "GPIO2";
118123
ste,config = <&slpm_in_wkup_pdis>;
119124
};
120125
uart0_sleep_cfg2 {
121-
ste,pins = "GPIO1";
126+
pins = "GPIO1";
122127
ste,config = <&slpm_out_hi_wkup_pdis>;
123128
};
124129
uart0_sleep_cfg3 {
125-
ste,pins = "GPIO3";
130+
pins = "GPIO3";
126131
ste,config = <&slpm_out_wkup_pdis>;
127132
};
128133
};

0 commit comments

Comments
 (0)