Commit 27c90e5e authored by Drew Fustini's avatar Drew Fustini Committed by Linus Walleij
Browse files

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



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: default avatarDrew Fustini <drew@beagleboard.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
Link: https://lore.kernel.org/r/20200701013320.130441-3-drew@beagleboard.org


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a1339541

arch/arm/boot/dts/am33xx-l4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ 
				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
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE