* [PATCH] pinctrl: fix up device tree bindings
@ 2015-01-10 21:14 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2015-01-10 21:14 UTC (permalink / raw)
To: linux-kernel, linux-arm-kernel; +Cc: linux-gpio, Linus Walleij
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 <linus.walleij@linaro.org>
---
.../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 ++++++++++++----------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
index 6b33b9f18e88..f63fcb3ed352 100644
--- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
+++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
@@ -16,17 +16,22 @@ mux function to select on those pin(s)/group(s), and various pin configuration
parameters, such as input, output, pull up, pull down...
The name of each subnode is not important; all subnodes should be enumerated
-and processed purely based on their content.
+and processed purely based on their content. The subnodes use the generic
+pin multiplexing node layout from the standard pin control bindings
+(see pinctrl-bindings.txt):
-Required subnode-properties:
-- ste,pins : An array of strings. Each string contains the name of a pin or
- group.
-
-Optional subnode-properties:
-- ste,function: A string containing the name of the function to mux to the
+Required pin multiplexing subnode properties:
+- function: A string containing the name of the function to mux to the
pin or group.
+- groups : An array of strings. Each string contains the name of a pin
+ group that will be combined with the function to form a multiplexing
+ set-up.
-- ste,config: Handle of pin configuration node (e.g. ste,config = <&slpm_in_wkup_pdis>)
+Required pin configuration subnode properties:
+- pins: A string array describing the pins affected by the configuration
+ in the node.
+- ste,config: Handle of pin configuration node
+ (e.g. ste,config = <&slpm_in_wkup_pdis>)
- ste,input : <0/1/2>
0: input with no pull
@@ -97,32 +102,32 @@ Example board file extract:
uart0 {
uart0_default_mux: uart0_mux {
u0_default_mux {
- ste,function = "u0";
- ste,pins = "u0_a_1";
+ function = "u0";
+ pins = "u0_a_1";
};
};
uart0_default_mode: uart0_default {
uart0_default_cfg1 {
- ste,pins = "GPIO0", "GPIO2";
+ pins = "GPIO0", "GPIO2";
ste,input = <1>;
};
uart0_default_cfg2 {
- ste,pins = "GPIO1", "GPIO3";
+ pins = "GPIO1", "GPIO3";
ste,output = <1>;
};
};
uart0_sleep_mode: uart0_sleep {
uart0_sleep_cfg1 {
- ste,pins = "GPIO0", "GPIO2";
+ pins = "GPIO0", "GPIO2";
ste,config = <&slpm_in_wkup_pdis>;
};
uart0_sleep_cfg2 {
- ste,pins = "GPIO1";
+ pins = "GPIO1";
ste,config = <&slpm_out_hi_wkup_pdis>;
};
uart0_sleep_cfg3 {
- ste,pins = "GPIO3";
+ pins = "GPIO3";
ste,config = <&slpm_out_wkup_pdis>;
};
};
--
1.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] pinctrl: fix up device tree bindings
@ 2015-01-10 21:14 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2015-01-10 21:14 UTC (permalink / raw)
To: linux-arm-kernel
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 <linus.walleij@linaro.org>
---
.../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 ++++++++++++----------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
index 6b33b9f18e88..f63fcb3ed352 100644
--- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
+++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
@@ -16,17 +16,22 @@ mux function to select on those pin(s)/group(s), and various pin configuration
parameters, such as input, output, pull up, pull down...
The name of each subnode is not important; all subnodes should be enumerated
-and processed purely based on their content.
+and processed purely based on their content. The subnodes use the generic
+pin multiplexing node layout from the standard pin control bindings
+(see pinctrl-bindings.txt):
-Required subnode-properties:
-- ste,pins : An array of strings. Each string contains the name of a pin or
- group.
-
-Optional subnode-properties:
-- ste,function: A string containing the name of the function to mux to the
+Required pin multiplexing subnode properties:
+- function: A string containing the name of the function to mux to the
pin or group.
+- groups : An array of strings. Each string contains the name of a pin
+ group that will be combined with the function to form a multiplexing
+ set-up.
-- ste,config: Handle of pin configuration node (e.g. ste,config = <&slpm_in_wkup_pdis>)
+Required pin configuration subnode properties:
+- pins: A string array describing the pins affected by the configuration
+ in the node.
+- ste,config: Handle of pin configuration node
+ (e.g. ste,config = <&slpm_in_wkup_pdis>)
- ste,input : <0/1/2>
0: input with no pull
@@ -97,32 +102,32 @@ Example board file extract:
uart0 {
uart0_default_mux: uart0_mux {
u0_default_mux {
- ste,function = "u0";
- ste,pins = "u0_a_1";
+ function = "u0";
+ pins = "u0_a_1";
};
};
uart0_default_mode: uart0_default {
uart0_default_cfg1 {
- ste,pins = "GPIO0", "GPIO2";
+ pins = "GPIO0", "GPIO2";
ste,input = <1>;
};
uart0_default_cfg2 {
- ste,pins = "GPIO1", "GPIO3";
+ pins = "GPIO1", "GPIO3";
ste,output = <1>;
};
};
uart0_sleep_mode: uart0_sleep {
uart0_sleep_cfg1 {
- ste,pins = "GPIO0", "GPIO2";
+ pins = "GPIO0", "GPIO2";
ste,config = <&slpm_in_wkup_pdis>;
};
uart0_sleep_cfg2 {
- ste,pins = "GPIO1";
+ pins = "GPIO1";
ste,config = <&slpm_out_hi_wkup_pdis>;
};
uart0_sleep_cfg3 {
- ste,pins = "GPIO3";
+ pins = "GPIO3";
ste,config = <&slpm_out_wkup_pdis>;
};
};
--
1.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] pinctrl: fix up device tree bindings
2015-01-10 21:14 ` Linus Walleij
(?)
@ 2015-01-13 20:06 ` Rob Herring
-1 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2015-01-13 20:06 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-kernel, linux-arm-kernel, linux-gpio
On Sat, Jan 10, 2015 at 3:14 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> 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 <linus.walleij@linaro.org>
Applied for 3.20. Thanks.
> ---
> .../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 ++++++++++++----------
> 1 file changed, 20 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> index 6b33b9f18e88..f63fcb3ed352 100644
> --- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> @@ -16,17 +16,22 @@ mux function to select on those pin(s)/group(s), and various pin configuration
> parameters, such as input, output, pull up, pull down...
>
> The name of each subnode is not important; all subnodes should be enumerated
> -and processed purely based on their content.
> +and processed purely based on their content. The subnodes use the generic
> +pin multiplexing node layout from the standard pin control bindings
> +(see pinctrl-bindings.txt):
>
> -Required subnode-properties:
> -- ste,pins : An array of strings. Each string contains the name of a pin or
> - group.
> -
> -Optional subnode-properties:
> -- ste,function: A string containing the name of the function to mux to the
> +Required pin multiplexing subnode properties:
> +- function: A string containing the name of the function to mux to the
> pin or group.
> +- groups : An array of strings. Each string contains the name of a pin
> + group that will be combined with the function to form a multiplexing
> + set-up.
>
> -- ste,config: Handle of pin configuration node (e.g. ste,config = <&slpm_in_wkup_pdis>)
> +Required pin configuration subnode properties:
> +- pins: A string array describing the pins affected by the configuration
> + in the node.
> +- ste,config: Handle of pin configuration node
> + (e.g. ste,config = <&slpm_in_wkup_pdis>)
>
> - ste,input : <0/1/2>
> 0: input with no pull
> @@ -97,32 +102,32 @@ Example board file extract:
> uart0 {
> uart0_default_mux: uart0_mux {
> u0_default_mux {
> - ste,function = "u0";
> - ste,pins = "u0_a_1";
> + function = "u0";
> + pins = "u0_a_1";
> };
> };
> uart0_default_mode: uart0_default {
> uart0_default_cfg1 {
> - ste,pins = "GPIO0", "GPIO2";
> + pins = "GPIO0", "GPIO2";
> ste,input = <1>;
> };
>
> uart0_default_cfg2 {
> - ste,pins = "GPIO1", "GPIO3";
> + pins = "GPIO1", "GPIO3";
> ste,output = <1>;
> };
> };
> uart0_sleep_mode: uart0_sleep {
> uart0_sleep_cfg1 {
> - ste,pins = "GPIO0", "GPIO2";
> + pins = "GPIO0", "GPIO2";
> ste,config = <&slpm_in_wkup_pdis>;
> };
> uart0_sleep_cfg2 {
> - ste,pins = "GPIO1";
> + pins = "GPIO1";
> ste,config = <&slpm_out_hi_wkup_pdis>;
> };
> uart0_sleep_cfg3 {
> - ste,pins = "GPIO3";
> + pins = "GPIO3";
> ste,config = <&slpm_out_wkup_pdis>;
> };
> };
> --
> 1.9.3
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] pinctrl: fix up device tree bindings
@ 2015-01-13 20:06 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2015-01-13 20:06 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-kernel, linux-arm-kernel, linux-gpio
On Sat, Jan 10, 2015 at 3:14 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> 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 <linus.walleij@linaro.org>
Applied for 3.20. Thanks.
> ---
> .../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 ++++++++++++----------
> 1 file changed, 20 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> index 6b33b9f18e88..f63fcb3ed352 100644
> --- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> @@ -16,17 +16,22 @@ mux function to select on those pin(s)/group(s), and various pin configuration
> parameters, such as input, output, pull up, pull down...
>
> The name of each subnode is not important; all subnodes should be enumerated
> -and processed purely based on their content.
> +and processed purely based on their content. The subnodes use the generic
> +pin multiplexing node layout from the standard pin control bindings
> +(see pinctrl-bindings.txt):
>
> -Required subnode-properties:
> -- ste,pins : An array of strings. Each string contains the name of a pin or
> - group.
> -
> -Optional subnode-properties:
> -- ste,function: A string containing the name of the function to mux to the
> +Required pin multiplexing subnode properties:
> +- function: A string containing the name of the function to mux to the
> pin or group.
> +- groups : An array of strings. Each string contains the name of a pin
> + group that will be combined with the function to form a multiplexing
> + set-up.
>
> -- ste,config: Handle of pin configuration node (e.g. ste,config = <&slpm_in_wkup_pdis>)
> +Required pin configuration subnode properties:
> +- pins: A string array describing the pins affected by the configuration
> + in the node.
> +- ste,config: Handle of pin configuration node
> + (e.g. ste,config = <&slpm_in_wkup_pdis>)
>
> - ste,input : <0/1/2>
> 0: input with no pull
> @@ -97,32 +102,32 @@ Example board file extract:
> uart0 {
> uart0_default_mux: uart0_mux {
> u0_default_mux {
> - ste,function = "u0";
> - ste,pins = "u0_a_1";
> + function = "u0";
> + pins = "u0_a_1";
> };
> };
> uart0_default_mode: uart0_default {
> uart0_default_cfg1 {
> - ste,pins = "GPIO0", "GPIO2";
> + pins = "GPIO0", "GPIO2";
> ste,input = <1>;
> };
>
> uart0_default_cfg2 {
> - ste,pins = "GPIO1", "GPIO3";
> + pins = "GPIO1", "GPIO3";
> ste,output = <1>;
> };
> };
> uart0_sleep_mode: uart0_sleep {
> uart0_sleep_cfg1 {
> - ste,pins = "GPIO0", "GPIO2";
> + pins = "GPIO0", "GPIO2";
> ste,config = <&slpm_in_wkup_pdis>;
> };
> uart0_sleep_cfg2 {
> - ste,pins = "GPIO1";
> + pins = "GPIO1";
> ste,config = <&slpm_out_hi_wkup_pdis>;
> };
> uart0_sleep_cfg3 {
> - ste,pins = "GPIO3";
> + pins = "GPIO3";
> ste,config = <&slpm_out_wkup_pdis>;
> };
> };
> --
> 1.9.3
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] pinctrl: fix up device tree bindings
@ 2015-01-13 20:06 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2015-01-13 20:06 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jan 10, 2015 at 3:14 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> 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 <linus.walleij@linaro.org>
Applied for 3.20. Thanks.
> ---
> .../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 ++++++++++++----------
> 1 file changed, 20 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> index 6b33b9f18e88..f63fcb3ed352 100644
> --- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> @@ -16,17 +16,22 @@ mux function to select on those pin(s)/group(s), and various pin configuration
> parameters, such as input, output, pull up, pull down...
>
> The name of each subnode is not important; all subnodes should be enumerated
> -and processed purely based on their content.
> +and processed purely based on their content. The subnodes use the generic
> +pin multiplexing node layout from the standard pin control bindings
> +(see pinctrl-bindings.txt):
>
> -Required subnode-properties:
> -- ste,pins : An array of strings. Each string contains the name of a pin or
> - group.
> -
> -Optional subnode-properties:
> -- ste,function: A string containing the name of the function to mux to the
> +Required pin multiplexing subnode properties:
> +- function: A string containing the name of the function to mux to the
> pin or group.
> +- groups : An array of strings. Each string contains the name of a pin
> + group that will be combined with the function to form a multiplexing
> + set-up.
>
> -- ste,config: Handle of pin configuration node (e.g. ste,config = <&slpm_in_wkup_pdis>)
> +Required pin configuration subnode properties:
> +- pins: A string array describing the pins affected by the configuration
> + in the node.
> +- ste,config: Handle of pin configuration node
> + (e.g. ste,config = <&slpm_in_wkup_pdis>)
>
> - ste,input : <0/1/2>
> 0: input with no pull
> @@ -97,32 +102,32 @@ Example board file extract:
> uart0 {
> uart0_default_mux: uart0_mux {
> u0_default_mux {
> - ste,function = "u0";
> - ste,pins = "u0_a_1";
> + function = "u0";
> + pins = "u0_a_1";
> };
> };
> uart0_default_mode: uart0_default {
> uart0_default_cfg1 {
> - ste,pins = "GPIO0", "GPIO2";
> + pins = "GPIO0", "GPIO2";
> ste,input = <1>;
> };
>
> uart0_default_cfg2 {
> - ste,pins = "GPIO1", "GPIO3";
> + pins = "GPIO1", "GPIO3";
> ste,output = <1>;
> };
> };
> uart0_sleep_mode: uart0_sleep {
> uart0_sleep_cfg1 {
> - ste,pins = "GPIO0", "GPIO2";
> + pins = "GPIO0", "GPIO2";
> ste,config = <&slpm_in_wkup_pdis>;
> };
> uart0_sleep_cfg2 {
> - ste,pins = "GPIO1";
> + pins = "GPIO1";
> ste,config = <&slpm_out_hi_wkup_pdis>;
> };
> uart0_sleep_cfg3 {
> - ste,pins = "GPIO3";
> + pins = "GPIO3";
> ste,config = <&slpm_out_wkup_pdis>;
> };
> };
> --
> 1.9.3
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] pinctrl: fix up device tree bindings
2015-01-13 20:06 ` Rob Herring
(?)
@ 2015-01-16 12:28 ` Linus Walleij
-1 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2015-01-16 12:28 UTC (permalink / raw)
To: Rob Herring; +Cc: linux-kernel, linux-arm-kernel, linux-gpio
On Tue, Jan 13, 2015 at 9:06 PM, Rob Herring <robherring2@gmail.com> wrote:
> On Sat, Jan 10, 2015 at 3:14 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
>> 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 <linus.walleij@linaro.org>
>
> Applied for 3.20. Thanks.
Oh thanks! :)
I was thinking I'd take it through the pinctrl tree but the
DT tree is even better.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] pinctrl: fix up device tree bindings
@ 2015-01-16 12:28 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2015-01-16 12:28 UTC (permalink / raw)
To: Rob Herring; +Cc: linux-kernel, linux-arm-kernel, linux-gpio
On Tue, Jan 13, 2015 at 9:06 PM, Rob Herring <robherring2@gmail.com> wrote:
> On Sat, Jan 10, 2015 at 3:14 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
>> 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 <linus.walleij@linaro.org>
>
> Applied for 3.20. Thanks.
Oh thanks! :)
I was thinking I'd take it through the pinctrl tree but the
DT tree is even better.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] pinctrl: fix up device tree bindings
@ 2015-01-16 12:28 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2015-01-16 12:28 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 13, 2015 at 9:06 PM, Rob Herring <robherring2@gmail.com> wrote:
> On Sat, Jan 10, 2015 at 3:14 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
>> 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 <linus.walleij@linaro.org>
>
> Applied for 3.20. Thanks.
Oh thanks! :)
I was thinking I'd take it through the pinctrl tree but the
DT tree is even better.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-01-16 12:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-10 21:14 [PATCH] pinctrl: fix up device tree bindings Linus Walleij
2015-01-10 21:14 ` Linus Walleij
2015-01-13 20:06 ` Rob Herring
2015-01-13 20:06 ` Rob Herring
2015-01-13 20:06 ` Rob Herring
2015-01-16 12:28 ` Linus Walleij
2015-01-16 12:28 ` Linus Walleij
2015-01-16 12:28 ` Linus Walleij
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.