Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Drew Fustini <drew@beagleboard.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Link: https://lore.kernel.org/r/20200701013320.130441-3-drew@beagleboard.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Drew Fustini and committed by
Linus Walleij
27c90e5e a1339541

+2 -2
+1 -1
arch/arm/boot/dts/am33xx-l4.dtsi
··· 278 278 am33xx_pinmux: pinmux@800 { 279 279 compatible = "pinctrl-single"; 280 280 reg = <0x800 0x238>; 281 - #pinctrl-cells = <1>; 281 + #pinctrl-cells = <2>; 282 282 pinctrl-single,register-width = <32>; 283 283 pinctrl-single,function-mask = <0x7f>; 284 284 };
+1 -1
include/dt-bindings/pinctrl/omap.h
··· 65 65 #define DM814X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) 66 66 #define DM816X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) 67 67 #define AM33XX_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) 68 - #define AM33XX_PADCONF(pa, dir, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux)) 68 + #define AM33XX_PADCONF(pa, conf, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux) 69 69 70 70 /* 71 71 * Macros to allow using the offset from the padconf physical address