diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
| commit | d38de7cb03adf88e18c05d840c2528b7a5af2f9b (patch) | |
| tree | 35be69932e53e4c58260af58ae841a3d1a2523b6 /drivers/pinctrl/uniphier/pinctrl-uniphier.h | |
| parent | b24cf8540a85a9bf97975aadd6a7542f166c78a3 (diff) | |
| parent | bc647958047cd03193e19cd8c08a6771fea828b7 (diff) | |
| download | u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.zip u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.tar.gz u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Fix regressions caused by the previous reworks
- Add pin configuration support
- Re-work SPL code
- Update DRAM and PLL setup code
- Enable needed configs, disable unneeded configs
Diffstat (limited to 'drivers/pinctrl/uniphier/pinctrl-uniphier.h')
| -rw-r--r-- | drivers/pinctrl/uniphier/pinctrl-uniphier.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier.h b/drivers/pinctrl/uniphier/pinctrl-uniphier.h index 21e2d37..a0eccf8 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier.h +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier.h @@ -67,6 +67,7 @@ struct uniphier_pinctrl_socdata { const char * const *functions; int functions_count; unsigned caps; +#define UNIPHIER_PINCTRL_CAPS_PUPD_SIMPLE BIT(3) #define UNIPHIER_PINCTRL_CAPS_PERPIN_IECTRL BIT(2) #define UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE BIT(1) #define UNIPHIER_PINCTRL_CAPS_MUX_4BIT BIT(0) |