linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] pxa/vpac270: PXAUDC init fix
@ 2010-05-02  4:10 Marek Vasut
  2010-05-04 14:44 ` Eric Miao
  0 siblings, 1 reply; 2+ messages in thread
From: Marek Vasut @ 2010-05-02  4:10 UTC (permalink / raw)
  To: linux-arm-kernel

This patch removes write to UP2OCR[DMSTATE] (ex-UP2OCR_DPPUBE) which is invalid
on PXA270C5 and later.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 arch/arm/mach-pxa/vpac270.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index 8da22d4..9884fa9 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -359,9 +359,9 @@ static struct platform_device vpac270_gpio_vbus = {
 static void vpac270_udc_command(int cmd)
 {
 	if (cmd == PXA2XX_UDC_CMD_CONNECT)
-		UP2OCR |= UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE;
+		UP2OCR = UP2OCR_HXOE | UP2OCR_DPPUE;
 	else if (cmd == PXA2XX_UDC_CMD_DISCONNECT)
-		UP2OCR &= ~(UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE);
+		UP2OCR = UP2OCR_HXOE;
 }
 
 static struct pxa2xx_udc_mach_info vpac270_udc_info __initdata = {
-- 
1.7.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH] pxa/vpac270: PXAUDC init fix
  2010-05-02  4:10 [PATCH] pxa/vpac270: PXAUDC init fix Marek Vasut
@ 2010-05-04 14:44 ` Eric Miao
  0 siblings, 0 replies; 2+ messages in thread
From: Eric Miao @ 2010-05-04 14:44 UTC (permalink / raw)
  To: linux-arm-kernel

On Sun, May 2, 2010 at 12:10 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> This patch removes write to UP2OCR[DMSTATE] (ex-UP2OCR_DPPUBE) which is invalid
> on PXA270C5 and later.
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>

Applied.

> ---
> ?arch/arm/mach-pxa/vpac270.c | ? ?4 ++--
> ?1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
> index 8da22d4..9884fa9 100644
> --- a/arch/arm/mach-pxa/vpac270.c
> +++ b/arch/arm/mach-pxa/vpac270.c
> @@ -359,9 +359,9 @@ static struct platform_device vpac270_gpio_vbus = {
> ?static void vpac270_udc_command(int cmd)
> ?{
> ? ? ? ?if (cmd == PXA2XX_UDC_CMD_CONNECT)
> - ? ? ? ? ? ? ? UP2OCR |= UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE;
> + ? ? ? ? ? ? ? UP2OCR = UP2OCR_HXOE | UP2OCR_DPPUE;
> ? ? ? ?else if (cmd == PXA2XX_UDC_CMD_DISCONNECT)
> - ? ? ? ? ? ? ? UP2OCR &= ~(UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE);
> + ? ? ? ? ? ? ? UP2OCR = UP2OCR_HXOE;
> ?}
>
> ?static struct pxa2xx_udc_mach_info vpac270_udc_info __initdata = {
> --
> 1.7.0
>
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-05-04 14:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-02  4:10 [PATCH] pxa/vpac270: PXAUDC init fix Marek Vasut
2010-05-04 14:44 ` Eric Miao

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).