* [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins
@ 2013-05-07 6:36 Laurent Pinchart
2013-05-07 12:01 ` Sergei Shtylyov
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Laurent Pinchart @ 2013-05-07 6:36 UTC (permalink / raw)
To: linux-sh
the USB OVC pins are optional alternate options for USB over-current
detection when using a 3.3V USB interface. As they're not mandatory,
don't group them with the USB PENC pins.
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 ++++++++++++++++++++++++++++--------
1 file changed, 36 insertions(+), 9 deletions(-)
Simon, this is a v3.10 fix, could you apply it upon Sergei's ack ?
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
index d6056ed..ddc2b2e 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
@@ -2392,27 +2392,48 @@ static const unsigned int sdhi3_wp_mux[] = {
};
/* - USB0 ------------------------------------------------------------------- */
static const unsigned int usb0_pins[] = {
- /* OVC */
- RCAR_GP_PIN(4, 22), RCAR_GP_PIN(4, 26),
+ /* PENC */
+ RCAR_GP_PIN(4, 26),
};
static const unsigned int usb0_mux[] = {
- USB_OVC0_MARK, USB_PENC0_MARK,
+ USB_PENC0_MARK,
+};
+static const unsigned int usb0_ovc_pins[] = {
+ /* OVC */
+ RCAR_GP_PIN(4, 22),
+};
+static const unsigned int usb0_ovc_mux[] = {
+ USB_OVC0_MARK,
};
/* - USB1 ------------------------------------------------------------------- */
static const unsigned int usb1_pins[] = {
- /* OVC */
- RCAR_GP_PIN(4, 24), RCAR_GP_PIN(4, 27),
+ /* PENC */
+ RCAR_GP_PIN(4, 27),
};
static const unsigned int usb1_mux[] = {
- USB_OVC1_MARK, USB_PENC1_MARK,
+ USB_PENC1_MARK,
+};
+static const unsigned int usb1_ovc_pins[] = {
+ /* OVC */
+ RCAR_GP_PIN(4, 24),
+};
+static const unsigned int usb1_ovc_mux[] = {
+ USB_OVC1_MARK,
};
/* - USB2 ------------------------------------------------------------------- */
static const unsigned int usb2_pins[] = {
- /* OVC, PENC */
- RCAR_GP_PIN(3, 29), RCAR_GP_PIN(4, 28),
+ /* PENC */
+ RCAR_GP_PIN(4, 28),
};
static const unsigned int usb2_mux[] = {
- USB_OVC2_MARK, USB_PENC2_MARK,
+ USB_PENC2_MARK,
+};
+static const unsigned int usb2_ovc_pins[] = {
+ /* OVC */
+ RCAR_GP_PIN(3, 29),
+};
+static const unsigned int usb2_ovc_mux[] = {
+ USB_OVC2_MARK,
};
/* - VIN0 ------------------------------------------------------------------- */
static const unsigned int vin0_data8_pins[] = {
@@ -2640,8 +2661,11 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(sdhi3_cd),
SH_PFC_PIN_GROUP(sdhi3_wp),
SH_PFC_PIN_GROUP(usb0),
+ SH_PFC_PIN_GROUP(usb0_ovc),
SH_PFC_PIN_GROUP(usb1),
+ SH_PFC_PIN_GROUP(usb1_ovc),
SH_PFC_PIN_GROUP(usb2),
+ SH_PFC_PIN_GROUP(usb2_ovc),
SH_PFC_PIN_GROUP(vin0_data8),
SH_PFC_PIN_GROUP(vin0_clk),
SH_PFC_PIN_GROUP(vin0_sync),
@@ -2834,14 +2858,17 @@ static const char * const sdhi3_groups[] = {
static const char * const usb0_groups[] = {
"usb0",
+ "usb0_ovc",
};
static const char * const usb1_groups[] = {
"usb1",
+ "usb1_ovc",
};
static const char * const usb2_groups[] = {
"usb2",
+ "usb2_ovc",
};
static const char * const vin0_groups[] = {
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins
2013-05-07 6:36 [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Laurent Pinchart
@ 2013-05-07 12:01 ` Sergei Shtylyov
2013-05-07 14:51 ` Laurent Pinchart
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Sergei Shtylyov @ 2013-05-07 12:01 UTC (permalink / raw)
To: linux-sh
Hello.
On 07-05-2013 10:36, Laurent Pinchart wrote:
> the USB OVC pins
This is too vague -- I would have been more specific: USB_OVCn pins.
> are optional alternate options
"Optional options" sound somewhat tautological. :-)
> for USB over-current
> detection when using a 3.3V USB interface. As they're not mandatory,
> don't group them with the USB PENC pins.
I'd mention a false pin conflict with HSPI on Marzen that grouping
the pins ensued.
> Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 ++++++++++++++++++++++++++++--------
> 1 file changed, 36 insertions(+), 9 deletions(-)
> Simon, this is a v3.10 fix, could you apply it upon Sergei's ack ?
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> index d6056ed..ddc2b2e 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> @@ -2392,27 +2392,48 @@ static const unsigned int sdhi3_wp_mux[] = {
> };
> /* - USB0 ------------------------------------------------------------------- */
> static const unsigned int usb0_pins[] = {
> - /* OVC */
> - RCAR_GP_PIN(4, 22), RCAR_GP_PIN(4, 26),
> + /* PENC */
PENC0.
> + RCAR_GP_PIN(4, 26),
> };
> static const unsigned int usb0_mux[] = {
> - USB_OVC0_MARK, USB_PENC0_MARK,
> + USB_PENC0_MARK,
> +};
> +static const unsigned int usb0_ovc_pins[] = {
> + /* OVC */
USB_OVC0.
> + RCAR_GP_PIN(4, 22),
> +};
> +static const unsigned int usb0_ovc_mux[] = {
> + USB_OVC0_MARK,
> };
> /* - USB1 ------------------------------------------------------------------- */
> static const unsigned int usb1_pins[] = {
> - /* OVC */
> - RCAR_GP_PIN(4, 24), RCAR_GP_PIN(4, 27),
> + /* PENC */
PENC1.
> + RCAR_GP_PIN(4, 27),
> };
> static const unsigned int usb1_mux[] = {
> - USB_OVC1_MARK, USB_PENC1_MARK,
> + USB_PENC1_MARK,
> +};
> +static const unsigned int usb1_ovc_pins[] = {
> + /* OVC */
USB_OVC1.
> + RCAR_GP_PIN(4, 24),
> +};
> +static const unsigned int usb1_ovc_mux[] = {
> + USB_OVC1_MARK,
> };
> /* - USB2 ------------------------------------------------------------------- */
> static const unsigned int usb2_pins[] = {
> - /* OVC, PENC */
> - RCAR_GP_PIN(3, 29), RCAR_GP_PIN(4, 28),
> + /* PENC */
PENC2.
> + RCAR_GP_PIN(4, 28),
> };
> static const unsigned int usb2_mux[] = {
> - USB_OVC2_MARK, USB_PENC2_MARK,
> + USB_PENC2_MARK,
> +};
> +static const unsigned int usb2_ovc_pins[] = {
> + /* OVC */
USB_OVC2.
> + RCAR_GP_PIN(3, 29),
> +};
> +static const unsigned int usb2_ovc_mux[] = {
> + USB_OVC2_MARK,
> };
> /* - VIN0 ------------------------------------------------------------------- */
> static const unsigned int vin0_data8_pins[] = {
Looks good otherwise. Maybe usb[0-2]_ovc_{pins|mux} should have been
named usb[0-2]_3_3v_{pins|mux} but it seems good enough as is...
WBR, Sergei
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins
2013-05-07 6:36 [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Laurent Pinchart
2013-05-07 12:01 ` Sergei Shtylyov
@ 2013-05-07 14:51 ` Laurent Pinchart
2013-05-07 15:09 ` Sergei Shtylyov
2013-05-07 15:16 ` Laurent Pinchart
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2013-05-07 14:51 UTC (permalink / raw)
To: linux-sh
Hi Sergei,
On Tuesday 07 May 2013 16:01:14 Sergei Shtylyov wrote:
> On 07-05-2013 10:36, Laurent Pinchart wrote:
> > the USB OVC pins
>
> This is too vague -- I would have been more specific: USB_OVCn pins.
>
> > are optional alternate options
>
> "Optional options" sound somewhat tautological. :-)
>
> > for USB over-current
> > detection when using a 3.3V USB interface. As they're not mandatory,
> > don't group them with the USB PENC pins.
>
> I'd mention a false pin conflict with HSPI on Marzen that grouping
> the pins ensued.
What about
The USB_OVCn pins alternate options for USB over-current detection when using
a 3.3V USB interface. As they're not mandatory they can be used independently
of the USB PENC pins. Don't group the USB_OVCn and PENC pins to avoid
conflicts when the USB_OVCn pins are used by another function.
> > Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >
> > drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 +++++++++++++++++++++++-------
> > 1 file changed, 36 insertions(+), 9 deletions(-)
> >
> > Simon, this is a v3.10 fix, could you apply it upon Sergei's ack ?
> >
> > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> > b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index d6056ed..ddc2b2e 100644
> > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> > @@ -2392,27 +2392,48 @@ static const unsigned int sdhi3_wp_mux[] = {
> >
> > };
> > /* - USB0
> > ------------------------------------------------------------------- */
> > static const unsigned int usb0_pins[] = {
> >
> > - /* OVC */
> > - RCAR_GP_PIN(4, 22), RCAR_GP_PIN(4, 26),
> > + /* PENC */
>
> PENC0.
It's the PENC pin for the USB0 function, so the comments refer to PENC, not
PENC0. Same for the other pins below.
> > + RCAR_GP_PIN(4, 26),
> >
> > };
> > static const unsigned int usb0_mux[] = {
> >
> > - USB_OVC0_MARK, USB_PENC0_MARK,
> > + USB_PENC0_MARK,
> > +};
> > +static const unsigned int usb0_ovc_pins[] = {
> > + /* OVC */
>
> USB_OVC0.
>
> > + RCAR_GP_PIN(4, 22),
> > +};
> > +static const unsigned int usb0_ovc_mux[] = {
> > + USB_OVC0_MARK,
> >
> > };
> > /* - USB1
> > ------------------------------------------------------------------- */
> > static const unsigned int usb1_pins[] = {
> >
> > - /* OVC */
> > - RCAR_GP_PIN(4, 24), RCAR_GP_PIN(4, 27),
> > + /* PENC */
>
> PENC1.
>
> > + RCAR_GP_PIN(4, 27),
> >
> > };
> > static const unsigned int usb1_mux[] = {
> >
> > - USB_OVC1_MARK, USB_PENC1_MARK,
> > + USB_PENC1_MARK,
> > +};
> > +static const unsigned int usb1_ovc_pins[] = {
> > + /* OVC */
>
> USB_OVC1.
>
> > + RCAR_GP_PIN(4, 24),
> > +};
> > +static const unsigned int usb1_ovc_mux[] = {
> > + USB_OVC1_MARK,
> >
> > };
> > /* - USB2
> > ------------------------------------------------------------------- */
> > static const unsigned int usb2_pins[] = {
> >
> > - /* OVC, PENC */
> > - RCAR_GP_PIN(3, 29), RCAR_GP_PIN(4, 28),
> > + /* PENC */
>
> PENC2.
>
> > + RCAR_GP_PIN(4, 28),
> >
> > };
> > static const unsigned int usb2_mux[] = {
> >
> > - USB_OVC2_MARK, USB_PENC2_MARK,
> > + USB_PENC2_MARK,
> > +};
> > +static const unsigned int usb2_ovc_pins[] = {
> > + /* OVC */
>
> USB_OVC2.
>
> > + RCAR_GP_PIN(3, 29),
> > +};
> > +static const unsigned int usb2_ovc_mux[] = {
> > + USB_OVC2_MARK,
> >
> > };
> > /* - VIN0
> > ------------------------------------------------------------------- */
> > static const unsigned int vin0_data8_pins[] = {
>
> Looks good otherwise. Maybe usb[0-2]_ovc_{pins|mux} should have been
> named usb[0-2]_3_3v_{pins|mux} but it seems good enough as is...
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins
2013-05-07 6:36 [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Laurent Pinchart
2013-05-07 12:01 ` Sergei Shtylyov
2013-05-07 14:51 ` Laurent Pinchart
@ 2013-05-07 15:09 ` Sergei Shtylyov
2013-05-07 15:16 ` Laurent Pinchart
3 siblings, 0 replies; 7+ messages in thread
From: Sergei Shtylyov @ 2013-05-07 15:09 UTC (permalink / raw)
To: linux-sh
On 07-05-2013 18:51, Laurent Pinchart wrote:
>>> the USB OVC pins
>> This is too vague -- I would have been more specific: USB_OVCn pins.
>>> are optional alternate options
>> "Optional options" sound somewhat tautological. :-)
>>> for USB over-current
>>> detection when using a 3.3V USB interface. As they're not mandatory,
>>> don't group them with the USB PENC pins.
>> I'd mention a false pin conflict with HSPI on Marzen that grouping
>> the pins ensued.
> What about
> The USB_OVCn pins alternate options for USB over-current detection when using
You missed "are" here.
> a 3.3V USB interface. As they're not mandatory they can be used independently
> of the USB PENC pins. Don't group the USB_OVCn and PENC pins to avoid
> conflicts when the USB_OVCn pins are used by another function.
Thanks, that's better.
>>> Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>> ---
>>> drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 +++++++++++++++++++++++-------
>>> 1 file changed, 36 insertions(+), 9 deletions(-)
>>> Simon, this is a v3.10 fix, could you apply it upon Sergei's ack ?
>>> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
>>> b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index d6056ed..ddc2b2e 100644
>>> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
>>> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
>>> @@ -2392,27 +2392,48 @@ static const unsigned int sdhi3_wp_mux[] = {
>>>
>>> };
>>> /* - USB0
>>> ------------------------------------------------------------------- */
>>> static const unsigned int usb0_pins[] = {
>>>
>>> - /* OVC */
>>> - RCAR_GP_PIN(4, 22), RCAR_GP_PIN(4, 26),
>>> + /* PENC */
>>
>> PENC0.
> It's the PENC pin for the USB0 function, so the comments refer to PENC, not
> PENC0. Same for the other pins below.
No, the other pins are not the same: there's OVCn and USB_OVCn pins,
you're mixing them up in your other comments.
WBR, Sergei
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins
2013-05-07 6:36 [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Laurent Pinchart
` (2 preceding siblings ...)
2013-05-07 15:09 ` Sergei Shtylyov
@ 2013-05-07 15:16 ` Laurent Pinchart
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2013-05-07 15:16 UTC (permalink / raw)
To: linux-sh
Hi Sergei,
On Tuesday 07 May 2013 19:09:53 Sergei Shtylyov wrote:
> On 07-05-2013 18:51, Laurent Pinchart wrote:
[snip]
> >>> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> >>> b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index d6056ed..ddc2b2e 100644
> >>> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> >>> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> >>> @@ -2392,27 +2392,48 @@ static const unsigned int sdhi3_wp_mux[] = {
> >>>
> >>> };
> >>> /* - USB0
> >>> -------------------------------------------------------------------
> >>> */
> >>> static const unsigned int usb0_pins[] = {
> >>>
> >>> - /* OVC */
> >>> - RCAR_GP_PIN(4, 22), RCAR_GP_PIN(4, 26),
> >>> + /* PENC */
> >>>
> >> PENC0.
> >
> > It's the PENC pin for the USB0 function, so the comments refer to PENC,
> > not PENC0. Same for the other pins below.
>
> No, the other pins are not the same: there's OVCn and USB_OVCn pins, you're
> mixing them up in your other comments.
I will s/OVC/USB_OVC/
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] Renesas ARM based SoC pinmux fix for v3.10 (repost)
@ 2013-05-25 6:45 Simon Horman
2013-05-25 6:45 ` Simon Horman
0 siblings, 1 reply; 7+ messages in thread
From: Simon Horman @ 2013-05-25 6:45 UTC (permalink / raw)
To: linux-arm-kernel
[ Repost after hopefully resolving a local mail configuration problem ]
Hi Olof, Hi Arnd,
The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:
Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-fixes2-for-v3.10
for you to fetch changes up to 16a31ebde0763580ed6891094249e1bd4a329be1:
sh-pfc: r8a7779: Don't group USB OVC and PENC pins (2013-05-22 22:01:59 +0900)
----------------------------------------------------------------
Correction to USB OVC and PENC pin groupings on r8a7779 SoC.
This avoids conflicts when the USB_OVCn pins are used by another function.
This has been observed to be a problem in v3.10-rc1.
----------------------------------------------------------------
Laurent Pinchart (1):
sh-pfc: r8a7779: Don't group USB OVC and PENC pins
drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 +++++++++++++++++++++++++++-------
1 file changed, 36 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins
2013-05-25 6:45 [GIT PULL] Renesas ARM based SoC pinmux fix for v3.10 (repost) Simon Horman
@ 2013-05-25 6:45 ` Simon Horman
0 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-05-25 6:45 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The USB_OVCn pins are alternate options for USB over-current detection
when using a 3.3V USB interface. As they're not mandatory they can be
used independently of the USB PENC pins. Don't group the USB_OVCn and
PENC pins to avoid conflicts when the USB_OVCn pins are used by another
function.
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 +++++++++++++++++++++++++++-------
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
index 791a671..8cd90e7 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
@@ -2357,27 +2357,48 @@ static const unsigned int sdhi3_wp_mux[] = {
};
/* - USB0 ------------------------------------------------------------------- */
static const unsigned int usb0_pins[] = {
- /* OVC */
- 150, 154,
+ /* PENC */
+ 154,
};
static const unsigned int usb0_mux[] = {
- USB_OVC0_MARK, USB_PENC0_MARK,
+ USB_PENC0_MARK,
+};
+static const unsigned int usb0_ovc_pins[] = {
+ /* USB_OVC */
+ 150
+};
+static const unsigned int usb0_ovc_mux[] = {
+ USB_OVC0_MARK,
};
/* - USB1 ------------------------------------------------------------------- */
static const unsigned int usb1_pins[] = {
- /* OVC */
- 152, 155,
+ /* PENC */
+ 155,
};
static const unsigned int usb1_mux[] = {
- USB_OVC1_MARK, USB_PENC1_MARK,
+ USB_PENC1_MARK,
+};
+static const unsigned int usb1_ovc_pins[] = {
+ /* USB_OVC */
+ 152,
+};
+static const unsigned int usb1_ovc_mux[] = {
+ USB_OVC1_MARK,
};
/* - USB2 ------------------------------------------------------------------- */
static const unsigned int usb2_pins[] = {
- /* OVC, PENC */
- 125, 156,
+ /* PENC */
+ 156,
};
static const unsigned int usb2_mux[] = {
- USB_OVC2_MARK, USB_PENC2_MARK,
+ USB_PENC2_MARK,
+};
+static const unsigned int usb2_ovc_pins[] = {
+ /* USB_OVC */
+ 125,
+};
+static const unsigned int usb2_ovc_mux[] = {
+ USB_OVC2_MARK,
};
static const struct sh_pfc_pin_group pinmux_groups[] = {
@@ -2501,8 +2522,11 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(sdhi3_cd),
SH_PFC_PIN_GROUP(sdhi3_wp),
SH_PFC_PIN_GROUP(usb0),
+ SH_PFC_PIN_GROUP(usb0_ovc),
SH_PFC_PIN_GROUP(usb1),
+ SH_PFC_PIN_GROUP(usb1_ovc),
SH_PFC_PIN_GROUP(usb2),
+ SH_PFC_PIN_GROUP(usb2_ovc),
};
static const char * const du0_groups[] = {
@@ -2683,14 +2707,17 @@ static const char * const sdhi3_groups[] = {
static const char * const usb0_groups[] = {
"usb0",
+ "usb0_ovc",
};
static const char * const usb1_groups[] = {
"usb1",
+ "usb1_ovc",
};
static const char * const usb2_groups[] = {
"usb2",
+ "usb2_ovc",
};
static const struct sh_pfc_function pinmux_functions[] = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins
@ 2013-05-25 6:45 ` Simon Horman
0 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-05-25 6:45 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The USB_OVCn pins are alternate options for USB over-current detection
when using a 3.3V USB interface. As they're not mandatory they can be
used independently of the USB PENC pins. Don't group the USB_OVCn and
PENC pins to avoid conflicts when the USB_OVCn pins are used by another
function.
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 +++++++++++++++++++++++++++-------
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
index 791a671..8cd90e7 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
@@ -2357,27 +2357,48 @@ static const unsigned int sdhi3_wp_mux[] = {
};
/* - USB0 ------------------------------------------------------------------- */
static const unsigned int usb0_pins[] = {
- /* OVC */
- 150, 154,
+ /* PENC */
+ 154,
};
static const unsigned int usb0_mux[] = {
- USB_OVC0_MARK, USB_PENC0_MARK,
+ USB_PENC0_MARK,
+};
+static const unsigned int usb0_ovc_pins[] = {
+ /* USB_OVC */
+ 150
+};
+static const unsigned int usb0_ovc_mux[] = {
+ USB_OVC0_MARK,
};
/* - USB1 ------------------------------------------------------------------- */
static const unsigned int usb1_pins[] = {
- /* OVC */
- 152, 155,
+ /* PENC */
+ 155,
};
static const unsigned int usb1_mux[] = {
- USB_OVC1_MARK, USB_PENC1_MARK,
+ USB_PENC1_MARK,
+};
+static const unsigned int usb1_ovc_pins[] = {
+ /* USB_OVC */
+ 152,
+};
+static const unsigned int usb1_ovc_mux[] = {
+ USB_OVC1_MARK,
};
/* - USB2 ------------------------------------------------------------------- */
static const unsigned int usb2_pins[] = {
- /* OVC, PENC */
- 125, 156,
+ /* PENC */
+ 156,
};
static const unsigned int usb2_mux[] = {
- USB_OVC2_MARK, USB_PENC2_MARK,
+ USB_PENC2_MARK,
+};
+static const unsigned int usb2_ovc_pins[] = {
+ /* USB_OVC */
+ 125,
+};
+static const unsigned int usb2_ovc_mux[] = {
+ USB_OVC2_MARK,
};
static const struct sh_pfc_pin_group pinmux_groups[] = {
@@ -2501,8 +2522,11 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(sdhi3_cd),
SH_PFC_PIN_GROUP(sdhi3_wp),
SH_PFC_PIN_GROUP(usb0),
+ SH_PFC_PIN_GROUP(usb0_ovc),
SH_PFC_PIN_GROUP(usb1),
+ SH_PFC_PIN_GROUP(usb1_ovc),
SH_PFC_PIN_GROUP(usb2),
+ SH_PFC_PIN_GROUP(usb2_ovc),
};
static const char * const du0_groups[] = {
@@ -2683,14 +2707,17 @@ static const char * const sdhi3_groups[] = {
static const char * const usb0_groups[] = {
"usb0",
+ "usb0_ovc",
};
static const char * const usb1_groups[] = {
"usb1",
+ "usb1_ovc",
};
static const char * const usb2_groups[] = {
"usb2",
+ "usb2_ovc",
};
static const struct sh_pfc_function pinmux_functions[] = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-05-25 6:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-07 6:36 [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Laurent Pinchart
2013-05-07 12:01 ` Sergei Shtylyov
2013-05-07 14:51 ` Laurent Pinchart
2013-05-07 15:09 ` Sergei Shtylyov
2013-05-07 15:16 ` Laurent Pinchart
-- strict thread matches above, loose matches on Subject: below --
2013-05-25 6:45 [GIT PULL] Renesas ARM based SoC pinmux fix for v3.10 (repost) Simon Horman
2013-05-25 6:45 ` [PATCH] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Simon Horman
2013-05-25 6:45 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.