AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 19:40:56 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers

Browse Source 
The pxa2xx_udc.c driver is renamed to pxa25x_udc.c (the platform
driver name changes from pxa2xx-udc to pxa25x-udc) and the
platform driver name of pxa27x_udc.c is fixed to pxa27x-udc.
pxa_device_udc in devices.c is split into pxa25x and pxa27x flavors
and the pxa27x_device_udc is enabled in pxa27x.c.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Including from Ian Molton:

Fixes for mistakes left over from the PXA2{5,7}X UDC split.

Signed-off-by: Ian Molton <spyro@f2s.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Philipp Zabel 2008-06-22 23:36:39 +01:00 committed by Russell King
parent 73d1a2c467
commit 7a85762043
14 changed files with 198 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-ixp4xx/common.c
View File

@ -326,11 +326,11 @@ static struct resource ixp4xx_udc_resources[] = {
}; };
/* /*
* USB device controller. The IXP4xx uses the same controller as PXA2XX, * USB device controller. The IXP4xx uses the same controller as PXA25X,
* so we just use the same device. * so we just use the same device.
*/ */
static struct platform_device ixp4xx_udc_device = { static struct platform_device ixp4xx_udc_device = {
.name = "pxa2xx-udc", .name = "pxa25x-udc",
.id = -1, .id = -1,
.num_resources = 2, .num_resources = 2,
.resource = ixp4xx_udc_resources, .resource = ixp4xx_udc_resources,

15
arch/arm/mach-pxa/devices.c
View File

@ -93,8 +93,19 @@ static struct resource pxa2xx_udc_resources[] = {
static u64 udc_dma_mask = ~(u32)0; static u64 udc_dma_mask = ~(u32)0;
struct platform_device pxa_device_udc = { struct platform_device pxa25x_device_udc = {
.name = "pxa2xx-udc", .name = "pxa25x-udc",
.id = -1,
.resource = pxa2xx_udc_resources,
.num_resources = ARRAY_SIZE(pxa2xx_udc_resources),
.dev = {
.platform_data = &pxa_udc_info,
.dma_mask = &udc_dma_mask,
}
};
struct platform_device pxa27x_device_udc = {
.name = "pxa27x-udc",
.id = -1, .id = -1,
.resource = pxa2xx_udc_resources, .resource = pxa2xx_udc_resources,
.num_resources = ARRAY_SIZE(pxa2xx_udc_resources), .num_resources = ARRAY_SIZE(pxa2xx_udc_resources),

3
arch/arm/mach-pxa/devices.h
View File

@ -1,7 +1,8 @@
extern struct platform_device pxa_device_mci; extern struct platform_device pxa_device_mci;
extern struct platform_device pxa3xx_device_mci2; extern struct platform_device pxa3xx_device_mci2;
extern struct platform_device pxa3xx_device_mci3; extern struct platform_device pxa3xx_device_mci3;
extern struct platform_device pxa_device_udc; extern struct platform_device pxa25x_device_udc;
extern struct platform_device pxa27x_device_udc;
extern struct platform_device pxa_device_fb; extern struct platform_device pxa_device_fb;
extern struct platform_device pxa_device_ffuart; extern struct platform_device pxa_device_ffuart;
extern struct platform_device pxa_device_btuart; extern struct platform_device pxa_device_btuart;

4
arch/arm/mach-pxa/pxa25x.c
View File

@ -127,7 +127,7 @@ static struct clk pxa25x_clks[] = {
INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev),
INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev),
INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL), INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL),
INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev), INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa25x_device_udc.dev),
INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev),
INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev),
@ -267,7 +267,7 @@ void __init pxa25x_init_irq(void)
} }
static struct platform_device *pxa25x_devices[] __initdata = { static struct platform_device *pxa25x_devices[] __initdata = {
&pxa_device_udc, &pxa25x_device_udc,
&pxa_device_ffuart, &pxa_device_ffuart,
&pxa_device_btuart, &pxa_device_btuart,
&pxa_device_stuart, &pxa_device_stuart,

4
arch/arm/mach-pxa/pxa27x.c
View File

@ -146,7 +146,7 @@ static struct clk pxa27x_clks[] = {
INIT_CKEN("I2SCLK", I2S, 14682000, 0, &pxa_device_i2s.dev), INIT_CKEN("I2SCLK", I2S, 14682000, 0, &pxa_device_i2s.dev),
INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev),
INIT_CKEN("UDCCLK", USB, 48000000, 5, &pxa_device_udc.dev), INIT_CKEN("UDCCLK", USB, 48000000, 5, &pxa27x_device_udc.dev),
INIT_CKEN("MMCCLK", MMC, 19500000, 0, &pxa_device_mci.dev), INIT_CKEN("MMCCLK", MMC, 19500000, 0, &pxa_device_mci.dev),
INIT_CKEN("FICPCLK", FICP, 48000000, 0, &pxa_device_ficp.dev), INIT_CKEN("FICPCLK", FICP, 48000000, 0, &pxa_device_ficp.dev),
@ -357,7 +357,7 @@ void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info)
} }
static struct platform_device *devices[] __initdata = { static struct platform_device *devices[] __initdata = {
/* &pxa_device_udc, The UDC driver is PXA25x only */ &pxa27x_device_udc,
&pxa_device_ffuart, &pxa_device_ffuart,
&pxa_device_btuart, &pxa_device_btuart,
&pxa_device_stuart, &pxa_device_stuart,

2
arch/arm/mach-pxa/pxa3xx.c
View File

@ -231,7 +231,7 @@ static struct clk pxa3xx_clks[] = {
PXA3xx_CKEN("UARTCLK", STUART, 14857000, 1, NULL), PXA3xx_CKEN("UARTCLK", STUART, 14857000, 1, NULL),
PXA3xx_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), PXA3xx_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev),
PXA3xx_CKEN("UDCCLK", UDC, 48000000, 5, &pxa_device_udc.dev), PXA3xx_CKEN("UDCCLK", UDC, 48000000, 5, &pxa27x_device_udc.dev),
PXA3xx_CKEN("USBCLK", USBH, 48000000, 0, &pxa27x_device_ohci.dev), PXA3xx_CKEN("USBCLK", USBH, 48000000, 0, &pxa27x_device_ohci.dev),
PXA3xx_CKEN("KBDCLK", KEYPAD, 32768, 0, &pxa27x_device_keypad.dev), PXA3xx_CKEN("KBDCLK", KEYPAD, 32768, 0, &pxa27x_device_keypad.dev),

12
drivers/usb/gadget/Kconfig
View File

@ -172,7 +172,7 @@ config USB_NET2280
default USB_GADGET default USB_GADGET
select USB_GADGET_SELECTED select USB_GADGET_SELECTED
config USB_GADGET_PXA2XX config USB_GADGET_PXA25X
boolean "PXA 25x or IXP 4xx" boolean "PXA 25x or IXP 4xx"
depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
help help
@ -184,19 +184,19 @@ config USB_GADGET_PXA2XX
zero (for control transfers). zero (for control transfers).
Say "y" to link the driver statically, or "m" to build a Say "y" to link the driver statically, or "m" to build a
dynamically linked module called "pxa2xx_udc" and force all dynamically linked module called "pxa25x_udc" and force all
gadget drivers to also be dynamically linked. gadget drivers to also be dynamically linked.
config USB_PXA2XX config USB_PXA25X
tristate tristate
depends on USB_GADGET_PXA2XX depends on USB_GADGET_PXA25X
default USB_GADGET default USB_GADGET
select USB_GADGET_SELECTED select USB_GADGET_SELECTED
# if there's only one gadget driver, using only two bulk endpoints, # if there's only one gadget driver, using only two bulk endpoints,
# don't waste memory for the other endpoints # don't waste memory for the other endpoints
config USB_PXA2XX_SMALL config USB_PXA25X_SMALL
depends on USB_GADGET_PXA2XX depends on USB_GADGET_PXA25X
bool bool
default n if USB_ETH_RNDIS default n if USB_ETH_RNDIS
default y if USB_ZERO default y if USB_ZERO

2
drivers/usb/gadget/Makefile
View File

@ -8,7 +8,7 @@ endif
obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o
obj-$(CONFIG_USB_NET2280) += net2280.o obj-$(CONFIG_USB_NET2280) += net2280.o
obj-$(CONFIG_USB_AMD5536UDC) += amd5536udc.o obj-$(CONFIG_USB_AMD5536UDC) += amd5536udc.o
obj-$(CONFIG_USB_PXA2XX) += pxa2xx_udc.o obj-$(CONFIG_USB_PXA25X) += pxa25x_udc.o
obj-$(CONFIG_USB_PXA27X) += pxa27x_udc.o obj-$(CONFIG_USB_PXA27X) += pxa27x_udc.o
obj-$(CONFIG_USB_GOKU) += goku_udc.o obj-$(CONFIG_USB_GOKU) += goku_udc.o
obj-$(CONFIG_USB_OMAP) += omap_udc.o obj-$(CONFIG_USB_OMAP) += omap_udc.o

2
drivers/usb/gadget/ether.c
View File

@ -262,7 +262,7 @@ MODULE_PARM_DESC(host_addr, "Host Ethernet Address");
/* For CDC-incapable hardware, choose the simple cdc subset. /* For CDC-incapable hardware, choose the simple cdc subset.
* Anything that talks bulk (without notable bugs) can do this. * Anything that talks bulk (without notable bugs) can do this.
*/ */
#ifdef CONFIG_USB_GADGET_PXA2XX #ifdef CONFIG_USB_GADGET_PXA25X
#define DEV_CONFIG_SUBSET #define DEV_CONFIG_SUBSET
#endif #endif

4
drivers/usb/gadget/gadget_chips.h
View File

@ -29,8 +29,8 @@
#define gadget_is_dummy(g) 0 #define gadget_is_dummy(g) 0
#endif #endif
#ifdef CONFIG_USB_GADGET_PXA2XX #ifdef CONFIG_USB_GADGET_PXA25X
#define gadget_is_pxa(g) !strcmp("pxa2xx_udc", (g)->name) #define gadget_is_pxa(g) !strcmp("pxa25x_udc", (g)->name)
#else #else
#define gadget_is_pxa(g) 0 #define gadget_is_pxa(g) 0
#endif #endif

2
drivers/usb/gadget/inode.c
View File

@ -1501,7 +1501,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
} }
break; break;
#ifndef CONFIG_USB_GADGET_PXA2XX #ifndef CONFIG_USB_GADGET_PXA25X
/* PXA automagically handles this request too */ /* PXA automagically handles this request too */
case USB_REQ_GET_CONFIGURATION: case USB_REQ_GET_CONFIGURATION:
if (ctrl->bRequestType != 0x80) if (ctrl->bRequestType != 0x80)

