Skip to contentSkip to conversation

pinctrl: single: support #pinctrl-cells = 2

PATCH In review Drew Fustini 7 participants 15 messages Jul 1, 2020 – Jan 18, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v4 cover pinctrl: single: support #pinctrl-cells = 2

Currently, pinctrl-single only allows #pinctrl-cells = 1.

This series will allow pinctrl-single to also support #pinctrl-cells = 2

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

To take advantage of #pinctrl-cells = 2, the AM33XX_PADCONF macro in omap.h is modified to keep pin conf and pin mux values separate.

change log:
- v4: squash patches 2 and 3 together so that git biesct will not result in a boot failure

- v3: change order of patches to make sure the pinctrl-single.c patch does not break anything without the dts patches

- v2: remove outer parentheses from AM33XX_PADCONF macro as it causes a compile error in dtc. I had added it per suggestion from checkpatch about having parentheses around complex values.

Drew Fustini (2):
pinctrl: single: parse #pinctrl-cells = 2
ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

 arch/arm/boot/dts/am33xx-l4.dtsi   |  2 +-
 drivers/pinctrl/pinctrl-single.c   | 11 +++++++++--
 include/dt-bindings/pinctrl/omap.h |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v4 1/2 pinctrl: single: parse #pinctrl-cells = 2

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux), then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

---
 drivers/pinctrl/pinctrl-single.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/pinctrl/pinctrl-single.c +9 -2
index f3a8a465d27e..a436ed7762cc 100644
@@ -1017,10 +1017,17 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,
 			break;
 		}
 
-		/* Index plus one value cell */
 		offset = pinctrl_spec.args[0];
 		vals[found].reg = pcs->base + offset;
-		vals[found].val = pinctrl_spec.args[1];
+
+		switch (pinctrl_spec.args_count) {
+		case 2:
+			vals[found].val = pinctrl_spec.args[1];
+			break;
+		case 3:
+			vals[found].val = (pinctrl_spec.args[1] | pinctrl_spec.args[2]);
+			break;
+		}
 
 		dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x\n",
 			pinctrl_spec.np, offset, pinctrl_spec.args[1]);
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH v4 1/2] pinctrl: single: parse #pinctrl-cells = 2

drivers/pinctrl/pinctrl-single.c static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,

Quoted 13 lines · PDT Drew Fustini

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux), then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

drivers/pinctrl/pinctrl-single.c +7 -1
-		vals[found].val = pinctrl_spec.args[1];
+
+		switch (pinctrl_spec.args_count) {
+		case 2:
+			vals[found].val = pinctrl_spec.args[1];
+			break;
+		case 3:
+			vals[found].val = (pinctrl_spec.args[1] | 

pinctrl_spec.args[2]);

drivers/pinctrl/pinctrl-single.c static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,

Quoted 5 lines
drivers/pinctrl/pinctrl-single.c +2 -0
+			break;
+		}
 
 		dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x\n",
 			pinctrl_spec.np, offset, 

pinctrl_spec.args[1]);

If #pinctrl-cells value is greater than 2, nothing will set vals[found].val to anything other than zero (from when it's calloc'ed) and the pinctrl will silently be programmed to zero.

The debug printout was not change to print vals[found].val, so it will continue to print the value of the 2nd cell.

The result is that a #pinctrl-cells of 3 will produce no warning or error, program the pinctrl to zero, whilst at the same time emit debug log messages that it is programming the expected values.

The device tree documentation still states that #pinctrl-cells must be 1 when using pinctrl-single,pins. This new special case of ORing two values is not documented.

#3 lore raw

Re: [PATCH v4 1/2] pinctrl: single: parse #pinctrl-cells = 2

Quoted 18 lines · Trent Piepho

drivers/pinctrl/pinctrl-single.c static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,

Quoted 13 lines · PDT Drew Fustini

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux), then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

drivers/pinctrl/pinctrl-single.c +7 -1
-		vals[found].val = pinctrl_spec.args[1];
+
+		switch (pinctrl_spec.args_count) {
+		case 2:
+			vals[found].val = pinctrl_spec.args[1];
+			break;
+		case 3:
+			vals[found].val = (pinctrl_spec.args[1] | 

pinctrl_spec.args[2]);

Quoted 3 lines
(quoted diff) +2 -0
+			break;
+		}
Quoted 7 lines

Review

Quoted 2 lines
(quoted diff) +0 -0
 		dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x\n",
 			pinctrl_spec.np, offset, 

pinctrl_spec.args[1]);

If #pinctrl-cells value is greater than 2, nothing will set vals[found].val to anything other than zero (from when it's calloc'ed) and the pinctrl will silently be programmed to zero.

If #pinctrl-cells is 3, then it will be:

	vals[found].val = (pinctrl_spec.args[1] | pinctrl_spec.args[2]);

Do you mean if #pinctrl-cells is great than 3 then it will just have a default value of zero?

That does appear to be the case and is probably not the behavior we want. Thank you for pointing this out. Earlier, there is a check to make sure there are at least 2 arguments:

	if (pinctrl_spec.args_count < 2) {
		dev_err(pcs->dev, "invalid args_count for spec: %i\n",
			pinctrl_spec.args_count); 
		break;
	}

I'll submit a patch where the upper bound is also checked:

	if (pinctrl_spec.args_count < 2 || pinctrl_spec.args_count > 3) {
		dev_err(pcs->dev, "invalid args_count for spec: %i\n",
			pinctrl_spec.args_count); 
		break;
	}
Quoted 2 lines

The debug printout was not change to print vals[found].val, so it will continue to print the value of the 2nd cell.

Thank you for pointing this out. Yes, this is an oversight and I will submit a patch.

Quoted 7 lines

The result is that a #pinctrl-cells of 3 will produce no warning or error, program the pinctrl to zero, whilst at the same time emit debug log messages that it is programming the expected values.

The device tree documentation still states that #pinctrl-cells must be 1 when using pinctrl-single,pins. This new special case of ORing two values is not documented.

This is a good point, too. I will make a patch to update the documentation.

-Drew

#4 lore raw

Re: [PATCH v4 1/2] pinctrl: single: parse #pinctrl-cells = 2

Quoted 44 lines · Drew Fustini
Quoted 18 lines · Trent Piepho

drivers/pinctrl/pinctrl-single.c static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,

Quoted 13 lines · PDT Drew Fustini

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux), then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

drivers/pinctrl/pinctrl-single.c +7 -1
-		vals[found].val = pinctrl_spec.args[1];
+
+		switch (pinctrl_spec.args_count) {
+		case 2:
+			vals[found].val = pinctrl_spec.args[1];
+			break;
+		case 3:
+			vals[found].val = (pinctrl_spec.args[1] | 

pinctrl_spec.args[2]);

Quoted 3 lines
(quoted diff) +2 -0
+			break;
+		}
Quoted 7 lines

Review

Quoted 2 lines
(quoted diff) +0 -0
 		dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x\n",
 			pinctrl_spec.np, offset, 

pinctrl_spec.args[1]);

If #pinctrl-cells value is greater than 2, nothing will set vals[found].val to anything other than zero (from when it's calloc'ed) and the pinctrl will silently be programmed to zero.

If #pinctrl-cells is 3, then it will be:

	vals[found].val = (pinctrl_spec.args[1] | pinctrl_spec.args[2]);

Do you mean if #pinctrl-cells is great than 3 then it will just have a default value of zero?

That does appear to be the case and is probably not the behavior we want. Thank you for pointing this out. Earlier, there is a check to make sure there are at least 2 arguments:

	if (pinctrl_spec.args_count < 2) {
		dev_err(pcs->dev, "invalid args_count for spec: %i\n",
			pinctrl_spec.args_count); 
		break;
	}
Quoted 8 lines

