diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-06-06 13:40:47 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-06-15 14:54:23 -0400 |
commit | d438ae5796085379327bdba76114929eedf94a89 (patch) | |
tree | 412caa9e4a7eebd2b75f26e51d661bcfeb77c9ff /drivers/usb/gadget/pxa27x_udc.c | |
parent | 69eaf23a9797e1bdf16e210ef4da3e756a41f4de (diff) |
[ARM] 5080/1: touch PSSR_OTGPH only on pxa27x in ohci-pxa27x and pxa27x_udc
and include pxa2xx-regs.h as build fix since PSSR definitions
moved from pxa-regs.h into pxa2xx-regs.h.
Note: This change is temporary as pxa27x processor specific
code will be finally moved elsewhere (both drivers should
support pxa3xx, too).
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/usb/gadget/pxa27x_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 499b7a23f351..40d6b580f152 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <linux/usb.h> | 38 | #include <linux/usb.h> |
39 | #include <linux/usb/ch9.h> | 39 | #include <linux/usb/ch9.h> |
40 | #include <linux/usb/gadget.h> | 40 | #include <linux/usb/gadget.h> |
41 | 41 | #include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */ | |
42 | #include <asm/arch/udc.h> | 42 | #include <asm/arch/udc.h> |
43 | 43 | ||
44 | #include "pxa27x_udc.h" | 44 | #include "pxa27x_udc.h" |
@@ -2359,7 +2359,8 @@ static int pxa_udc_resume(struct platform_device *_dev) | |||
2359 | * Software must configure the USB OTG pad, UDC, and UHC | 2359 | * Software must configure the USB OTG pad, UDC, and UHC |
2360 | * to the state they were in before entering sleep mode. | 2360 | * to the state they were in before entering sleep mode. |
2361 | */ | 2361 | */ |
2362 | PSSR |= PSSR_OTGPH; | 2362 | if (cpu_is_pxa27x()) |
2363 | PSSR |= PSSR_OTGPH; | ||
2363 | 2364 | ||
2364 | return 0; | 2365 | return 0; |
2365 | } | 2366 | } |