pinctrl: dt-binding: fix generic pinmux/pinconf examples
diff mbox

Message ID b6effc6c0cb6b9488145b873dc01fcba2a4cd1df.1426402515.git.baruch@tkos.co.il
State New
Headers show

Commit Message

Baruch Siach March 15, 2015, 6:55 a.m. UTC
pinconf_generic_dt_node_to_map() scans only subnodes of the pinctrl-0 pahndle,
not the referenced node itself. Change the example nodes to match.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 .../bindings/pinctrl/pinctrl-bindings.txt          | 30 ++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

Comments

Linus Walleij March 18, 2015, 12:16 p.m. UTC | #1
On Sun, Mar 15, 2015 at 7:55 AM, Baruch Siach <baruch@tkos.co.il> wrote:

> pinconf_generic_dt_node_to_map() scans only subnodes of the pinctrl-0 pahndle,
> not the referenced node itself. Change the example nodes to match.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Patch applied...

>  state_0_node_a {
> -       function = "uart0";
> -       groups = "u0rxtx", "u0rtscts";
> +       uart0 {
> +               function = "uart0";
> +               groups = "u0rxtx", "u0rtscts";
> +       };
>  };
>  state_1_node_a {
> -       function = "spi0";
> -       groups = "spi0pins";
> +       spi0 {
> +               function = "spi0";
> +               groups = "spi0pins";
> +       };
>  };

But that is a bit insane. We should fix the parsing code to handle
either case instead.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Baruch Siach March 18, 2015, 12:25 p.m. UTC | #2
Hi Linus,

On Wed, Mar 18, 2015 at 01:16:00PM +0100, Linus Walleij wrote:
> On Sun, Mar 15, 2015 at 7:55 AM, Baruch Siach <baruch@tkos.co.il> wrote:
> > pinconf_generic_dt_node_to_map() scans only subnodes of the pinctrl-0 
> > pahndle, not the referenced node itself. Change the example nodes to 
> > match.
> >
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> 
> Patch applied...
> 
> >  state_0_node_a {
> > -       function = "uart0";
> > -       groups = "u0rxtx", "u0rtscts";
> > +       uart0 {
> > +               function = "uart0";
> > +               groups = "u0rxtx", "u0rtscts";
> > +       };
> >  };
> >  state_1_node_a {
> > -       function = "spi0";
> > -       groups = "spi0pins";
> > +       spi0 {
> > +               function = "spi0";
> > +               groups = "spi0pins";
> > +       };
> >  };
> 
> But that is a bit insane. We should fix the parsing code to handle
> either case instead.

OK. I'll take a look into this tomorrow.

baruch

Patch
diff mbox

diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
index 950580c92448..e9ebe5d35835 100644
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
@@ -137,12 +137,16 @@  groups			- the list of groups to select with this function
 Example:
 
 state_0_node_a {
-	function = "uart0";
-	groups = "u0rxtx", "u0rtscts";
+	uart0 {
+		function = "uart0";
+		groups = "u0rxtx", "u0rtscts";
+	};
 };
 state_1_node_a {
-	function = "spi0";
-	groups = "spi0pins";
+	spi0 {
+		function = "spi0";
+		groups = "spi0pins";
+	};
 };
 
 == Generic pin configuration node content ==
@@ -188,16 +192,22 @@  slew-rate		- set the slew rate
 For example:
 
 state_0_node_a {
-	pins = "GPIO0_AJ5", "GPIO2_AH4"; /* CTS+RXD */
-	bias-pull-up;
+	cts_rxd {
+		pins = "GPIO0_AJ5", "GPIO2_AH4"; /* CTS+RXD */
+		bias-pull-up;
+	};
 };
 state_1_node_a {
-	pins = "GPIO1_AJ3", "GPIO3_AH3"; /* RTS+TXD */
-	output-high;
+	rts_txd {
+		pins = "GPIO1_AJ3", "GPIO3_AH3"; /* RTS+TXD */
+		output-high;
+	};
 };
 state_2_node_a {
-	group = "foo-group";
-	bias-pull-up;
+	foo {
+		group = "foo-group";
+		bias-pull-up;
+	};
 };
 
 Some of the generic properties take arguments. For those that do, the