* [GIT PULL v3] Renesas ARM based SoC fixes for v3.10
@ 2013-06-04 7:46 Simon Horman
2013-06-04 7:46 ` [PATCH 1/2] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Simon Horman
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Simon Horman @ 2013-06-04 7:46 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
I have revised this series to include Linus Walleij's ack for
"sh-pfc: r8a7779: Don't group USB OVC and PENC pins" and double
checked that I actually pushed the tag this time.
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-fixes-for-v3.10
for you to fetch changes up to 5600a8485603b240790005b9b58de4c4f6ada69d:
ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 (2013-06-04 14:37:53 +0900)
----------------------------------------------------------------
Renesas ARM based SoC fixes for v3.10
* 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.
* Update CMT clock rating for sh73a0 SoC to resolve boot failure
on kzm9g-reference. This resolves a regression between v3.9 and v3.10-rc1.
----------------------------------------------------------------
Laurent Pinchart (1):
sh-pfc: r8a7779: Don't group USB OVC and PENC pins
Simon Horman (1):
ARM: shmobile: sh73a0: Update CMT clockevent rating to 80
arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 ++++++++++++++++++++++++++++-------
2 files changed, 37 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] sh-pfc: r8a7779: Don't group USB OVC and PENC pins 2013-06-04 7:46 [GIT PULL v3] Renesas ARM based SoC fixes for v3.10 Simon Horman @ 2013-06-04 7:46 ` Simon Horman 2013-06-04 7:46 ` [PATCH 2/2] ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 Simon Horman 2013-06-08 1:11 ` [GIT PULL v3] Renesas ARM based SoC fixes for v3.10 Olof Johansson 2 siblings, 0 replies; 5+ messages in thread From: Simon Horman @ 2013-06-04 7:46 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> Acked-by: Linus Walleij <linus.walleij@linaro.org> 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.8.2.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 2013-06-04 7:46 [GIT PULL v3] Renesas ARM based SoC fixes for v3.10 Simon Horman 2013-06-04 7:46 ` [PATCH 1/2] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Simon Horman @ 2013-06-04 7:46 ` Simon Horman 2013-06-08 1:11 ` [GIT PULL v3] Renesas ARM based SoC fixes for v3.10 Olof Johansson 2 siblings, 0 replies; 5+ messages in thread From: Simon Horman @ 2013-06-04 7:46 UTC (permalink / raw) To: linux-arm-kernel Update the CMT clockevent rating from 125 to 80. This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1 introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp: Avoid dummy clockevent being preferred over real"). The patch noted above reduces the rating of dummy clockevent from 400 to 100. This patch reduces the rating of CMT so that it is once again less than that of the dummy clockevent. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index fdf3894..9696f36 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -252,7 +252,7 @@ static struct sh_timer_config cmt10_platform_data = { .name = "CMT10", .channel_offset = 0x10, .timer_bit = 0, - .clockevent_rating = 125, + .clockevent_rating = 80, .clocksource_rating = 125, }; -- 1.8.2.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [GIT PULL v3] Renesas ARM based SoC fixes for v3.10 2013-06-04 7:46 [GIT PULL v3] Renesas ARM based SoC fixes for v3.10 Simon Horman 2013-06-04 7:46 ` [PATCH 1/2] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Simon Horman 2013-06-04 7:46 ` [PATCH 2/2] ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 Simon Horman @ 2013-06-08 1:11 ` Olof Johansson 2 siblings, 0 replies; 5+ messages in thread From: Olof Johansson @ 2013-06-08 1:11 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 04, 2013 at 04:46:54PM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > I have revised this series to include Linus Walleij's ack for > "sh-pfc: r8a7779: Don't group USB OVC and PENC pins" and double > checked that I actually pushed the tag this time. > > 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-fixes-for-v3.10 Thanks, pulled. -Olof ^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] Renesas ARM based SoC fixes for v3.10
@ 2013-05-29 22:28 Simon Horman
2013-05-29 22:28 ` [PATCH 2/2] ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 Simon Horman
0 siblings, 1 reply; 5+ messages in thread
From: Simon Horman @ 2013-05-29 22:28 UTC (permalink / raw)
To: linux-arm-kernel
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
for you to fetch changes up to c7f413548dce3d25609c12efe963b3e6c8e678f3:
ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 (2013-05-28 14:46:38 +0900)
----------------------------------------------------------------
Renesas ARM based SoC fixes for v3.10
* 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.
* Update CMT clock rating for sh73a0 SoC to resolve boot failure
on kzm9g-reference. This resolves a regression between v3.9 and v3.10-rc1.
----------------------------------------------------------------
Laurent Pinchart (1):
sh-pfc: r8a7779: Don't group USB OVC and PENC pins
Simon Horman (1):
ARM: shmobile: sh73a0: Update CMT clockevent rating to 80
arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 45 ++++++++++++++++++++++++++-------
2 files changed, 37 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/2] ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 2013-05-29 22:28 [GIT PULL] " Simon Horman @ 2013-05-29 22:28 ` Simon Horman 0 siblings, 0 replies; 5+ messages in thread From: Simon Horman @ 2013-05-29 22:28 UTC (permalink / raw) To: linux-arm-kernel Update the CMT clockevent rating from 125 to 80. This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1 introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp: Avoid dummy clockevent being preferred over real"). The patch noted above reduces the rating of dummy clockevent from 400 to 100. This patch reduces the rating of CMT so that it is once again less than that of the dummy clockevent. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index fdf3894..9696f36 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -252,7 +252,7 @@ static struct sh_timer_config cmt10_platform_data = { .name = "CMT10", .channel_offset = 0x10, .timer_bit = 0, - .clockevent_rating = 125, + .clockevent_rating = 80, .clocksource_rating = 125, }; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-08 1:11 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-06-04 7:46 [GIT PULL v3] Renesas ARM based SoC fixes for v3.10 Simon Horman 2013-06-04 7:46 ` [PATCH 1/2] sh-pfc: r8a7779: Don't group USB OVC and PENC pins Simon Horman 2013-06-04 7:46 ` [PATCH 2/2] ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 Simon Horman 2013-06-08 1:11 ` [GIT PULL v3] Renesas ARM based SoC fixes for v3.10 Olof Johansson -- strict thread matches above, loose matches on Subject: below -- 2013-05-29 22:28 [GIT PULL] " Simon Horman 2013-05-29 22:28 ` [PATCH 2/2] ARM: shmobile: sh73a0: Update CMT clockevent rating to 80 Simon Horman
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).