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(-) -- 2.25.1