diff mbox series

ARM: dts: am33xx: modify AM33XX_IOPAD for #pinctrl-cells = 2

Message ID 20200921225053.4126745-1-drew@beagleboard.org
State Not Applicable
Headers show
Series ARM: dts: am33xx: modify AM33XX_IOPAD for #pinctrl-cells = 2 | expand

Checks

Context Check Description
robh/checkpatch warning total: 1 errors, 1 warnings, 8 lines checked

Commit Message

Drew Fustini Sept. 21, 2020, 10:50 p.m. UTC
Modify the AM33XX_IOPAD macro so that it works now that #pinctrl-cells =
<2>. The third parameter is just a zero and the pinctrl-single driver
will just OR this with the second parameter so it has no actual effect.

There are no longer any dts files using this macro (following my patch
to am335x-guardian.dts), but this will keep dts files not in mainline
from breaking.

Fixes: 27c90e5e48d0 ("ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2")
Suggested-by: Tony Lindgren <tony@atomide.com>
Reported-by: Trent Piepho <tpiepho@gmail.com>
Link: https://lore.kernel.org/linux-devicetree/20200921064707.GN7101@atomide.com/
Signed-off-by: Drew Fustini <drew@beagleboard.org>
---
NOTE:
checkpatch complains "Macros with complex values should be enclosed in 
parentheses" but all the other marcos in that section have the same
format so it seems appropriate to ignore checkpatch and maintain the
style.

 include/dt-bindings/pinctrl/omap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Linus Walleij Oct. 1, 2020, 8:08 a.m. UTC | #1
On Tue, Sep 22, 2020 at 12:57 AM Drew Fustini <drew@beagleboard.org> wrote:

> Modify the AM33XX_IOPAD macro so that it works now that #pinctrl-cells =
> <2>. The third parameter is just a zero and the pinctrl-single driver
> will just OR this with the second parameter so it has no actual effect.
>
> There are no longer any dts files using this macro (following my patch
> to am335x-guardian.dts), but this will keep dts files not in mainline
> from breaking.
>
> Fixes: 27c90e5e48d0 ("ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2")
> Suggested-by: Tony Lindgren <tony@atomide.com>
> Reported-by: Trent Piepho <tpiepho@gmail.com>
> Link: https://lore.kernel.org/linux-devicetree/20200921064707.GN7101@atomide.com/
> Signed-off-by: Drew Fustini <drew@beagleboard.org>

I didn't get a review tag on this one, Tony is this something I
should be applying?

Yours,
Linus Walleij
Tony Lindgren Oct. 1, 2020, 8:12 a.m. UTC | #2
* Linus Walleij <linus.walleij@linaro.org> [201001 08:08]:
> On Tue, Sep 22, 2020 at 12:57 AM Drew Fustini <drew@beagleboard.org> wrote:
> 
> > Modify the AM33XX_IOPAD macro so that it works now that #pinctrl-cells =
> > <2>. The third parameter is just a zero and the pinctrl-single driver
> > will just OR this with the second parameter so it has no actual effect.
> >
> > There are no longer any dts files using this macro (following my patch
> > to am335x-guardian.dts), but this will keep dts files not in mainline
> > from breaking.
> >
> > Fixes: 27c90e5e48d0 ("ARM: dts: am33xx-l4: change #pinctrl-cells from 1 to 2")
> > Suggested-by: Tony Lindgren <tony@atomide.com>
> > Reported-by: Trent Piepho <tpiepho@gmail.com>
> > Link: https://lore.kernel.org/linux-devicetree/20200921064707.GN7101@atomide.com/
> > Signed-off-by: Drew Fustini <drew@beagleboard.org>
> 
> I didn't get a review tag on this one, Tony is this something I
> should be applying?

Thanks for checking, looks like I already applied into my fixes branch:

b753e41d9999 ("ARM: dts: am33xx: modify AM33XX_IOPAD for #pinctrl-cells = 2")

Regards,

Tony
diff mbox series

Patch

diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h
index 2d2a8c737822..f48245ff87e5 100644
--- a/include/dt-bindings/pinctrl/omap.h
+++ b/include/dt-bindings/pinctrl/omap.h
@@ -64,7 +64,7 @@ 
 #define OMAP3_WKUP_IOPAD(pa, val)	OMAP_IOPAD_OFFSET((pa), 0x2a00) (val)
 #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_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val) (0)
 #define AM33XX_PADCONF(pa, conf, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux)
 
 /*