diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-08-14 16:55:01 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-08-14 16:55:01 +0200 |
| commit | 496d5819ff9ade72a4e6859842ca38baddbb1936 (patch) | |
| tree | 066ee4699720e3d0cd55edb38e2fc84d591b7022 /include/dt-bindings | |
| parent | 06351d133dea784e4a00962a7973ba4cd0e6a787 (diff) | |
| parent | bbed85f45b2b727bb776b914b84c67e8fd825433 (diff) | |
| download | linux-496d5819ff9ade72a4e6859842ca38baddbb1936.tar.bz2 | |
Merge tag 'samsung-pinctrl-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel
Samsung pinctrl driver changes for v4.14:
1. Fix NULL pointer dereference on S3C24XX. This was reported some time ago and
unfortunately it took few releases to fix.
2. Fix invalid register offset used for external interrupts on Exynos5433.
This was caused by the same commit as above, although on different path.
3. Consolidate between drivers and bindings the defines for pin mux functions.
4. Minor code improvements.
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/pinctrl/samsung.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/dt-bindings/pinctrl/samsung.h b/include/dt-bindings/pinctrl/samsung.h index b7aa3646208b..ceb672305f59 100644 --- a/include/dt-bindings/pinctrl/samsung.h +++ b/include/dt-bindings/pinctrl/samsung.h @@ -66,7 +66,8 @@ #define EXYNOS_PIN_FUNC_4 4 #define EXYNOS_PIN_FUNC_5 5 #define EXYNOS_PIN_FUNC_6 6 -#define EXYNOS_PIN_FUNC_F 0xf +#define EXYNOS_PIN_FUNC_EINT 0xf +#define EXYNOS_PIN_FUNC_F EXYNOS_PIN_FUNC_EINT /* Drive strengths for Exynos7 FSYS1 block */ #define EXYNOS7_FSYS1_PIN_DRV_LV1 0 |