I'll submit a patch where the upper bound is also checked:

	if (pinctrl_spec.args_count < 2 || pinctrl_spec.args_count > 3) {
		dev_err(pcs->dev, "invalid args_count for spec: %i\n",
			pinctrl_spec.args_count); 
		break;
	}

I was mistaken when I wrote the above. I was using the term #pinctrl-cells when I should have been writing pinctrl_spec.args_count.

pinctrl_spec.args_count is 2 when #pictrl-cells is 1. pinctrl_spec.args_count is 3 when #pictrl-cells is 2.

I have submitted patches [1][2] with fixes for the bounds check and the dev_dbg().

Quoted 14 lines
Quoted 2 lines

The debug printout was not change to print vals[found].val, so it will continue to print the value of the 2nd cell.

Thank you for pointing this out. Yes, this is an oversight and I will submit a patch.

Quoted 7 lines

The result is that a #pinctrl-cells of 3 will produce no warning or error, program the pinctrl to zero, whilst at the same time emit debug log messages that it is programming the expected values.

The device tree documentation still states that #pinctrl-cells must be 1 when using pinctrl-single,pins. This new special case of ORing two values is not documented.

Quoted 5 lines

This is a good point, too. I will make a patch to update the documentation.

-Drew

[1] https://lore.kernel.org/linux-omap/[email protected]/
[2] https://lore.kernel.org/linux-omap/[email protected]/

#5 lore raw

PATCH v4 2/2 ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

In reply to Drew Fustini

Increase #pinctrl-cells to 2 so that mux and conf be kept separate. This requires the AM33XX_PADCONF macro in omap.h to also be modified to keep pin conf and pin mux values separate.

---
 arch/arm/boot/dts/am33xx-l4.dtsi   | 2 +-
 include/dt-bindings/pinctrl/omap.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +1 -1
index a9cbefc80c0c..3141590e5889 100644
@@ -278,7 +278,7 @@ scm: scm@0 {
 				am33xx_pinmux: pinmux@800 {
 					compatible = "pinctrl-single";
 					reg = <0x800 0x238>;
-					#pinctrl-cells = <1>;
+					#pinctrl-cells = <2>;
 					pinctrl-single,register-width = <32>;
 					pinctrl-single,function-mask = <0x7f>;
 				};
include/dt-bindings/pinctrl/omap.h +1 -1
index 625718042413..2d2a8c737822 100644
@@ -65,7 +65,7 @@
 #define DM814X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define DM816X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
-#define AM33XX_PADCONF(pa, dir, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux))
+#define AM33XX_PADCONF(pa, conf, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux)
 
 /*
  * Macros to allow using the offset from the padconf physical address
Signature · 1 line
2.25.1
#6 lore raw

Re: [PATCH v4 2/2] ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

Quoted 7 lines · PDT Drew Fustini

Increase #pinctrl-cells to 2 so that mux and conf be kept separate. This requires the AM33XX_PADCONF macro in omap.h to also be modified to keep pin conf and pin mux values separate.

arch/arm/boot/dts/am33xx-l4.dtsi scm: scm@0 { · line 284

Quoted 9 lines
arch/arm/boot/dts/am33xx-l4.dtsi +2 -2
@@ -278,7 +278,7 @@ scm: scm@0 {
 				am33xx_pinmux: pinmux@800 {
 					compatible = "pinctrl-single";
 					reg = <0x800 0x238>;
-					#pinctrl-cells = <1>;
+					#pinctrl-cells = <2>;
 
 #define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
-#define AM33XX_PADCONF(pa, dir, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux))
+#define AM33XX_PADCONF(pa, conf, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux)

If a dts file uses am33xx_pinmux from am33xx-l4.dtsi, but does not use the AM33XX_PADCONF() macro for all pin settings, like say it uses AM33XX_IOPAD(), then the dtb will be totally broken as pin addresses and values will all be off.

Similarly, using AM33XX_PADCONF() with a different pinctrl defined elsewhere would also break.

In the latest linux-next kernel, I found one case of the former problem, in am335x-guardian.dts.

The barebox bootloader had all the am33xx boards broken when the dts change was imported without adding the OR-two-values special case to the pinctrl driver. Which I then tracked to here.

#7 lore raw

Re: [PATCH v4 2/2] ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

In reply to Drew Fustini

Hello Drew,

Quoted 38 lines · On Wed, 1 Jul 2020 03:33:20 +0200 Drew Fustini <[email protected]> wrote:

Increase #pinctrl-cells to 2 so that mux and conf be kept separate. This requires the AM33XX_PADCONF macro in omap.h to also be modified to keep pin conf and pin mux values separate.

---
 arch/arm/boot/dts/am33xx-l4.dtsi   | 2 +-
 include/dt-bindings/pinctrl/omap.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +1 -1
index a9cbefc80c0c..3141590e5889 100644
@@ -278,7 +278,7 @@ scm: scm@0 {
 				am33xx_pinmux: pinmux@800 {
 					compatible = "pinctrl-single";
 					reg = <0x800 0x238>;
-					#pinctrl-cells = <1>;
+					#pinctrl-cells = <2>;
 					pinctrl-single,register-width = <32>;
 					pinctrl-single,function-mask = <0x7f>;
 				};
include/dt-bindings/pinctrl/omap.h +1 -1
index 625718042413..2d2a8c737822 100644
@@ -65,7 +65,7 @@
 #define DM814X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define DM816X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
-#define AM33XX_PADCONF(pa, dir, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux))
+#define AM33XX_PADCONF(pa, conf, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux)
 
 /*
  * Macros to allow using the offset from the padconf physical address
Signature · 1 line
2.25.1

Based on the bindings doc a value of 2 is only acceptable if one uses
pinctrl-single,bits but all the am33xx pins still uses pinctrl-single,pins.
I noticed this because this breaks FreeBSD when I tried with 5.9 dts.

Signature · 1 line
Emmanuel Vadot <[email protected]> <[email protected]>
#8 lore raw

Re: [PATCH v4 2/2] ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

Quoted 40 lines · Emmanuel Vadot

Hello Drew,

Quoted 34 lines · On Wed, 1 Jul 2020 03:33:20 +0200 Drew Fustini <[email protected]> wrote:

Increase #pinctrl-cells to 2 so that mux and conf be kept separate. This requires the AM33XX_PADCONF macro in omap.h to also be modified to keep pin conf and pin mux values separate.

---
 arch/arm/boot/dts/am33xx-l4.dtsi   | 2 +-
 include/dt-bindings/pinctrl/omap.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +1 -1
index a9cbefc80c0c..3141590e5889 100644
@@ -278,7 +278,7 @@ scm: scm@0 {
 				am33xx_pinmux: pinmux@800 {
 					compatible = "pinctrl-single";
 					reg = <0x800 0x238>;
-					#pinctrl-cells = <1>;
+					#pinctrl-cells = <2>;
 					pinctrl-single,register-width = <32>;
 					pinctrl-single,function-mask = <0x7f>;
 				};
include/dt-bindings/pinctrl/omap.h +1 -1
index 625718042413..2d2a8c737822 100644
@@ -65,7 +65,7 @@
 #define DM814X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define DM816X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
-#define AM33XX_PADCONF(pa, dir, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux))
+#define AM33XX_PADCONF(pa, conf, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux)
 
Quoted 12 lines
Quoted 4 lines
include/dt-bindings/pinctrl/omap.h +0 -0
 /*
  * Macros to allow using the offset from the padconf physical address
Signature · 1 line
2.25.1

Based on the bindings doc a value of 2 is only acceptable if one uses
pinctrl-single,bits but all the am33xx pins still uses pinctrl-single,pins.
I noticed this because this breaks FreeBSD when I tried with 5.9 dts.

Signature · 1 line
Emmanuel Vadot <[email protected]> <[email protected]>

Hello Emmanuel,

Sorry to hear about that. This change was made based on discussion with Tony Lindgren this past July. Trent Piepho later pointed out issues wtih the change including the binding documentation. I had tried to fix the documentation in September [1]. However, I notice that it seems I missed changing the lines near the top of pinctrl-single.txt [2]:

- #pinctrl-cells : number of cells in addition to the index, set to 1 for pinctrl-single,pins and 2 for pinctrl-single,bits

I am thinking that should be re-written as:

- #pinctrl-cells : number of cells in addition to the index, this value can be 1 or 2 for pinctrl-single,pins and must be 2 for pinctrl-single,bits

Tony - what do you think?

Thanks,
Drew

[1] https://lore.kernel.org/linux-gpio/[email protected]/
[2] https://www.kernel.org/doc/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt

maintainer
#9 lore raw

Re: [PATCH v4 2/2] ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

Quoted 65 lines · Drew Fustini
Quoted 40 lines · Emmanuel Vadot

Hello Drew,

Quoted 34 lines · On Wed, 1 Jul 2020 03:33:20 +0200 Drew Fustini <[email protected]> wrote:

Increase #pinctrl-cells to 2 so that mux and conf be kept separate. This requires the AM33XX_PADCONF macro in omap.h to also be modified to keep pin conf and pin mux values separate.

---
 arch/arm/boot/dts/am33xx-l4.dtsi   | 2 +-
 include/dt-bindings/pinctrl/omap.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +1 -1
index a9cbefc80c0c..3141590e5889 100644
@@ -278,7 +278,7 @@ scm: scm@0 {
 				am33xx_pinmux: pinmux@800 {
 					compatible = "pinctrl-single";
 					reg = <0x800 0x238>;
-					#pinctrl-cells = <1>;
+					#pinctrl-cells = <2>;
 					pinctrl-single,register-width = <32>;
 					pinctrl-single,function-mask = <0x7f>;
 				};
include/dt-bindings/pinctrl/omap.h +1 -1
index 625718042413..2d2a8c737822 100644
@@ -65,7 +65,7 @@
 #define DM814X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define DM816X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
-#define AM33XX_PADCONF(pa, dir, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux))
+#define AM33XX_PADCONF(pa, conf, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux)
 
Quoted 12 lines
Quoted 4 lines
include/dt-bindings/pinctrl/omap.h +0 -0
 /*
  * Macros to allow using the offset from the padconf physical address
Signature · 1 line
2.25.1

Based on the bindings doc a value of 2 is only acceptable if one uses
pinctrl-single,bits but all the am33xx pins still uses pinctrl-single,pins.
I noticed this because this breaks FreeBSD when I tried with 5.9 dts.

Signature · 1 line
Emmanuel Vadot <[email protected]> <[email protected]>

Hello Emmanuel,

Sorry to hear about that. This change was made based on discussion with Tony Lindgren this past July. Trent Piepho later pointed out issues wtih the change including the binding documentation. I had tried to fix the documentation in September [1]. However, I notice that it seems I missed changing the lines near the top of pinctrl-single.txt [2]:

- #pinctrl-cells : number of cells in addition to the index, set to 1 for pinctrl-single,pins and 2 for pinctrl-single,bits

Quoted 6 lines

I am thinking that should be re-written as:

- #pinctrl-cells : number of cells in addition to the index, this value can be 1 or 2 for pinctrl-single,pins and must be 2 for pinctrl-single,bits

Tony - what do you think?

Sounds good to me.

Regards,

Tony

Quoted 2 lines

[1] https://lore.kernel.org/linux-gpio/[email protected]/
[2] https://www.kernel.org/doc/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt

maintainer Acked-by on the v4 series
#10 lore raw
In reply to Drew Fustini
Quoted 8 lines · Drew Fustini

Currently, pinctrl-single only allows #pinctrl-cells = 1.

This series will allow pinctrl-single to also support #pinctrl-cells = 2

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

Quoted 6 lines

To take advantage of #pinctrl-cells = 2, the AM33XX_PADCONF macro in omap.h is modified to keep pin conf and pin mux values separate.

change log:
- v4: squash patches 2 and 3 together so that git biesct will not result in a boot failure

Thanks for updating it. Best that Linus queues both patches via the pinctrl tree when no more comments:

maintainer Acked-by on the v4 series
#11 lore raw
In reply to Drew Fustini
Quoted 27 lines · Drew Fustini

Currently, pinctrl-single only allows #pinctrl-cells = 1.

This series will allow pinctrl-single to also support #pinctrl-cells = 2

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

To take advantage of #pinctrl-cells = 2, the AM33XX_PADCONF macro in omap.h is modified to keep pin conf and pin mux values separate.

change log:
- v4: squash patches 2 and 3 together so that git biesct will not result in a boot failure

- v3: change order of patches to make sure the pinctrl-single.c patch does not break anything without the dts patches

- v2: remove outer parentheses from AM33XX_PADCONF macro as it causes a compile error in dtc. I had added it per suggestion from checkpatch about having parentheses around complex values.

Drew Fustini (2):
pinctrl: single: parse #pinctrl-cells = 2
ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

Quoted 8 lines
 arch/arm/boot/dts/am33xx-l4.dtsi   |  2 +-
 drivers/pinctrl/pinctrl-single.c   | 11 +++++++++--
 include/dt-bindings/pinctrl/omap.h |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

--
2.25.1

#12 lore raw
In reply to Drew Fustini
Quoted 18 lines · Drew Fustini

Currently, pinctrl-single only allows #pinctrl-cells = 1.

This series will allow pinctrl-single to also support #pinctrl-cells = 2

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

To take advantage of #pinctrl-cells = 2, the AM33XX_PADCONF macro in omap.h is modified to keep pin conf and pin mux values separate.

change log:
- v4: squash patches 2 and 3 together so that git biesct will not result in a boot failure

- v3: change order of patches to make sure the pinctrl-single.c patch does not break anything without the dts patches

Quoted 7 lines

- v2: remove outer parentheses from AM33XX_PADCONF macro as it causes a compile error in dtc. I had added it per suggestion from checkpatch about having parentheses around complex values.

Drew Fustini (2):
pinctrl: single: parse #pinctrl-cells = 2
ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

Both patches applied to the pinctrl devel branch for v5.9!

Please make sure not to create colliding patches in the DTS files merged through ARM SoC this merge window.

Yours,
Linus Walleij

#13 lore raw
Quoted 29 lines · Linus Walleij
Quoted 18 lines · Drew Fustini

Currently, pinctrl-single only allows #pinctrl-cells = 1.

This series will allow pinctrl-single to also support #pinctrl-cells = 2

If "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then pcs_parse_one_pinctrl_entry() does an OR operation on conf and mux to get the value to store in the register.

To take advantage of #pinctrl-cells = 2, the AM33XX_PADCONF macro in omap.h is modified to keep pin conf and pin mux values separate.

change log:
- v4: squash patches 2 and 3 together so that git biesct will not result in a boot failure

- v3: change order of patches to make sure the pinctrl-single.c patch does not break anything without the dts patches

Quoted 7 lines

- v2: remove outer parentheses from AM33XX_PADCONF macro as it causes a compile error in dtc. I had added it per suggestion from checkpatch about having parentheses around complex values.

Drew Fustini (2):
pinctrl: single: parse #pinctrl-cells = 2
ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2

Quoted 7 lines

Both patches applied to the pinctrl devel branch for v5.9!

Please make sure not to create colliding patches in the DTS files merged through ARM SoC this merge window.

Yours,
Linus Walleij

Thanks.

Which repo/branch is the best for me to use if I am going to be posting any further dts patches?

-drew

#14 lore raw
Quoted 2 lines · Drew Fustini

Which repo/branch is the best for me to use if I am going to be posting any further dts patches?

Mine, pinctrl devel branch during this (v5.9) cycle I suppose.

Yours,
Linus Walleij