299
drivers/usb/gadget/pxa2xx_udc.c → drivers/usb/gadget/pxa25x_udc.c
View File

@ -1,5 +1,4 @@
/* /*
* linux/drivers/usb/gadget/pxa2xx_udc.c
* Intel PXA25x and IXP4xx on-chip full speed USB device controllers * Intel PXA25x and IXP4xx on-chip full speed USB device controllers
* *
* Copyright (C) 2002 Intrinsyc, Inc. (Frank Becker) * Copyright (C) 2002 Intrinsyc, Inc. (Frank Becker)
@ -97,7 +96,7 @@
#define DRIVER_DESC "PXA 25x USB Device Controller driver" #define DRIVER_DESC "PXA 25x USB Device Controller driver"
static const char driver_name [] = "pxa2xx_udc"; static const char driver_name [] = "pxa25x_udc";
static const char ep0name [] = "ep0"; static const char ep0name [] = "ep0";
@ -117,10 +116,10 @@ static const char ep0name [] = "ep0";
#endif #endif
#include "pxa2xx_udc.h" #include "pxa25x_udc.h"
#ifdef CONFIG_USB_PXA2XX_SMALL #ifdef CONFIG_USB_PXA25X_SMALL
#define SIZE_STR " (small)" #define SIZE_STR " (small)"
#else #else
#define SIZE_STR "" #define SIZE_STR ""
@ -132,8 +131,8 @@ static const char ep0name [] = "ep0";
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
static void pxa2xx_ep_fifo_flush (struct usb_ep *ep); static void pxa25x_ep_fifo_flush (struct usb_ep *ep);
static void nuke (struct pxa2xx_ep *, int status); static void nuke (struct pxa25x_ep *, int status);
/* one GPIO should be used to detect VBUS from the host */ /* one GPIO should be used to detect VBUS from the host */
static int is_vbus_present(void) static int is_vbus_present(void)
@ -218,24 +217,24 @@ static inline void udc_ack_int_UDCCR(int mask)
/* /*
* endpoint enable/disable * endpoint enable/disable
* *
* we need to verify the descriptors used to enable endpoints. since pxa2xx * we need to verify the descriptors used to enable endpoints. since pxa25x
* endpoint configurations are fixed, and are pretty much always enabled, * endpoint configurations are fixed, and are pretty much always enabled,
* there's not a lot to manage here. * there's not a lot to manage here.
* *
* because pxa2xx can't selectively initialize bulk (or interrupt) endpoints, * because pxa25x can't selectively initialize bulk (or interrupt) endpoints,
* (resetting endpoint halt and toggle), SET_INTERFACE is unusable except * (resetting endpoint halt and toggle), SET_INTERFACE is unusable except
* for a single interface (with only the default altsetting) and for gadget * for a single interface (with only the default altsetting) and for gadget
* drivers that don't halt endpoints (not reset by set_interface). that also * drivers that don't halt endpoints (not reset by set_interface). that also
* means that if you use ISO, you must violate the USB spec rule that all * means that if you use ISO, you must violate the USB spec rule that all
* iso endpoints must be in non-default altsettings. * iso endpoints must be in non-default altsettings.
*/ */
static int pxa2xx_ep_enable (struct usb_ep *_ep, static int pxa25x_ep_enable (struct usb_ep *_ep,
const struct usb_endpoint_descriptor *desc) const struct usb_endpoint_descriptor *desc)
{ {
struct pxa2xx_ep *ep; struct pxa25x_ep *ep;
struct pxa2xx_udc *dev; struct pxa25x_udc *dev;
ep = container_of (_ep, struct pxa2xx_ep, ep); ep = container_of (_ep, struct pxa25x_ep, ep);
if (!_ep || !desc || ep->desc || _ep->name == ep0name if (!_ep || !desc || ep->desc || _ep->name == ep0name
|| desc->bDescriptorType != USB_DT_ENDPOINT || desc->bDescriptorType != USB_DT_ENDPOINT
|| ep->bEndpointAddress != desc->bEndpointAddress || ep->bEndpointAddress != desc->bEndpointAddress
@ -274,7 +273,7 @@ static int pxa2xx_ep_enable (struct usb_ep *_ep,
ep->ep.maxpacket = le16_to_cpu (desc->wMaxPacketSize); ep->ep.maxpacket = le16_to_cpu (desc->wMaxPacketSize);
/* flush fifo (mostly for OUT buffers) */ /* flush fifo (mostly for OUT buffers) */
pxa2xx_ep_fifo_flush (_ep); pxa25x_ep_fifo_flush (_ep);
/* ... reset halt state too, if we could ... */ /* ... reset halt state too, if we could ... */
@ -282,12 +281,12 @@ static int pxa2xx_ep_enable (struct usb_ep *_ep,
return 0; return 0;
} }
static int pxa2xx_ep_disable (struct usb_ep *_ep) static int pxa25x_ep_disable (struct usb_ep *_ep)
{ {
struct pxa2xx_ep *ep; struct pxa25x_ep *ep;
unsigned long flags; unsigned long flags;
ep = container_of (_ep, struct pxa2xx_ep, ep); ep = container_of (_ep, struct pxa25x_ep, ep);
if (!_ep || !ep->desc) { if (!_ep || !ep->desc) {
DMSG("%s, %s not enabled\n", __func__, DMSG("%s, %s not enabled\n", __func__,
_ep ? ep->ep.name : NULL); _ep ? ep->ep.name : NULL);
@ -298,7 +297,7 @@ static int pxa2xx_ep_disable (struct usb_ep *_ep)
nuke (ep, -ESHUTDOWN); nuke (ep, -ESHUTDOWN);
/* flush fifo (mostly for IN buffers) */ /* flush fifo (mostly for IN buffers) */
pxa2xx_ep_fifo_flush (_ep); pxa25x_ep_fifo_flush (_ep);
ep->desc = NULL; ep->desc = NULL;
ep->stopped = 1; ep->stopped = 1;
@ -310,18 +309,18 @@ static int pxa2xx_ep_disable (struct usb_ep *_ep)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* for the pxa2xx, these can just wrap kmalloc/kfree. gadget drivers /* for the pxa25x, these can just wrap kmalloc/kfree. gadget drivers
* must still pass correctly initialized endpoints, since other controller * must still pass correctly initialized endpoints, since other controller
* drivers may care about how it's currently set up (dma issues etc). * drivers may care about how it's currently set up (dma issues etc).
*/ */
/* /*
* pxa2xx_ep_alloc_request - allocate a request data structure * pxa25x_ep_alloc_request - allocate a request data structure
*/ */
static struct usb_request * static struct usb_request *
pxa2xx_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags) pxa25x_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags)
{ {
struct pxa2xx_request *req; struct pxa25x_request *req;
req = kzalloc(sizeof(*req), gfp_flags); req = kzalloc(sizeof(*req), gfp_flags);
if (!req) if (!req)
@ -333,14 +332,14 @@ pxa2xx_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags)
/* /*
* pxa2xx_ep_free_request - deallocate a request data structure * pxa25x_ep_free_request - deallocate a request data structure
*/ */
static void static void
pxa2xx_ep_free_request (struct usb_ep *_ep, struct usb_request *_req) pxa25x_ep_free_request (struct usb_ep *_ep, struct usb_request *_req)
{ {
struct pxa2xx_request *req; struct pxa25x_request *req;
req = container_of (_req, struct pxa2xx_request, req); req = container_of (_req, struct pxa25x_request, req);
WARN_ON (!list_empty (&req->queue)); WARN_ON (!list_empty (&req->queue));
kfree(req); kfree(req);
} }
@ -350,7 +349,7 @@ pxa2xx_ep_free_request (struct usb_ep *_ep, struct usb_request *_req)
/* /*
* done - retire a request; caller blocked irqs * done - retire a request; caller blocked irqs
*/ */
static void done(struct pxa2xx_ep *ep, struct pxa2xx_request *req, int status) static void done(struct pxa25x_ep *ep, struct pxa25x_request *req, int status)
{ {
unsigned stopped = ep->stopped; unsigned stopped = ep->stopped;
@ -373,13 +372,13 @@ static void done(struct pxa2xx_ep *ep, struct pxa2xx_request *req, int status)
} }
static inline void ep0_idle (struct pxa2xx_udc *dev) static inline void ep0_idle (struct pxa25x_udc *dev)
{ {
dev->ep0state = EP0_IDLE; dev->ep0state = EP0_IDLE;
} }
static int static int
write_packet(volatile u32 *uddr, struct pxa2xx_request *req, unsigned max) write_packet(volatile u32 *uddr, struct pxa25x_request *req, unsigned max)
{ {
u8 *buf; u8 *buf;
unsigned length, count; unsigned length, count;
@ -404,7 +403,7 @@ write_packet(volatile u32 *uddr, struct pxa2xx_request *req, unsigned max)
* caller guarantees at least one packet buffer is ready (or a zlp). * caller guarantees at least one packet buffer is ready (or a zlp).
*/ */
static int static int
write_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req) write_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
{ {
unsigned max; unsigned max;
@ -461,7 +460,7 @@ write_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
* ep0 data stage. these chips want very simple state transitions. * ep0 data stage. these chips want very simple state transitions.
*/ */
static inline static inline
void ep0start(struct pxa2xx_udc *dev, u32 flags, const char *tag) void ep0start(struct pxa25x_udc *dev, u32 flags, const char *tag)
{ {
UDCCS0 = flags|UDCCS0_SA|UDCCS0_OPR; UDCCS0 = flags|UDCCS0_SA|UDCCS0_OPR;
USIR0 = USIR0_IR0; USIR0 = USIR0_IR0;
@ -471,7 +470,7 @@ void ep0start(struct pxa2xx_udc *dev, u32 flags, const char *tag)
} }
static int static int
write_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req) write_ep0_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
{ {
unsigned count; unsigned count;
int is_short; int is_short;
@ -531,7 +530,7 @@ write_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
* request buffer having filled (and maybe overran till end-of-packet). * request buffer having filled (and maybe overran till end-of-packet).
*/ */
static int static int
read_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req) read_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
{ {
for (;;) { for (;;) {
u32 udccs; u32 udccs;
@ -608,7 +607,7 @@ read_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
* protocols do use them. * protocols do use them.
*/ */
static int static int
read_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req) read_ep0_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
{ {
u8 *buf, byte; u8 *buf, byte;
unsigned bufferspace; unsigned bufferspace;
@ -647,21 +646,21 @@ read_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int static int
pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) pxa25x_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
{ {
struct pxa2xx_request *req; struct pxa25x_request *req;
struct pxa2xx_ep *ep; struct pxa25x_ep *ep;
struct pxa2xx_udc *dev; struct pxa25x_udc *dev;
unsigned long flags; unsigned long flags;
req = container_of(_req, struct pxa2xx_request, req); req = container_of(_req, struct pxa25x_request, req);
if (unlikely (!_req || !_req->complete || !_req->buf if (unlikely (!_req || !_req->complete || !_req->buf
|| !list_empty(&req->queue))) { || !list_empty(&req->queue))) {
DMSG("%s, bad params\n", __func__); DMSG("%s, bad params\n", __func__);
return -EINVAL; return -EINVAL;
} }
ep = container_of(_ep, struct pxa2xx_ep, ep); ep = container_of(_ep, struct pxa25x_ep, ep);
if (unlikely (!_ep || (!ep->desc && ep->ep.name != ep0name))) { if (unlikely (!_ep || (!ep->desc && ep->ep.name != ep0name))) {
DMSG("%s, bad ep\n", __func__); DMSG("%s, bad ep\n", __func__);
return -EINVAL; return -EINVAL;
@ -757,14 +756,14 @@ pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
/* /*
* nuke - dequeue ALL requests * nuke - dequeue ALL requests
*/ */
static void nuke(struct pxa2xx_ep *ep, int status) static void nuke(struct pxa25x_ep *ep, int status)
{ {
struct pxa2xx_request *req; struct pxa25x_request *req;
/* called with irqs blocked */ /* called with irqs blocked */
while (!list_empty(&ep->queue)) { while (!list_empty(&ep->queue)) {
req = list_entry(ep->queue.next, req = list_entry(ep->queue.next,
struct pxa2xx_request, struct pxa25x_request,
queue); queue);
done(ep, req, status); done(ep, req, status);
} }
@ -774,13 +773,13 @@ static void nuke(struct pxa2xx_ep *ep, int status)
/* dequeue JUST ONE request */ /* dequeue JUST ONE request */
static int pxa2xx_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req) static int pxa25x_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
{ {
struct pxa2xx_ep *ep; struct pxa25x_ep *ep;
struct pxa2xx_request *req; struct pxa25x_request *req;
unsigned long flags; unsigned long flags;
ep = container_of(_ep, struct pxa2xx_ep, ep); ep = container_of(_ep, struct pxa25x_ep, ep);
if (!_ep || ep->ep.name == ep0name) if (!_ep || ep->ep.name == ep0name)
return -EINVAL; return -EINVAL;
@ -804,12 +803,12 @@ static int pxa2xx_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int pxa2xx_ep_set_halt(struct usb_ep *_ep, int value) static int pxa25x_ep_set_halt(struct usb_ep *_ep, int value)
{ {
struct pxa2xx_ep *ep; struct pxa25x_ep *ep;
unsigned long flags; unsigned long flags;
ep = container_of(_ep, struct pxa2xx_ep, ep); ep = container_of(_ep, struct pxa25x_ep, ep);
if (unlikely (!_ep if (unlikely (!_ep
|| (!ep->desc && ep->ep.name != ep0name)) || (!ep->desc && ep->ep.name != ep0name))
|| ep->bmAttributes == USB_ENDPOINT_XFER_ISOC) { || ep->bmAttributes == USB_ENDPOINT_XFER_ISOC) {
@ -859,11 +858,11 @@ static int pxa2xx_ep_set_halt(struct usb_ep *_ep, int value)
return 0; return 0;
} }
static int pxa2xx_ep_fifo_status(struct usb_ep *_ep) static int pxa25x_ep_fifo_status(struct usb_ep *_ep)
{ {
struct pxa2xx_ep *ep; struct pxa25x_ep *ep;
ep = container_of(_ep, struct pxa2xx_ep, ep); ep = container_of(_ep, struct pxa25x_ep, ep);
if (!_ep) { if (!_ep) {
DMSG("%s, bad ep\n", __func__); DMSG("%s, bad ep\n", __func__);
return -ENODEV; return -ENODEV;
@ -878,11 +877,11 @@ static int pxa2xx_ep_fifo_status(struct usb_ep *_ep)
return (*ep->reg_ubcr & 0xfff) + 1; return (*ep->reg_ubcr & 0xfff) + 1;
} }
static void pxa2xx_ep_fifo_flush(struct usb_ep *_ep) static void pxa25x_ep_fifo_flush(struct usb_ep *_ep)
{ {
struct pxa2xx_ep *ep; struct pxa25x_ep *ep;
ep = container_of(_ep, struct pxa2xx_ep, ep); ep = container_of(_ep, struct pxa25x_ep, ep);
if (!_ep || ep->ep.name == ep0name || !list_empty(&ep->queue)) { if (!_ep || ep->ep.name == ep0name || !list_empty(&ep->queue)) {
DMSG("%s, bad ep\n", __func__); DMSG("%s, bad ep\n", __func__);
return; return;
@ -904,19 +903,19 @@ static void pxa2xx_ep_fifo_flush(struct usb_ep *_ep)
} }
static struct usb_ep_ops pxa2xx_ep_ops = { static struct usb_ep_ops pxa25x_ep_ops = {
.enable = pxa2xx_ep_enable, .enable = pxa25x_ep_enable,
.disable = pxa2xx_ep_disable, .disable = pxa25x_ep_disable,
.alloc_request = pxa2xx_ep_alloc_request, .alloc_request = pxa25x_ep_alloc_request,
.free_request = pxa2xx_ep_free_request, .free_request = pxa25x_ep_free_request,
.queue = pxa2xx_ep_queue, .queue = pxa25x_ep_queue,
.dequeue = pxa2xx_ep_dequeue, .dequeue = pxa25x_ep_dequeue,
.set_halt = pxa2xx_ep_set_halt, .set_halt = pxa25x_ep_set_halt,
.fifo_status = pxa2xx_ep_fifo_status, .fifo_status = pxa25x_ep_fifo_status,
.fifo_flush = pxa2xx_ep_fifo_flush, .fifo_flush = pxa25x_ep_fifo_flush,
}; };
@ -925,12 +924,12 @@ static struct usb_ep_ops pxa2xx_ep_ops = {
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
static int pxa2xx_udc_get_frame(struct usb_gadget *_gadget) static int pxa25x_udc_get_frame(struct usb_gadget *_gadget)
{ {
return ((UFNRH & 0x07) << 8) | (UFNRL & 0xff); return ((UFNRH & 0x07) << 8) | (UFNRL & 0xff);
} }
static int pxa2xx_udc_wakeup(struct usb_gadget *_gadget) static int pxa25x_udc_wakeup(struct usb_gadget *_gadget)
{ {
/* host may not have enabled remote wakeup */ /* host may not have enabled remote wakeup */
if ((UDCCS0 & UDCCS0_DRWF) == 0) if ((UDCCS0 & UDCCS0_DRWF) == 0)
@ -939,14 +938,14 @@ static int pxa2xx_udc_wakeup(struct usb_gadget *_gadget)
return 0; return 0;
} }
static void stop_activity(struct pxa2xx_udc *, struct usb_gadget_driver *); static void stop_activity(struct pxa25x_udc *, struct usb_gadget_driver *);
static void udc_enable (struct pxa2xx_udc *); static void udc_enable (struct pxa25x_udc *);
static void udc_disable(struct pxa2xx_udc *); static void udc_disable(struct pxa25x_udc *);
/* We disable the UDC -- and its 48 MHz clock -- whenever it's not /* We disable the UDC -- and its 48 MHz clock -- whenever it's not
* in active use. * in active use.
*/ */
static int pullup(struct pxa2xx_udc *udc) static int pullup(struct pxa25x_udc *udc)
{ {
int is_active = udc->vbus && udc->pullup && !udc->suspended; int is_active = udc->vbus && udc->pullup && !udc->suspended;
DMSG("%s\n", is_active ? "active" : "inactive"); DMSG("%s\n", is_active ? "active" : "inactive");
@ -976,11 +975,11 @@ static int pullup(struct pxa2xx_udc *udc)
} }
/* VBUS reporting logically comes from a transceiver */ /* VBUS reporting logically comes from a transceiver */
static int pxa2xx_udc_vbus_session(struct usb_gadget *_gadget, int is_active) static int pxa25x_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
{ {
struct pxa2xx_udc *udc; struct pxa25x_udc *udc;
udc = container_of(_gadget, struct pxa2xx_udc, gadget); udc = container_of(_gadget, struct pxa25x_udc, gadget);
udc->vbus = (is_active != 0); udc->vbus = (is_active != 0);
DMSG("vbus %s\n", is_active ? "supplied" : "inactive"); DMSG("vbus %s\n", is_active ? "supplied" : "inactive");
pullup(udc); pullup(udc);
@ -988,11 +987,11 @@ static int pxa2xx_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
} }
/* drivers may have software control over D+ pullup */ /* drivers may have software control over D+ pullup */
static int pxa2xx_udc_pullup(struct usb_gadget *_gadget, int is_active) static int pxa25x_udc_pullup(struct usb_gadget *_gadget, int is_active)
{ {
struct pxa2xx_udc *udc; struct pxa25x_udc *udc;
udc = container_of(_gadget, struct pxa2xx_udc, gadget); udc = container_of(_gadget, struct pxa25x_udc, gadget);
/* not all boards support pullup control */ /* not all boards support pullup control */
if (!udc->mach->gpio_pullup && !udc->mach->udc_command) if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
@ -1003,11 +1002,11 @@ static int pxa2xx_udc_pullup(struct usb_gadget *_gadget, int is_active)
return 0; return 0;
} }
static const struct usb_gadget_ops pxa2xx_udc_ops = { static const struct usb_gadget_ops pxa25x_udc_ops = {
.get_frame = pxa2xx_udc_get_frame, .get_frame = pxa25x_udc_get_frame,
.wakeup = pxa2xx_udc_wakeup, .wakeup = pxa25x_udc_wakeup,
.vbus_session = pxa2xx_udc_vbus_session, .vbus_session = pxa25x_udc_vbus_session,
.pullup = pxa2xx_udc_pullup, .pullup = pxa25x_udc_pullup,
// .vbus_draw ... boards may consume current from VBUS, up to // .vbus_draw ... boards may consume current from VBUS, up to
// 100-500mA based on config. the 500uA suspend ceiling means // 100-500mA based on config. the 500uA suspend ceiling means
@ -1021,7 +1020,7 @@ static const struct usb_gadget_ops pxa2xx_udc_ops = {
static int static int
udc_seq_show(struct seq_file *m, void *_d) udc_seq_show(struct seq_file *m, void *_d)
{ {
struct pxa2xx_udc *dev = m->private; struct pxa25x_udc *dev = m->private;
unsigned long flags; unsigned long flags;
int i; int i;
u32 tmp; u32 tmp;
@ -1082,8 +1081,8 @@ udc_seq_show(struct seq_file *m, void *_d)
/* dump endpoint queues */ /* dump endpoint queues */
for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) { for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) {
struct pxa2xx_ep *ep = &dev->ep [i]; struct pxa25x_ep *ep = &dev->ep [i];
struct pxa2xx_request *req; struct pxa25x_request *req;
if (i != 0) { if (i != 0) {
const struct usb_endpoint_descriptor *desc; const struct usb_endpoint_descriptor *desc;
@ -1156,7 +1155,7 @@ static const struct file_operations debug_fops = {
/* /*
* udc_disable - disable USB device controller * udc_disable - disable USB device controller
*/ */
static void udc_disable(struct pxa2xx_udc *dev) static void udc_disable(struct pxa25x_udc *dev)
{ {
/* block all irqs */ /* block all irqs */
udc_set_mask_UDCCR(UDCCR_SRM|UDCCR_REM); udc_set_mask_UDCCR(UDCCR_SRM|UDCCR_REM);
@ -1176,7 +1175,7 @@ static void udc_disable(struct pxa2xx_udc *dev)
/* /*
* udc_reinit - initialize software state * udc_reinit - initialize software state
*/ */
static void udc_reinit(struct pxa2xx_udc *dev) static void udc_reinit(struct pxa25x_udc *dev)
{ {
u32 i; u32 i;
@ -1187,7 +1186,7 @@ static void udc_reinit(struct pxa2xx_udc *dev)
/* basic endpoint records init */ /* basic endpoint records init */
for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) { for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) {
struct pxa2xx_ep *ep = &dev->ep[i]; struct pxa25x_ep *ep = &dev->ep[i];
if (i != 0) if (i != 0)
list_add_tail (&ep->ep.ep_list, &dev->gadget.ep_list); list_add_tail (&ep->ep.ep_list, &dev->gadget.ep_list);
@ -1204,7 +1203,7 @@ static void udc_reinit(struct pxa2xx_udc *dev)
/* until it's enabled, this UDC should be completely invisible /* until it's enabled, this UDC should be completely invisible
* to any USB host. * to any USB host.
*/ */
static void udc_enable (struct pxa2xx_udc *dev) static void udc_enable (struct pxa25x_udc *dev)
{ {
udc_clear_mask_UDCCR(UDCCR_UDE); udc_clear_mask_UDCCR(UDCCR_UDE);
@ -1260,7 +1259,7 @@ static void udc_enable (struct pxa2xx_udc *dev)
*/ */
int usb_gadget_register_driver(struct usb_gadget_driver *driver) int usb_gadget_register_driver(struct usb_gadget_driver *driver)
{ {
struct pxa2xx_udc *dev = the_controller; struct pxa25x_udc *dev = the_controller;
int retval; int retval;
if (!driver if (!driver
@ -1305,7 +1304,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
EXPORT_SYMBOL(usb_gadget_register_driver); EXPORT_SYMBOL(usb_gadget_register_driver);
static void static void
stop_activity(struct pxa2xx_udc *dev, struct usb_gadget_driver *driver) stop_activity(struct pxa25x_udc *dev, struct usb_gadget_driver *driver)
{ {
int i; int i;
@ -1316,7 +1315,7 @@ stop_activity(struct pxa2xx_udc *dev, struct usb_gadget_driver *driver)
/* prevent new request submissions, kill any outstanding requests */ /* prevent new request submissions, kill any outstanding requests */
for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) { for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) {
struct pxa2xx_ep *ep = &dev->ep[i]; struct pxa25x_ep *ep = &dev->ep[i];
ep->stopped = 1; ep->stopped = 1;
nuke(ep, -ESHUTDOWN); nuke(ep, -ESHUTDOWN);
@ -1333,7 +1332,7 @@ stop_activity(struct pxa2xx_udc *dev, struct usb_gadget_driver *driver)
int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
{ {
struct pxa2xx_udc *dev = the_controller; struct pxa25x_udc *dev = the_controller;
if (!dev) if (!dev)
return -ENODEV; return -ENODEV;
@ -1370,7 +1369,7 @@ EXPORT_SYMBOL(usb_gadget_unregister_driver);
static irqreturn_t static irqreturn_t
lubbock_vbus_irq(int irq, void *_dev) lubbock_vbus_irq(int irq, void *_dev)
{ {
struct pxa2xx_udc *dev = _dev; struct pxa25x_udc *dev = _dev;
int vbus; int vbus;
dev->stats.irqs++; dev->stats.irqs++;
@ -1389,7 +1388,7 @@ lubbock_vbus_irq(int irq, void *_dev)
return IRQ_NONE; return IRQ_NONE;
} }
pxa2xx_udc_vbus_session(&dev->gadget, vbus); pxa25x_udc_vbus_session(&dev->gadget, vbus);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -1397,20 +1396,20 @@ lubbock_vbus_irq(int irq, void *_dev)
static irqreturn_t udc_vbus_irq(int irq, void *_dev) static irqreturn_t udc_vbus_irq(int irq, void *_dev)
{ {
struct pxa2xx_udc *dev = _dev; struct pxa25x_udc *dev = _dev;
int vbus = gpio_get_value(dev->mach->gpio_vbus); int vbus = gpio_get_value(dev->mach->gpio_vbus);
if (dev->mach->gpio_vbus_inverted) if (dev->mach->gpio_vbus_inverted)
vbus = !vbus; vbus = !vbus;
pxa2xx_udc_vbus_session(&dev->gadget, vbus); pxa25x_udc_vbus_session(&dev->gadget, vbus);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static inline void clear_ep_state (struct pxa2xx_udc *dev) static inline void clear_ep_state (struct pxa25x_udc *dev)
{ {
unsigned i; unsigned i;
@ -1423,7 +1422,7 @@ static inline void clear_ep_state (struct pxa2xx_udc *dev)
static void udc_watchdog(unsigned long _dev) static void udc_watchdog(unsigned long _dev)
{ {
struct pxa2xx_udc *dev = (void *)_dev; struct pxa25x_udc *dev = (void *)_dev;
local_irq_disable(); local_irq_disable();
if (dev->ep0state == EP0_STALL if (dev->ep0state == EP0_STALL
@ -1436,11 +1435,11 @@ static void udc_watchdog(unsigned long _dev)
local_irq_enable(); local_irq_enable();
} }
static void handle_ep0 (struct pxa2xx_udc *dev) static void handle_ep0 (struct pxa25x_udc *dev)
{ {
u32 udccs0 = UDCCS0; u32 udccs0 = UDCCS0;
struct pxa2xx_ep *ep = &dev->ep [0]; struct pxa25x_ep *ep = &dev->ep [0];
struct pxa2xx_request *req; struct pxa25x_request *req;
union { union {
struct usb_ctrlrequest r; struct usb_ctrlrequest r;
u8 raw [8]; u8 raw [8];
@ -1450,7 +1449,7 @@ static void handle_ep0 (struct pxa2xx_udc *dev)
if (list_empty(&ep->queue)) if (list_empty(&ep->queue))
req = NULL; req = NULL;
else else
req = list_entry(ep->queue.next, struct pxa2xx_request, queue); req = list_entry(ep->queue.next, struct pxa25x_request, queue);
/* clear stall status */ /* clear stall status */
if (udccs0 & UDCCS0_SST) { if (udccs0 & UDCCS0_SST) {
@ -1660,9 +1659,9 @@ static void handle_ep0 (struct pxa2xx_udc *dev)
USIR0 = USIR0_IR0; USIR0 = USIR0_IR0;
} }
static void handle_ep(struct pxa2xx_ep *ep) static void handle_ep(struct pxa25x_ep *ep)
{ {
struct pxa2xx_request *req; struct pxa25x_request *req;
int is_in = ep->bEndpointAddress & USB_DIR_IN; int is_in = ep->bEndpointAddress & USB_DIR_IN;
int completed; int completed;
u32 udccs, tmp; u32 udccs, tmp;
@ -1671,7 +1670,7 @@ static void handle_ep(struct pxa2xx_ep *ep)
completed = 0; completed = 0;
if (likely (!list_empty(&ep->queue))) if (likely (!list_empty(&ep->queue)))
req = list_entry(ep->queue.next, req = list_entry(ep->queue.next,
struct pxa2xx_request, queue); struct pxa25x_request, queue);
else else
req = NULL; req = NULL;
@ -1708,16 +1707,16 @@ static void handle_ep(struct pxa2xx_ep *ep)
} }
/* /*
* pxa2xx_udc_irq - interrupt handler * pxa25x_udc_irq - interrupt handler
* *
* avoid delays in ep0 processing. the control handshaking isn't always * avoid delays in ep0 processing. the control handshaking isn't always
* under software control (pxa250c0 and the pxa255 are better), and delays * under software control (pxa250c0 and the pxa255 are better), and delays
* could cause usb protocol errors. * could cause usb protocol errors.
*/ */
static irqreturn_t static irqreturn_t
pxa2xx_udc_irq(int irq, void *_dev) pxa25x_udc_irq(int irq, void *_dev)
{ {
struct pxa2xx_udc *dev = _dev; struct pxa25x_udc *dev = _dev;
int handled; int handled;
dev->stats.irqs++; dev->stats.irqs++;
@ -1826,9 +1825,9 @@ static void nop_release (struct device *dev)
* doing it at run-time) to save code, eliminate fault paths, and * doing it at run-time) to save code, eliminate fault paths, and
* be more obviously correct. * be more obviously correct.
*/ */
static struct pxa2xx_udc memory = { static struct pxa25x_udc memory = {
.gadget = { .gadget = {
.ops = &pxa2xx_udc_ops, .ops = &pxa25x_udc_ops,
.ep0 = &memory.ep[0].ep, .ep0 = &memory.ep[0].ep,
.name = driver_name, .name = driver_name,
.dev = { .dev = {
@ -1841,7 +1840,7 @@ static struct pxa2xx_udc memory = {
.ep[0] = { .ep[0] = {
.ep = { .ep = {
.name = ep0name, .name = ep0name,
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = EP0_FIFO_SIZE, .maxpacket = EP0_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1853,7 +1852,7 @@ static struct pxa2xx_udc memory = {
.ep[1] = { .ep[1] = {
.ep = { .ep = {
.name = "ep1in-bulk", .name = "ep1in-bulk",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1866,7 +1865,7 @@ static struct pxa2xx_udc memory = {
.ep[2] = { .ep[2] = {
.ep = { .ep = {
.name = "ep2out-bulk", .name = "ep2out-bulk",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1877,11 +1876,11 @@ static struct pxa2xx_udc memory = {
.reg_ubcr = &UBCR2, .reg_ubcr = &UBCR2,
.reg_uddr = &UDDR2, .reg_uddr = &UDDR2,
}, },
#ifndef CONFIG_USB_PXA2XX_SMALL #ifndef CONFIG_USB_PXA25X_SMALL
.ep[3] = { .ep[3] = {
.ep = { .ep = {
.name = "ep3in-iso", .name = "ep3in-iso",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1894,7 +1893,7 @@ static struct pxa2xx_udc memory = {
.ep[4] = { .ep[4] = {
.ep = { .ep = {
.name = "ep4out-iso", .name = "ep4out-iso",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1908,7 +1907,7 @@ static struct pxa2xx_udc memory = {
.ep[5] = { .ep[5] = {
.ep = { .ep = {
.name = "ep5in-int", .name = "ep5in-int",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = INT_FIFO_SIZE, .maxpacket = INT_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1923,7 +1922,7 @@ static struct pxa2xx_udc memory = {
.ep[6] = { .ep[6] = {
.ep = { .ep = {
.name = "ep6in-bulk", .name = "ep6in-bulk",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1936,7 +1935,7 @@ static struct pxa2xx_udc memory = {
.ep[7] = { .ep[7] = {
.ep = { .ep = {
.name = "ep7out-bulk", .name = "ep7out-bulk",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1950,7 +1949,7 @@ static struct pxa2xx_udc memory = {
.ep[8] = { .ep[8] = {
.ep = { .ep = {
.name = "ep8in-iso", .name = "ep8in-iso",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1963,7 +1962,7 @@ static struct pxa2xx_udc memory = {
.ep[9] = { .ep[9] = {
.ep = { .ep = {
.name = "ep9out-iso", .name = "ep9out-iso",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1977,7 +1976,7 @@ static struct pxa2xx_udc memory = {
.ep[10] = { .ep[10] = {
.ep = { .ep = {
.name = "ep10in-int", .name = "ep10in-int",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = INT_FIFO_SIZE, .maxpacket = INT_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -1992,7 +1991,7 @@ static struct pxa2xx_udc memory = {
.ep[11] = { .ep[11] = {
.ep = { .ep = {
.name = "ep11in-bulk", .name = "ep11in-bulk",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -2005,7 +2004,7 @@ static struct pxa2xx_udc memory = {
.ep[12] = { .ep[12] = {
.ep = { .ep = {
.name = "ep12out-bulk", .name = "ep12out-bulk",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = BULK_FIFO_SIZE, .maxpacket = BULK_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -2019,7 +2018,7 @@ static struct pxa2xx_udc memory = {
.ep[13] = { .ep[13] = {
.ep = { .ep = {
.name = "ep13in-iso", .name = "ep13in-iso",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -2032,7 +2031,7 @@ static struct pxa2xx_udc memory = {
.ep[14] = { .ep[14] = {
.ep = { .ep = {
.name = "ep14out-iso", .name = "ep14out-iso",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = ISO_FIFO_SIZE, .maxpacket = ISO_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -2046,7 +2045,7 @@ static struct pxa2xx_udc memory = {
.ep[15] = { .ep[15] = {
.ep = { .ep = {
.name = "ep15in-int", .name = "ep15in-int",
.ops = &pxa2xx_ep_ops, .ops = &pxa25x_ep_ops,
.maxpacket = INT_FIFO_SIZE, .maxpacket = INT_FIFO_SIZE,
}, },
.dev = &memory, .dev = &memory,
@ -2056,7 +2055,7 @@ static struct pxa2xx_udc memory = {
.reg_udccs = &UDCCS15, .reg_udccs = &UDCCS15,
.reg_uddr = &UDDR15, .reg_uddr = &UDDR15,
}, },
#endif /* !CONFIG_USB_PXA2XX_SMALL */ #endif /* !CONFIG_USB_PXA25X_SMALL */
}; };
#define CP15R0_VENDOR_MASK 0xffffe000 #define CP15R0_VENDOR_MASK 0xffffe000
@ -2096,9 +2095,9 @@ static struct pxa2xx_udc memory = {
/* /*
* probe - binds to the platform device * probe - binds to the platform device
*/ */
static int __init pxa2xx_udc_probe(struct platform_device *pdev) static int __init pxa25x_udc_probe(struct platform_device *pdev)
{ {
struct pxa2xx_udc *dev = &memory; struct pxa25x_udc *dev = &memory;
int retval, vbus_irq, irq; int retval, vbus_irq, irq;
u32 chiprev; u32 chiprev;
@ -2161,7 +2160,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
if (dev->mach->gpio_vbus) { if (dev->mach->gpio_vbus) {
if ((retval = gpio_request(dev->mach->gpio_vbus, if ((retval = gpio_request(dev->mach->gpio_vbus,
"pxa2xx_udc GPIO VBUS"))) { "pxa25x_udc GPIO VBUS"))) {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
"can't get vbus gpio %d, err: %d\n", "can't get vbus gpio %d, err: %d\n",
dev->mach->gpio_vbus, retval); dev->mach->gpio_vbus, retval);
@ -2174,7 +2173,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
if (dev->mach->gpio_pullup) { if (dev->mach->gpio_pullup) {
if ((retval = gpio_request(dev->mach->gpio_pullup, if ((retval = gpio_request(dev->mach->gpio_pullup,
"pca2xx_udc GPIO PULLUP"))) { "pca25x_udc GPIO PULLUP"))) {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
"can't get pullup gpio %d, err: %d\n", "can't get pullup gpio %d, err: %d\n",
dev->mach->gpio_pullup, retval); dev->mach->gpio_pullup, retval);
@ -2200,7 +2199,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
dev->vbus = is_vbus_present(); dev->vbus = is_vbus_present();
/* irq setup after old hardware state is cleaned up */ /* irq setup after old hardware state is cleaned up */
retval = request_irq(irq, pxa2xx_udc_irq, retval = request_irq(irq, pxa25x_udc_irq,
IRQF_DISABLED, driver_name, dev); IRQF_DISABLED, driver_name, dev);
if (retval != 0) { if (retval != 0) {
pr_err("%s: can't get irq %d, err %d\n", pr_err("%s: can't get irq %d, err %d\n",
@ -2266,14 +2265,14 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
return retval; return retval;
} }
static void pxa2xx_udc_shutdown(struct platform_device *_dev) static void pxa25x_udc_shutdown(struct platform_device *_dev)
{ {
pullup_off(); pullup_off();
} }
static int __exit pxa2xx_udc_remove(struct platform_device *pdev) static int __exit pxa25x_udc_remove(struct platform_device *pdev)
{ {
struct pxa2xx_udc *dev = platform_get_drvdata(pdev); struct pxa25x_udc *dev = platform_get_drvdata(pdev);
if (dev->driver) if (dev->driver)
return -EBUSY; return -EBUSY;
@ -2323,9 +2322,9 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
* VBUS IRQs should probably be ignored so that the PXA device just acts * VBUS IRQs should probably be ignored so that the PXA device just acts
* "dead" to USB hosts until system resume. * "dead" to USB hosts until system resume.
*/ */
static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state) static int pxa25x_udc_suspend(struct platform_device *dev, pm_message_t state)
{ {
struct pxa2xx_udc *udc = platform_get_drvdata(dev); struct pxa25x_udc *udc = platform_get_drvdata(dev);
unsigned long flags; unsigned long flags;
if (!udc->mach->gpio_pullup && !udc->mach->udc_command) if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
@ -2339,9 +2338,9 @@ static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
return 0; return 0;
} }
static int pxa2xx_udc_resume(struct platform_device *dev) static int pxa25x_udc_resume(struct platform_device *dev)
{ {
struct pxa2xx_udc *udc = platform_get_drvdata(dev); struct pxa25x_udc *udc = platform_get_drvdata(dev);
unsigned long flags; unsigned long flags;
udc->suspended = 0; udc->suspended = 0;
@ -2353,27 +2352,27 @@ static int pxa2xx_udc_resume(struct platform_device *dev)
} }
#else #else
#define pxa2xx_udc_suspend NULL #define pxa25x_udc_suspend NULL
#define pxa2xx_udc_resume NULL #define pxa25x_udc_resume NULL
#endif #endif
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static struct platform_driver udc_driver = { static struct platform_driver udc_driver = {
.shutdown = pxa2xx_udc_shutdown, .shutdown = pxa25x_udc_shutdown,
.remove = __exit_p(pxa2xx_udc_remove), .remove = __exit_p(pxa25x_udc_remove),
.suspend = pxa2xx_udc_suspend, .suspend = pxa25x_udc_suspend,
.resume = pxa2xx_udc_resume, .resume = pxa25x_udc_resume,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "pxa2xx-udc", .name = "pxa25x-udc",
}, },
}; };
static int __init udc_init(void) static int __init udc_init(void)
{ {
pr_info("%s: version %s\n", driver_name, DRIVER_VERSION); pr_info("%s: version %s\n", driver_name, DRIVER_VERSION);
return platform_driver_probe(&udc_driver, pxa2xx_udc_probe); return platform_driver_probe(&udc_driver, pxa25x_udc_probe);
} }
module_init(udc_init); module_init(udc_init);
@ -2386,4 +2385,4 @@ module_exit(udc_exit);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell"); MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:pxa2xx-udc"); MODULE_ALIAS("platform:pxa25x-udc");

29
drivers/usb/gadget/pxa2xx_udc.h → drivers/usb/gadget/pxa25x_udc.h
View File

@ -1,6 +1,5 @@
/* /*
* linux/drivers/usb/gadget/pxa2xx_udc.h * Intel PXA25x on-chip full speed USB device controller
* Intel PXA2xx on-chip full speed USB device controller
* *
* Copyright (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix * Copyright (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix
* Copyright (C) 2003 David Brownell * Copyright (C) 2003 David Brownell
@ -21,14 +20,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __LINUX_USB_GADGET_PXA2XX_H #ifndef __LINUX_USB_GADGET_PXA25X_H
#define __LINUX_USB_GADGET_PXA2XX_H #define __LINUX_USB_GADGET_PXA25X_H
#include <linux/types.h> #include <linux/types.h>
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* pxa2xx has this (move to include/asm-arm/arch-pxa/pxa-regs.h) */ /* pxa25x has this (move to include/asm-arm/arch-pxa/pxa-regs.h) */
#define UFNRH_SIR (1 << 7) /* SOF interrupt request */ #define UFNRH_SIR (1 << 7) /* SOF interrupt request */
#define UFNRH_SIM (1 << 6) /* SOF interrupt mask */ #define UFNRH_SIM (1 << 6) /* SOF interrupt mask */
#define UFNRH_IPE14 (1 << 5) /* ISO packet error, ep14 */ #define UFNRH_IPE14 (1 << 5) /* ISO packet error, ep14 */
@ -45,11 +44,11 @@
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
struct pxa2xx_udc; struct pxa25x_udc;
struct pxa2xx_ep { struct pxa25x_ep {
struct usb_ep ep; struct usb_ep ep;
struct pxa2xx_udc *dev; struct pxa25x_udc *dev;
const struct usb_endpoint_descriptor *desc; const struct usb_endpoint_descriptor *desc;
struct list_head queue; struct list_head queue;
@ -72,7 +71,7 @@ struct pxa2xx_ep {
volatile u32 *reg_uddr; volatile u32 *reg_uddr;
}; };
struct pxa2xx_request { struct pxa25x_request {
struct usb_request req; struct usb_request req;
struct list_head queue; struct list_head queue;
}; };
@ -98,7 +97,7 @@ struct udc_stats {
unsigned long irqs; unsigned long irqs;
}; };
#ifdef CONFIG_USB_PXA2XX_SMALL #ifdef CONFIG_USB_PXA25X_SMALL
/* when memory's tight, SMALL config saves code+data. */ /* when memory's tight, SMALL config saves code+data. */
#define PXA_UDC_NUM_ENDPOINTS 3 #define PXA_UDC_NUM_ENDPOINTS 3
#endif #endif
@ -107,7 +106,7 @@ struct udc_stats {
#define PXA_UDC_NUM_ENDPOINTS 16 #define PXA_UDC_NUM_ENDPOINTS 16
#endif #endif
struct pxa2xx_udc { struct pxa25x_udc {
struct usb_gadget gadget; struct usb_gadget gadget;
struct usb_gadget_driver *driver; struct usb_gadget_driver *driver;
@ -130,7 +129,7 @@ struct pxa2xx_udc {
struct clk *clk; struct clk *clk;
struct pxa2xx_udc_mach_info *mach; struct pxa2xx_udc_mach_info *mach;
u64 dma_mask; u64 dma_mask;
struct pxa2xx_ep ep [PXA_UDC_NUM_ENDPOINTS]; struct pxa25x_ep ep [PXA_UDC_NUM_ENDPOINTS];
#ifdef CONFIG_USB_GADGET_DEBUG_FS #ifdef CONFIG_USB_GADGET_DEBUG_FS
struct dentry *debugfs_udc; struct dentry *debugfs_udc;
@ -144,7 +143,7 @@ struct pxa2xx_udc {
/* lubbock can also report usb connect/disconnect irqs */ /* lubbock can also report usb connect/disconnect irqs */
#endif #endif
static struct pxa2xx_udc *the_controller; static struct pxa25x_udc *the_controller;
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
@ -209,7 +208,7 @@ dump_udccs0(const char *label)
} }
static void __maybe_unused static void __maybe_unused
dump_state(struct pxa2xx_udc *dev) dump_state(struct pxa25x_udc *dev)
{ {
u32 tmp; u32 tmp;
unsigned i; unsigned i;
@ -264,4 +263,4 @@ dump_state(struct pxa2xx_udc *dev)
#define INFO(stuff...) pr_info("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff)
#endif /* __LINUX_USB_GADGET_PXA2XX_H */ #endif /* __LINUX_USB_GADGET_PXA25X_H */

4
drivers/usb/gadget/pxa27x_udc.c
View File

@ -2367,11 +2367,11 @@ static int pxa_udc_resume(struct platform_device *_dev)
#endif #endif
/* work with hotplug and coldplug */ /* work with hotplug and coldplug */
MODULE_ALIAS("platform:pxa2xx-udc"); MODULE_ALIAS("platform:pxa27x-udc");
static struct platform_driver udc_driver = { static struct platform_driver udc_driver = {
.driver = { .driver = {
.name = "pxa2xx-udc", .name = "pxa27x-udc",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.remove = __exit_p(pxa_udc_remove), .remove = __exit_p(pxa_udc_remove),