]> git.baikalelectronics.ru Git - kernel.git/commit
pinctrl: samsung: Add missing part for PINCFG_TYPE_DRV of Exynos5433
authorChanwoo Choi <cw00.choi@samsung.com>
Wed, 22 Mar 2017 08:03:31 +0000 (17:03 +0900)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 10 Apr 2017 07:34:08 +0000 (09:34 +0200)
commit66384d135e5ffb752efc696fc4ef5ee66e1bda85
treed366502278ea1dfdc13c219591181c00a4b80c2e
parent870b71e4b49c4371244c089689afc30714387992
pinctrl: samsung: Add missing part for PINCFG_TYPE_DRV of Exynos5433

The commit c8873878d3c7("pinctrl: samsung: Fix the width of
PINCFG_TYPE_DRV bitfields for Exynos5433") already fixed
the different width of PINCFG_TYPE_DRV from previous Exynos SoC.

However wrong merge conflict resolution was chosen in commit
9c561d429ae7 ("Merge tag 'v4.10-rc6' into devel") effectively dropping
the changes for PINCFG_TYPE_DRV.  Re-do them here.

The macro EXYNOS_PIN_BANK_EINTW is no longer used so remove it.

Fixes: 9c561d429ae7 ("Merge tag 'v4.10-rc6' into devel")
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/samsung/pinctrl-exynos.c
drivers/pinctrl/samsung/pinctrl-exynos.h