Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc63efdf authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Tony Lindgren
Browse files

pinctrl: Move am4372 and dra7 macros to the the SoC header files 



The <dt-bindings/pinctrl/omap.h> header file defines a set of macros
for different SoCs families that falls under the OMAP sub-arch, that
allow to define the padconf register physical address instead of the
register offset from the padconf base.

But the am43xx and dra7xx SoCs families have their own pinctrl header
file so the DTS using these SoCs aren't able to use the AM4372_IOPAD()
and DRA7XX_CORE_IOPAD() macros since <dt-bindings/pinctrl/omap.h> is
not included.

Move the macros to the correct header files so can be used by the DTS.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1ec21837

include/dt-bindings/pinctrl/am43xx.h

+6 −0
Original line number Diff line number Diff line
@@ -31,5 +31,11 @@ 
#define PIN_INPUT_PULLUP	(INPUT_EN | PULL_UP)

#define PIN_INPUT_PULLDOWN	(INPUT_EN)



/*

 * Macro to allow using the absolute physical address instead of the

 * padconf registers instead of the offset from padconf base.

 */

#define AM4372_IOPAD(pa, val)	(((pa) & 0xffff) - 0x0800) (val)



#endif

include/dt-bindings/pinctrl/dra.h

+6 −0
Original line number Diff line number Diff line
@@ -67,5 +67,11 @@ 
#define PIN_INPUT_PULLUP	(PULL_ENA | INPUT_EN | PULL_UP)

#define PIN_INPUT_PULLDOWN	(PULL_ENA | INPUT_EN)



/*

 * Macro to allow using the absolute physical address instead of the

 * padconf registers instead of the offset from padconf base.

 */

#define DRA7XX_CORE_IOPAD(pa, val)	(((pa) & 0xffff) - 0x3400) (val)



#endif

include/dt-bindings/pinctrl/omap.h

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ 
#define OMAP3_WKUP_IOPAD(pa, val)	OMAP_IOPAD_OFFSET((pa), 0x2a00) (val)

#define DM816X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)

#define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)

#define AM4372_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)

#define DRA7XX_CORE_IOPAD(pa, val)	OMAP_IOPAD_OFFSET((pa), 0x3400) (val)



/*

 * Macros to allow using the offset from the padconf physical address