Messages in this thread | | | Date | Wed, 22 Mar 2017 20:00:00 +0200 | From | Krzysztof Kozlowski <> | Subject | Re: [PATCH 1/2] pinctrl: samsung: Add missing part for PINCFG_TYPE_DRV of Exynos5433 |
| |
On Wed, Mar 22, 2017 at 05:03:31PM +0900, Chanwoo Choi wrote: > The commit 1259feddd0f8("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. > > But, when merged the multiple patches, the missing parts occurred. > So, this patch adds the missing part using the EXYNOS5433_PIN_BANK_* macro. > > Fixes: 7f36f5d11cda ("Merge tag 'v4.10-rc6' into devel") > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > --- > drivers/pinctrl/samsung/pinctrl-exynos.c | 80 ++++++++++++++++---------------- > 1 file changed, 40 insertions(+), 40 deletions(-) >
Thanks, applied. I also verified that this would indeed be a proper merge conflict resolution.
Best regards, Krzysztof
| |