From: krzk@kernel.org (Krzysztof Kozlowski)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] pinctrl: samsung: Add missing part for PINCFG_TYPE_DRV of Exynos5433
Date: Wed, 22 Mar 2017 20:00:00 +0200 [thread overview]
Message-ID: <20170322180000.z2u6syrxhaa752ha@kozik-lap> (raw)
In-Reply-To: <1490169812-25225-2-git-send-email-cw00.choi@samsung.com>
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
next prev parent reply other threads:[~2017-03-22 18:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20170322080334epcas1p2531fbfdd3c3e033b0f67c5a5cf63b6a1@epcas1p2.samsung.com>
2017-03-22 8:03 ` [PATCH 0/2] pinctrl: samsung: Fix PINCFG_TYPE_DRV bitfields for Exynos5433 Chanwoo Choi
2017-03-22 8:03 ` [PATCH 1/2] pinctrl: samsung: Add missing part for PINCFG_TYPE_DRV of Exynos5433 Chanwoo Choi
2017-03-22 18:00 ` Krzysztof Kozlowski [this message]
2017-03-22 8:03 ` [PATCH 2/2] pinctrl: samsung: Remove unused pin-bank macro Chanwoo Choi
2017-03-22 18:11 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170322180000.z2u6syrxhaa752ha@kozik-lap \
--to=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox