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

[Emmanuel Vadot]

 Hello Drew,

On Wed,  1 Jul 2020 03:33:20 +0200
Drew Fustini <drew at beagleboard.org> 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.
> 
> Signed-off-by: Drew Fustini <drew at beagleboard.org>
> ---
>  arch/arm/boot/dts/am33xx-l4.dtsi   | 2 +-
>  include/dt-bindings/pinctrl/omap.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
> index a9cbefc80c0c..3141590e5889 100644
> --- a/arch/arm/boot/dts/am33xx-l4.dtsi
> +++ b/arch/arm/boot/dts/am33xx-l4.dtsi
> @@ -278,7 +278,7 @@ scm: scm at 0 {
>  				am33xx_pinmux: pinmux at 800 {
>  					compatible = "pinctrl-single";
>  					reg = <0x800 0x238>;
> -					#pinctrl-cells = <1>;
> +					#pinctrl-cells = <2>;
>  					pinctrl-single,register-width = <32>;
>  					pinctrl-single,function-mask = <0x7f>;
>  				};
> diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h
> index 625718042413..2d2a8c737822 100644
> --- a/include/dt-bindings/pinctrl/omap.h
> +++ b/include/dt-bindings/pinctrl/omap.h
> @@ -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
> -- 
> 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.

-- 
Emmanuel Vadot <manu at bidouilliste.com> <manu at freebsd.org>