Date: Fri, 15 Jan 2021 20:33:38 +0100 From: Emmanuel Vadot <manu@bidouilliste.com> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 78abc9e2e6ed - main - Revert upstream commit 27c90e5e48d0 Message-ID: <20210115203338.d18bef00225008b820a4cd99@bidouilliste.com> In-Reply-To: <202101151910.10FJA88A078449@gitrepo.freebsd.org> References: <202101151910.10FJA88A078449@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 15 Jan 2021 19:10:08 GMT Emmanuel Vadot <manu@FreeBSD.org> wrote: > The branch main has been updated by manu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=78abc9e2e6edcc286136896c1793d40899750012 > > commit 78abc9e2e6edcc286136896c1793d40899750012 > Author: Emmanuel Vadot <manu@FreeBSD.org> > AuthorDate: 2021-01-15 18:02:37 +0000 > Commit: Emmanuel Vadot <manu@FreeBSD.org> > CommitDate: 2021-01-15 19:07:08 +0000 > > 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>; > }; The issue was reported upstream. https://lists.infradead.org/pipermail/linux-arm-kernel/2021-January/631852.html Also we don't have support for pinctrl-single,bits in the TI code so even if they did the right thing that would have break for us. -- Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210115203338.d18bef00225008b820a4cd99>