From 78abc9e2e6edcc286136896c1793d40899750012 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Fri, 15 Jan 2021 19:02:37 +0100 Subject: [PATCH] Revert upstream commit 27c90e5e48d0 It changed the #pinctrl-cells value to be equal to 2 and the macro that generates the values. Based on the bindings docs a value of 2 is only acceptable if the node used pinctrl-single,bits and not pinctrl-single,pins This allow booting further on the beaglebone black with 5.9 DTS --- sys/contrib/device-tree/include/dt-bindings/pinctrl/omap.h | 2 +- sys/contrib/device-tree/src/arm/am33xx-l4.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/device-tree/include/dt-bindings/pinctrl/omap.h b/sys/contrib/device-tree/include/dt-bindings/pinctrl/omap.h index 2d2a8c737822..625718042413 100644 --- a/sys/contrib/device-tree/include/dt-bindings/pinctrl/omap.h +++ b/sys/contrib/device-tree/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, conf, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux) +#define AM33XX_PADCONF(pa, dir, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux)) /* * Macros to allow using the offset from the padconf physical address diff --git a/sys/contrib/device-tree/src/arm/am33xx-l4.dtsi b/sys/contrib/device-tree/src/arm/am33xx-l4.dtsi index b88d0caa4b2d..45de2ff6a777 100644 --- a/sys/contrib/device-tree/src/arm/am33xx-l4.dtsi +++ b/sys/contrib/device-tree/src/arm/am33xx-l4.dtsi @@ -290,7 +290,7 @@ am33xx_pinmux: pinmux@800 { compatible = "pinctrl-single"; reg = <0x800 0x238>; - #pinctrl-cells = <2>; + #pinctrl-cells = <1>; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0x7f>; };