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

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.orgSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a1339541
...@@ -278,7 +278,7 @@ scm: scm@0 { ...@@ -278,7 +278,7 @@ scm: scm@0 {
am33xx_pinmux: pinmux@800 { am33xx_pinmux: pinmux@800 {
compatible = "pinctrl-single"; compatible = "pinctrl-single";
reg = <0x800 0x238>; reg = <0x800 0x238>;
#pinctrl-cells = <1>; #pinctrl-cells = <2>;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0x7f>; pinctrl-single,function-mask = <0x7f>;
}; };
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#define DM814X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) #define DM814X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
#define DM816X_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_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 * Macros to allow using the offset from the padconf physical address
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment