pinctrl: single: support #pinctrl-cells = 2
Subsystems (4)
v2 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 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.
v2 changes:
- 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 (3):
ARM: dts: change AM33XX_PADCONF macro separate conf and mux
ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2
pinctrl: single: parse #pinctrl-cells = 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
PATCH v2 1/3 ARM: dts: change AM33XX_PADCONF macro separate conf and mux
AM33XX_PADCONF macro is modified to keep pin conf and pin mux separate.
This requires #pinctrl-cells = 2 in am33xx-l4.dtsi
pinctrl-single.c but also be changed to support "pinctrl-single,pins" with 3 arguments (offset, conf, mux)
---
v2 change:
- 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.
include/dt-bindings/pinctrl/omap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/dt-bindings/pinctrl/omap.h +1 -1
@@ -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
PATCH v2 2/3 ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2
In reply to Drew FustiniThis requires AM33XX_PADCONF macro in omap.h to be modified to keep pin conf and pin mux values separate.
pinctrl-single.c must also be changed to support "pinctrl-single,pins" with 3 arguments (offset, conf, mux).
--- arch/arm/boot/dts/am33xx-l4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/am33xx-l4.dtsi +1 -1
@@ -290,7 +290,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>; };
Signature · 1 line
2.25.1
PATCH v2 3/3 pinctrl: single: parse #pinctrl-cells = 2
In reply to Drew FustiniIf "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then pcs_parse_one_pinctrl_entry() does an OR operation on 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
@@ -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