From: Simon Horman <horms@verge.net.au>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH] sh-pfc: r8a7779: Fix merge conflict
Date: Tue, 04 Jun 2013 02:18:34 +0000 [thread overview]
Message-ID: <20130604021834.GS23054@verge.net.au> (raw)
On Wed, May 29, 2013 at 09:15:41AM +0200, Laurent Pinchart wrote:
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 2 --
> 1 file changed, 2 deletions(-)
>
> Hi Simon,
>
> The following commit introduced a bug in pinmux support for r8a7779.c. Would
> you be able to squash this patch into the commit when pushing it to mainline ?
Done. It should appear the next time I push into the renesas tree.
Hopefully later today.
>
> commit e15dfb923186955690b56406eb6e8adcbafbea40
> Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Date: Mon Apr 8 12:05:31 2013 +0200
>
> sh-pfc: r8a7779: Replace hardcoded pin numbers with RCAR_GP_PIN macro
>
> Use the RCAR_GP_PIN macro to convert from the documentation pin number
> space to the linear pinctrl space.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> index 6ad6fdd..96bdf48 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> @@ -2425,7 +2425,6 @@ static const unsigned int sdhi3_wp_mux[] = {
> /* - USB0 ------------------------------------------------------------------- */
> static const unsigned int usb0_pins[] = {
> /* PENC */
> - 154,
> RCAR_GP_PIN(4, 26),
> };
> static const unsigned int usb0_mux[] = {
> @@ -2440,7 +2439,6 @@ static const unsigned int usb0_ovc_mux[] = {
> };
> /* - USB1 ------------------------------------------------------------------- */
> static const unsigned int usb1_pins[] = {
> -
> /* PENC */
> RCAR_GP_PIN(4, 27),
> };
> --
> Regards,
>
> Laurent Pinchart
>
next reply other threads:[~2013-06-04 2:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 2:18 Simon Horman [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-05-29 7:15 [PATCH] sh-pfc: r8a7779: Fix merge conflict Laurent Pinchart
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=20130604021834.GS23054@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-sh@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).