* [PATCH] sh-pfc: r8a7779: Fix merge conflict
@ 2013-05-29 7:15 Laurent Pinchart
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Pinchart @ 2013-05-29 7:15 UTC (permalink / raw)
To: linux-sh
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 ?
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sh-pfc: r8a7779: Fix merge conflict
@ 2013-06-04 2:18 Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2013-06-04 2:18 UTC (permalink / raw)
To: linux-sh
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-04 2:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-04 2:18 [PATCH] sh-pfc: r8a7779: Fix merge conflict Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2013-05-29 7:15 Laurent Pinchart
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).