Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Javier Martinez Canillas and committed by
Tony Lindgren
fc63efdf 1ec21837

+12 -2
+6
include/dt-bindings/pinctrl/am43xx.h
··· 31 31 #define PIN_INPUT_PULLUP (INPUT_EN | PULL_UP) 32 32 #define PIN_INPUT_PULLDOWN (INPUT_EN) 33 33 34 + /* 35 + * Macro to allow using the absolute physical address instead of the 36 + * padconf registers instead of the offset from padconf base. 37 + */ 38 + #define AM4372_IOPAD(pa, val) (((pa) & 0xffff) - 0x0800) (val) 39 + 34 40 #endif 35 41
+6
include/dt-bindings/pinctrl/dra.h
··· 67 67 #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP) 68 68 #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN) 69 69 70 + /* 71 + * Macro to allow using the absolute physical address instead of the 72 + * padconf registers instead of the offset from padconf base. 73 + */ 74 + #define DRA7XX_CORE_IOPAD(pa, val) (((pa) & 0xffff) - 0x3400) (val) 75 + 70 76 #endif 71 77
-2
include/dt-bindings/pinctrl/omap.h
··· 63 63 #define OMAP3_WKUP_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x2a00) (val) 64 64 #define DM816X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) 65 65 #define AM33XX_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) 66 - #define AM4372_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) 67 - #define DRA7XX_CORE_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x3400) (val) 68 66 69 67 /* 70 68 * Macros to allow using the offset from the padconf physical address