Skip to content

L
linux
Commit 1f91b4cc authored by Felipe Balbi's avatar Felipe Balbi
Browse files
Options

usb: dwc2: rename all s3c_* to dwc2_* 

this driver has long ago became dwc2.ko with
both peripheral and host roles, there's no point
in keeping the old function names.
Acked-by: default avatarJohn Youn <johnyoun@synopsys.com>
Tested-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent db2be4e9
Hide whitespace changes
Inline Side-by-side
Showing with 406 additions and 406 deletions
arch/arm/mach-s3c64xx/mach-crag6410.c
View file @ 1f91b4cc
...@@ -809,7 +809,7 @@ static const struct gpio_led_platform_data gpio_leds_pdata = { ...@@ -809,7 +809,7 @@ static const struct gpio_led_platform_data gpio_leds_pdata = {
.num_leds = ARRAY_SIZE(gpio_leds), .num_leds = ARRAY_SIZE(gpio_leds),
}; };
static struct s3c_hsotg_plat crag6410_hsotg_pdata; static struct dwc2_hsotg_plat crag6410_hsotg_pdata;
static void __init crag6410_machine_init(void) static void __init crag6410_machine_init(void)
{ {
...@@ -835,7 +835,7 @@ static void __init crag6410_machine_init(void) ...@@ -835,7 +835,7 @@ static void __init crag6410_machine_init(void)
s3c_i2c0_set_platdata(&i2c0_pdata); s3c_i2c0_set_platdata(&i2c0_pdata);
s3c_i2c1_set_platdata(&i2c1_pdata); s3c_i2c1_set_platdata(&i2c1_pdata);
s3c_fb_set_platdata(&crag6410_lcd_pdata); s3c_fb_set_platdata(&crag6410_lcd_pdata);
s3c_hsotg_set_platdata(&crag6410_hsotg_pdata); dwc2_hsotg_set_platdata(&crag6410_hsotg_pdata);
i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0)); i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1)); i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
......
arch/arm/mach-s3c64xx/mach-smartq.c
View file @ 1f91b4cc
...@@ -189,7 +189,7 @@ static struct s3c_hwmon_pdata smartq_hwmon_pdata __initdata = { ...@@ -189,7 +189,7 @@ static struct s3c_hwmon_pdata smartq_hwmon_pdata __initdata = {
}, },
}; };
static struct s3c_hsotg_plat smartq_hsotg_pdata; static struct dwc2_hsotg_plat smartq_hsotg_pdata;
static int __init smartq_lcd_setup_gpio(void) static int __init smartq_lcd_setup_gpio(void)
{ {
...@@ -382,7 +382,7 @@ void __init smartq_map_io(void) ...@@ -382,7 +382,7 @@ void __init smartq_map_io(void)
void __init smartq_machine_init(void) void __init smartq_machine_init(void)
{ {
s3c_i2c0_set_platdata(NULL); s3c_i2c0_set_platdata(NULL);
s3c_hsotg_set_platdata(&smartq_hsotg_pdata); dwc2_hsotg_set_platdata(&smartq_hsotg_pdata);
s3c_hwmon_set_platdata(&smartq_hwmon_pdata); s3c_hwmon_set_platdata(&smartq_hwmon_pdata);
s3c_sdhci1_set_platdata(&smartq_internal_hsmmc_pdata); s3c_sdhci1_set_platdata(&smartq_internal_hsmmc_pdata);
s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata); s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata);
......
arch/arm/mach-s3c64xx/mach-smdk6410.c
View file @ 1f91b4cc
...@@ -628,7 +628,7 @@ static struct platform_pwm_backlight_data smdk6410_bl_data = { ...@@ -628,7 +628,7 @@ static struct platform_pwm_backlight_data smdk6410_bl_data = {
.enable_gpio = -1, .enable_gpio = -1,
}; };
static struct s3c_hsotg_plat smdk6410_hsotg_pdata; static struct dwc2_hsotg_plat smdk6410_hsotg_pdata;
static void __init smdk6410_map_io(void) static void __init smdk6410_map_io(void)
{ {
...@@ -659,7 +659,7 @@ static void __init smdk6410_machine_init(void) ...@@ -659,7 +659,7 @@ static void __init smdk6410_machine_init(void)
s3c_i2c0_set_platdata(NULL); s3c_i2c0_set_platdata(NULL);
s3c_i2c1_set_platdata(NULL); s3c_i2c1_set_platdata(NULL);
s3c_fb_set_platdata(&smdk6410_lcd_pdata); s3c_fb_set_platdata(&smdk6410_lcd_pdata);
s3c_hsotg_set_platdata(&smdk6410_hsotg_pdata); dwc2_hsotg_set_platdata(&smdk6410_hsotg_pdata);
samsung_keypad_set_platdata(&smdk6410_keypad_data); samsung_keypad_set_platdata(&smdk6410_keypad_data);
......
arch/arm/plat-samsung/devs.c
View file @ 1f91b4cc
...@@ -1042,11 +1042,11 @@ struct platform_device s3c_device_usb_hsotg = { ...@@ -1042,11 +1042,11 @@ struct platform_device s3c_device_usb_hsotg = {
}, },
}; };
void __init s3c_hsotg_set_platdata(struct s3c_hsotg_plat *pd) void __init dwc2_hsotg_set_platdata(struct dwc2_hsotg_plat *pd)
{ {
struct s3c_hsotg_plat *npd; struct dwc2_hsotg_plat *npd;
npd = s3c_set_platdata(pd, sizeof(struct s3c_hsotg_plat), npd = s3c_set_platdata(pd, sizeof(struct dwc2_hsotg_plat),
&s3c_device_usb_hsotg); &s3c_device_usb_hsotg);
if (!npd->phy_init) if (!npd->phy_init)
......
drivers/usb/dwc2/core.h
View file @ 1f91b4cc
...@@ -58,8 +58,8 @@ static inline void do_write(u32 value, void *addr) ...@@ -58,8 +58,8 @@ static inline void do_write(u32 value, void *addr)
/* Maximum number of Endpoints/HostChannels */ /* Maximum number of Endpoints/HostChannels */
#define MAX_EPS_CHANNELS 16 #define MAX_EPS_CHANNELS 16
/* s3c-hsotg declarations */ /* dwc2-hsotg declarations */
static const char * const s3c_hsotg_supply_names[] = { static const char * const dwc2_hsotg_supply_names[] = {
"vusb_d", /* digital USB supply, 1.2V */ "vusb_d", /* digital USB supply, 1.2V */
"vusb_a", /* analog USB supply, 1.1V */ "vusb_a", /* analog USB supply, 1.1V */
}; };
...@@ -85,10 +85,10 @@ static const char * const s3c_hsotg_supply_names[] = { ...@@ -85,10 +85,10 @@ static const char * const s3c_hsotg_supply_names[] = {
#define EP0_MPS_LIMIT 64 #define EP0_MPS_LIMIT 64
struct dwc2_hsotg; struct dwc2_hsotg;
struct s3c_hsotg_req; struct dwc2_hsotg_req;
/** /**
* struct s3c_hsotg_ep - driver endpoint definition. * struct dwc2_hsotg_ep - driver endpoint definition.
* @ep: The gadget layer representation of the endpoint. * @ep: The gadget layer representation of the endpoint.
* @name: The driver generated name for the endpoint. * @name: The driver generated name for the endpoint.
* @queue: Queue of requests for this endpoint. * @queue: Queue of requests for this endpoint.
...@@ -127,11 +127,11 @@ struct s3c_hsotg_req; ...@@ -127,11 +127,11 @@ struct s3c_hsotg_req;
* as in shared-fifo mode periodic in acts like a single-frame packet * as in shared-fifo mode periodic in acts like a single-frame packet
* buffer than a fifo) * buffer than a fifo)
*/ */
struct s3c_hsotg_ep { struct dwc2_hsotg_ep {
struct usb_ep ep; struct usb_ep ep;
struct list_head queue; struct list_head queue;
struct dwc2_hsotg *parent; struct dwc2_hsotg *parent;
struct s3c_hsotg_req *req; struct dwc2_hsotg_req *req;
struct dentry *debugfs; struct dentry *debugfs;
unsigned long total_data; unsigned long total_data;
...@@ -155,12 +155,12 @@ struct s3c_hsotg_ep { ...@@ -155,12 +155,12 @@ struct s3c_hsotg_ep {
}; };
/** /**
* struct s3c_hsotg_req - data transfer request * struct dwc2_hsotg_req - data transfer request
* @req: The USB gadget request * @req: The USB gadget request
* @queue: The list of requests for the endpoint this is queued for. * @queue: The list of requests for the endpoint this is queued for.
* @saved_req_buf: variable to save req.buf when bounce buffers are used. * @saved_req_buf: variable to save req.buf when bounce buffers are used.
*/ */
struct s3c_hsotg_req { struct dwc2_hsotg_req {
struct usb_request req; struct usb_request req;
struct list_head queue; struct list_head queue;
void *saved_req_buf; void *saved_req_buf;
...@@ -693,7 +693,7 @@ struct dwc2_hsotg { ...@@ -693,7 +693,7 @@ struct dwc2_hsotg {
struct phy *phy; struct phy *phy;
struct usb_phy *uphy; struct usb_phy *uphy;
struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsotg_supply_names)]; struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)];
spinlock_t lock; spinlock_t lock;
struct mutex init_mutex; struct mutex init_mutex;
...@@ -796,7 +796,7 @@ struct dwc2_hsotg { ...@@ -796,7 +796,7 @@ struct dwc2_hsotg {
#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE) #if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
/* Gadget structures */ /* Gadget structures */
struct usb_gadget_driver *driver; struct usb_gadget_driver *driver;
struct s3c_hsotg_plat *plat; struct dwc2_hsotg_plat *plat;
u32 phyif; u32 phyif;
int fifo_mem; int fifo_mem;
...@@ -815,8 +815,8 @@ struct dwc2_hsotg { ...@@ -815,8 +815,8 @@ struct dwc2_hsotg {
unsigned int enabled:1; unsigned int enabled:1;
unsigned int connected:1; unsigned int connected:1;
unsigned long last_rst; unsigned long last_rst;
struct s3c_hsotg_ep *eps_in[MAX_EPS_CHANNELS]; struct dwc2_hsotg_ep *eps_in[MAX_EPS_CHANNELS];
struct s3c_hsotg_ep *eps_out[MAX_EPS_CHANNELS]; struct dwc2_hsotg_ep *eps_out[MAX_EPS_CHANNELS];
u32 g_using_dma; u32 g_using_dma;
u32 g_rx_fifo_sz; u32 g_rx_fifo_sz;
u32 g_np_g_tx_fifo_sz; u32 g_np_g_tx_fifo_sz;
...@@ -1104,30 +1104,30 @@ extern u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg); ...@@ -1104,30 +1104,30 @@ extern u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg);
/* Gadget defines */ /* Gadget defines */
#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE) #if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
extern int s3c_hsotg_remove(struct dwc2_hsotg *hsotg); extern int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg);
extern int s3c_hsotg_suspend(struct dwc2_hsotg *dwc2); extern int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2);
extern int s3c_hsotg_resume(struct dwc2_hsotg *dwc2); extern int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2);
extern int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq); extern int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq);
extern void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2, extern void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
bool reset); bool reset);
extern void s3c_hsotg_core_connect(struct dwc2_hsotg *hsotg); extern void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg);
extern void s3c_hsotg_disconnect(struct dwc2_hsotg *dwc2); extern void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2);
extern int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode); extern int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode);
#define dwc2_is_device_connected(hsotg) (hsotg->connected) #define dwc2_is_device_connected(hsotg) (hsotg->connected)
#else #else
static inline int s3c_hsotg_remove(struct dwc2_hsotg *dwc2) static inline int dwc2_hsotg_remove(struct dwc2_hsotg *dwc2)
{ return 0; } { return 0; }
static inline int s3c_hsotg_suspend(struct dwc2_hsotg *dwc2) static inline int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2)
{ return 0; } { return 0; }
static inline int s3c_hsotg_resume(struct dwc2_hsotg *dwc2) static inline int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2)
{ return 0; } { return 0; }
static inline int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) static inline int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
{ return 0; } { return 0; }
static inline void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2, static inline void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
bool reset) {} bool reset) {}
static inline void s3c_hsotg_core_connect(struct dwc2_hsotg *hsotg) {} static inline void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg) {}
static inline void s3c_hsotg_disconnect(struct dwc2_hsotg *dwc2) {} static inline void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2) {}
static inline int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, static inline int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg,
int testmode) int testmode)
{ return 0; } { return 0; }
#define dwc2_is_device_connected(hsotg) (0) #define dwc2_is_device_connected(hsotg) (0)
......
drivers/usb/dwc2/core_intr.c
View file @ 1f91b4cc
...@@ -129,7 +129,7 @@ static void dwc2_handle_otg_intr(struct dwc2_hsotg *hsotg) ...@@ -129,7 +129,7 @@ static void dwc2_handle_otg_intr(struct dwc2_hsotg *hsotg)
gotgctl = readl(hsotg->regs + GOTGCTL); gotgctl = readl(hsotg->regs + GOTGCTL);
if (dwc2_is_device_mode(hsotg)) if (dwc2_is_device_mode(hsotg))
s3c_hsotg_disconnect(hsotg); dwc2_hsotg_disconnect(hsotg);
if (hsotg->op_state == OTG_STATE_B_HOST) { if (hsotg->op_state == OTG_STATE_B_HOST) {
hsotg->op_state = OTG_STATE_B_PERIPHERAL; hsotg->op_state = OTG_STATE_B_PERIPHERAL;
...@@ -322,7 +322,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) ...@@ -322,7 +322,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg)
* Report disconnect if there is any previous session established * Report disconnect if there is any previous session established
*/ */
if (dwc2_is_device_mode(hsotg)) if (dwc2_is_device_mode(hsotg))
s3c_hsotg_disconnect(hsotg); dwc2_hsotg_disconnect(hsotg);
} }
/* /*
......
drivers/usb/dwc2/debugfs.c
View file @ 1f91b4cc
...@@ -57,7 +57,7 @@ static ssize_t testmode_write(struct file *file, const char __user *ubuf, size_t ...@@ -57,7 +57,7 @@ static ssize_t testmode_write(struct file *file, const char __user *ubuf, size_t
testmode = 0; testmode = 0;
spin_lock_irqsave(&hsotg->lock, flags); spin_lock_irqsave(&hsotg->lock, flags);
s3c_hsotg_set_test_mode(hsotg, testmode); dwc2_hsotg_set_test_mode(hsotg, testmode);
spin_unlock_irqrestore(&hsotg->lock, flags); spin_unlock_irqrestore(&hsotg->lock, flags);
return count; return count;
} }
...@@ -256,9 +256,9 @@ static const char *decode_direction(int is_in) ...@@ -256,9 +256,9 @@ static const char *decode_direction(int is_in)
*/ */
static int ep_show(struct seq_file *seq, void *v) static int ep_show(struct seq_file *seq, void *v)
{ {
struct s3c_hsotg_ep *ep = seq->private; struct dwc2_hsotg_ep *ep = seq->private;
struct dwc2_hsotg *hsotg = ep->parent; struct dwc2_hsotg *hsotg = ep->parent;
struct s3c_hsotg_req *req; struct dwc2_hsotg_req *req;
void __iomem *regs = hsotg->regs; void __iomem *regs = hsotg->regs;
int index = ep->index; int index = ep->index;
int show_limit = 15; int show_limit = 15;
...@@ -326,7 +326,7 @@ static const struct file_operations ep_fops = { ...@@ -326,7 +326,7 @@ static const struct file_operations ep_fops = {
}; };
/** /**
* s3c_hsotg_create_debug - create debugfs directory and files * dwc2_hsotg_create_debug - create debugfs directory and files
* @hsotg: The driver state * @hsotg: The driver state
* *
* Create the debugfs files to allow the user to get information * Create the debugfs files to allow the user to get information
...@@ -334,7 +334,7 @@ static const struct file_operations ep_fops = { ...@@ -334,7 +334,7 @@ static const struct file_operations ep_fops = {
* with the same name as the device itself, in case we end up * with the same name as the device itself, in case we end up
* with multiple blocks in future systems. * with multiple blocks in future systems.
*/ */
static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg)
{ {
struct dentry *root; struct dentry *root;
struct dentry *file; struct dentry *file;
...@@ -360,7 +360,7 @@ static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg) ...@@ -360,7 +360,7 @@ static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg)
/* Create one file for each out endpoint */ /* Create one file for each out endpoint */
for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) { for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) {
struct s3c_hsotg_ep *ep; struct dwc2_hsotg_ep *ep;
ep = hsotg->eps_out[epidx]; ep = hsotg->eps_out[epidx];
if (ep) { if (ep) {
...@@ -373,7 +373,7 @@ static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg) ...@@ -373,7 +373,7 @@ static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg)
} }
/* Create one file for each in endpoint. EP0 is handled with out eps */ /* Create one file for each in endpoint. EP0 is handled with out eps */
for (epidx = 1; epidx < hsotg->num_of_eps; epidx++) { for (epidx = 1; epidx < hsotg->num_of_eps; epidx++) {
struct s3c_hsotg_ep *ep; struct dwc2_hsotg_ep *ep;
ep = hsotg->eps_in[epidx]; ep = hsotg->eps_in[epidx];
if (ep) { if (ep) {
...@@ -386,10 +386,10 @@ static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg) ...@@ -386,10 +386,10 @@ static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg)
} }
} }
#else #else
static inline void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg) {} static inline void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg) {}
#endif #endif
/* s3c_hsotg_delete_debug is removed as cleanup in done in dwc2_debugfs_exit */ /* dwc2_hsotg_delete_debug is removed as cleanup in done in dwc2_debugfs_exit */
#define dump_register(nm) \ #define dump_register(nm) \
{ \ { \
...@@ -737,7 +737,7 @@ int dwc2_debugfs_init(struct dwc2_hsotg *hsotg) ...@@ -737,7 +737,7 @@ int dwc2_debugfs_init(struct dwc2_hsotg *hsotg)
} }
/* Add gadget debugfs nodes */ /* Add gadget debugfs nodes */
s3c_hsotg_create_debug(hsotg); dwc2_hsotg_create_debug(hsotg);
hsotg->regset = devm_kzalloc(hsotg->dev, sizeof(*hsotg->regset), hsotg->regset = devm_kzalloc(hsotg->dev, sizeof(*hsotg->regset),
GFP_KERNEL); GFP_KERNEL);
......
drivers/usb/dwc2/gadget.c
View file @ 1f91b4cc
...@@ -39,14 +39,14 @@ ...@@ -39,14 +39,14 @@
#include "hw.h" #include "hw.h"
/* conversion functions */ /* conversion functions */
static inline struct s3c_hsotg_req *our_req(struct usb_request *req) static inline struct dwc2_hsotg_req *our_req(struct usb_request *req)
{ {
return container_of(req, struct s3c_hsotg_req, req); return container_of(req, struct dwc2_hsotg_req, req);
} }
static inline struct s3c_hsotg_ep *our_ep(struct usb_ep *ep) static inline struct dwc2_hsotg_ep *our_ep(struct usb_ep *ep)
{ {
return container_of(ep, struct s3c_hsotg_ep, ep); return container_of(ep, struct dwc2_hsotg_ep, ep);
} }
static inline struct dwc2_hsotg *to_hsotg(struct usb_gadget *gadget) static inline struct dwc2_hsotg *to_hsotg(struct usb_gadget *gadget)
...@@ -64,7 +64,7 @@ static inline void __bic32(void __iomem *ptr, u32 val) ...@@ -64,7 +64,7 @@ static inline void __bic32(void __iomem *ptr, u32 val)
writel(readl(ptr) & ~val, ptr); writel(readl(ptr) & ~val, ptr);
} }
static inline struct s3c_hsotg_ep *index_to_ep(struct dwc2_hsotg *hsotg, static inline struct dwc2_hsotg_ep *index_to_ep(struct dwc2_hsotg *hsotg,
u32 ep_index, u32 dir_in) u32 ep_index, u32 dir_in)
{ {
if (dir_in) if (dir_in)
...@@ -74,7 +74,7 @@ static inline struct s3c_hsotg_ep *index_to_ep(struct dwc2_hsotg *hsotg, ...@@ -74,7 +74,7 @@ static inline struct s3c_hsotg_ep *index_to_ep(struct dwc2_hsotg *hsotg,
} }
/* forward declaration of functions */ /* forward declaration of functions */
static void s3c_hsotg_dump(struct dwc2_hsotg *hsotg); static void dwc2_hsotg_dump(struct dwc2_hsotg *hsotg);
/** /**
* using_dma - return the DMA status of the driver. * using_dma - return the DMA status of the driver.
...@@ -101,11 +101,11 @@ static inline bool using_dma(struct dwc2_hsotg *hsotg) ...@@ -101,11 +101,11 @@ static inline bool using_dma(struct dwc2_hsotg *hsotg)
} }
/** /**
* s3c_hsotg_en_gsint - enable one or more of the general interrupt * dwc2_hsotg_en_gsint - enable one or more of the general interrupt
* @hsotg: The device state * @hsotg: The device state
* @ints: A bitmask of the interrupts to enable * @ints: A bitmask of the interrupts to enable
*/ */
static void s3c_hsotg_en_gsint(struct dwc2_hsotg *hsotg, u32 ints) static void dwc2_hsotg_en_gsint(struct dwc2_hsotg *hsotg, u32 ints)
{ {
u32 gsintmsk = readl(hsotg->regs + GINTMSK); u32 gsintmsk = readl(hsotg->regs + GINTMSK);
u32 new_gsintmsk; u32 new_gsintmsk;
...@@ -119,11 +119,11 @@ static void s3c_hsotg_en_gsint(struct dwc2_hsotg *hsotg, u32 ints) ...@@ -119,11 +119,11 @@ static void s3c_hsotg_en_gsint(struct dwc2_hsotg *hsotg, u32 ints)
} }
/** /**
* s3c_hsotg_disable_gsint - disable one or more of the general interrupt * dwc2_hsotg_disable_gsint - disable one or more of the general interrupt
* @hsotg: The device state * @hsotg: The device state
* @ints: A bitmask of the interrupts to enable * @ints: A bitmask of the interrupts to enable
*/ */
static void s3c_hsotg_disable_gsint(struct dwc2_hsotg *hsotg, u32 ints) static void dwc2_hsotg_disable_gsint(struct dwc2_hsotg *hsotg, u32 ints)
{ {
u32 gsintmsk = readl(hsotg->regs + GINTMSK); u32 gsintmsk = readl(hsotg->regs + GINTMSK);
u32 new_gsintmsk; u32 new_gsintmsk;
...@@ -135,7 +135,7 @@ static void s3c_hsotg_disable_gsint(struct dwc2_hsotg *hsotg, u32 ints) ...@@ -135,7 +135,7 @@ static void s3c_hsotg_disable_gsint(struct dwc2_hsotg *hsotg, u32 ints)
} }
/** /**
* s3c_hsotg_ctrl_epint - enable/disable an endpoint irq * dwc2_hsotg_ctrl_epint - enable/disable an endpoint irq
* @hsotg: The device state * @hsotg: The device state
* @ep: The endpoint index * @ep: The endpoint index
* @dir_in: True if direction is in. * @dir_in: True if direction is in.
...@@ -144,7 +144,7 @@ static void s3c_hsotg_disable_gsint(struct dwc2_hsotg *hsotg, u32 ints) ...@@ -144,7 +144,7 @@ static void s3c_hsotg_disable_gsint(struct dwc2_hsotg *hsotg, u32 ints)
* Set or clear the mask for an individual endpoint's interrupt * Set or clear the mask for an individual endpoint's interrupt
* request. * request.
*/ */
static void s3c_hsotg_ctrl_epint(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_ctrl_epint(struct dwc2_hsotg *hsotg,
unsigned int ep, unsigned int dir_in, unsigned int ep, unsigned int dir_in,
unsigned int en) unsigned int en)
{ {
...@@ -166,10 +166,10 @@ static void s3c_hsotg_ctrl_epint(struct dwc2_hsotg *hsotg, ...@@ -166,10 +166,10 @@ static void s3c_hsotg_ctrl_epint(struct dwc2_hsotg *hsotg,
} }
/** /**
* s3c_hsotg_init_fifo - initialise non-periodic FIFOs * dwc2_hsotg_init_fifo - initialise non-periodic FIFOs
* @hsotg: The device instance. * @hsotg: The device instance.
*/ */
static void s3c_hsotg_init_fifo(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
{ {
unsigned int ep; unsigned int ep;
unsigned int addr; unsigned int addr;
...@@ -248,12 +248,12 @@ static void s3c_hsotg_init_fifo(struct dwc2_hsotg *hsotg) ...@@ -248,12 +248,12 @@ static void s3c_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
* *
* Allocate a new USB request structure appropriate for the specified endpoint * Allocate a new USB request structure appropriate for the specified endpoint
*/ */
static struct usb_request *s3c_hsotg_ep_alloc_request(struct usb_ep *ep, static struct usb_request *dwc2_hsotg_ep_alloc_request(struct usb_ep *ep,
gfp_t flags) gfp_t flags)
{ {
struct s3c_hsotg_req *req; struct dwc2_hsotg_req *req;
req = kzalloc(sizeof(struct s3c_hsotg_req), flags); req = kzalloc(sizeof(struct dwc2_hsotg_req), flags);
if (!req) if (!req)
return NULL; return NULL;
...@@ -269,23 +269,23 @@ static struct usb_request *s3c_hsotg_ep_alloc_request(struct usb_ep *ep, ...@@ -269,23 +269,23 @@ static struct usb_request *s3c_hsotg_ep_alloc_request(struct usb_ep *ep,
* Returns true if the endpoint is in periodic mode, meaning it is being * Returns true if the endpoint is in periodic mode, meaning it is being
* used for an Interrupt or ISO transfer. * used for an Interrupt or ISO transfer.
*/ */
static inline int is_ep_periodic(struct s3c_hsotg_ep *hs_ep) static inline int is_ep_periodic(struct dwc2_hsotg_ep *hs_ep)
{ {
return hs_ep->periodic; return hs_ep->periodic;
} }
/** /**
* s3c_hsotg_unmap_dma - unmap the DMA memory being used for the request * dwc2_hsotg_unmap_dma - unmap the DMA memory being used for the request
* @hsotg: The device state. * @hsotg: The device state.
* @hs_ep: The endpoint for the request * @hs_ep: The endpoint for the request
* @hs_req: The request being processed. * @hs_req: The request being processed.
* *
* This is the reverse of s3c_hsotg_map_dma(), called for the completion * This is the reverse of dwc2_hsotg_map_dma(), called for the completion
* of a request to ensure the buffer is ready for access by the caller. * of a request to ensure the buffer is ready for access by the caller.
*/ */
static void s3c_hsotg_unmap_dma(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_unmap_dma(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep, struct dwc2_hsotg_ep *hs_ep,
struct s3c_hsotg_req *hs_req) struct dwc2_hsotg_req *hs_req)
{ {
struct usb_request *req = &hs_req->req; struct usb_request *req = &hs_req->req;
...@@ -297,7 +297,7 @@ static void s3c_hsotg_unmap_dma(struct dwc2_hsotg *hsotg, ...@@ -297,7 +297,7 @@ static void s3c_hsotg_unmap_dma(struct dwc2_hsotg *hsotg,
} }
/** /**
* s3c_hsotg_write_fifo - write packet Data to the TxFIFO * dwc2_hsotg_write_fifo - write packet Data to the TxFIFO
* @hsotg: The controller state. * @hsotg: The controller state.
* @hs_ep: The endpoint we're going to write for. * @hs_ep: The endpoint we're going to write for.
* @hs_req: The request to write data for. * @hs_req: The request to write data for.
...@@ -312,9 +312,9 @@ static void s3c_hsotg_unmap_dma(struct dwc2_hsotg *hsotg, ...@@ -312,9 +312,9 @@ static void s3c_hsotg_unmap_dma(struct dwc2_hsotg *hsotg,
* *
* This routine is only needed for PIO * This routine is only needed for PIO
*/ */
static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg, static int dwc2_hsotg_write_fifo(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep, struct dwc2_hsotg_ep *hs_ep,
struct s3c_hsotg_req *hs_req) struct dwc2_hsotg_req *hs_req)
{ {
bool periodic = is_ep_periodic(hs_ep); bool periodic = is_ep_periodic(hs_ep);
u32 gnptxsts = readl(hsotg->regs + GNPTXSTS); u32 gnptxsts = readl(hsotg->regs + GNPTXSTS);
...@@ -348,7 +348,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg, ...@@ -348,7 +348,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg,
* previous data has been completely sent. * previous data has been completely sent.
*/ */
if (hs_ep->fifo_load != 0) { if (hs_ep->fifo_load != 0) {
s3c_hsotg_en_gsint(hsotg, GINTSTS_PTXFEMP); dwc2_hsotg_en_gsint(hsotg, GINTSTS_PTXFEMP);
return -ENOSPC; return -ENOSPC;
} }
...@@ -369,7 +369,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg, ...@@ -369,7 +369,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg,
__func__, can_write); __func__, can_write);
if (can_write <= 0) { if (can_write <= 0) {
s3c_hsotg_en_gsint(hsotg, GINTSTS_PTXFEMP); dwc2_hsotg_en_gsint(hsotg, GINTSTS_PTXFEMP);
return -ENOSPC; return -ENOSPC;
} }
} else if (hsotg->dedicated_fifos && hs_ep->index != 0) { } else if (hsotg->dedicated_fifos && hs_ep->index != 0) {
...@@ -383,7 +383,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg, ...@@ -383,7 +383,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg,
"%s: no queue slots available (0x%08x)\n", "%s: no queue slots available (0x%08x)\n",
__func__, gnptxsts); __func__, gnptxsts);
s3c_hsotg_en_gsint(hsotg, GINTSTS_NPTXFEMP); dwc2_hsotg_en_gsint(hsotg, GINTSTS_NPTXFEMP);
return -ENOSPC; return -ENOSPC;
} }
...@@ -414,7 +414,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg, ...@@ -414,7 +414,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg,
/* it's needed only when we do not use dedicated fifos */ /* it's needed only when we do not use dedicated fifos */
if (!hsotg->dedicated_fifos) if (!hsotg->dedicated_fifos)
s3c_hsotg_en_gsint(hsotg, dwc2_hsotg_en_gsint(hsotg,
periodic ? GINTSTS_PTXFEMP : periodic ? GINTSTS_PTXFEMP :
GINTSTS_NPTXFEMP); GINTSTS_NPTXFEMP);
} }
...@@ -443,7 +443,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg, ...@@ -443,7 +443,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg,
/* it's needed only when we do not use dedicated fifos */ /* it's needed only when we do not use dedicated fifos */
if (!hsotg->dedicated_fifos) if (!hsotg->dedicated_fifos)
s3c_hsotg_en_gsint(hsotg, dwc2_hsotg_en_gsint(hsotg,
periodic ? GINTSTS_PTXFEMP : periodic ? GINTSTS_PTXFEMP :
GINTSTS_NPTXFEMP); GINTSTS_NPTXFEMP);
} }
...@@ -475,7 +475,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg, ...@@ -475,7 +475,7 @@ static int s3c_hsotg_write_fifo(struct dwc2_hsotg *hsotg,
* Return the maximum data that can be queued in one go on a given endpoint * Return the maximum data that can be queued in one go on a given endpoint
* so that transfers that are too long can be split. * so that transfers that are too long can be split.
*/ */
static unsigned get_ep_limit(struct s3c_hsotg_ep *hs_ep) static unsigned get_ep_limit(struct dwc2_hsotg_ep *hs_ep)
{ {
int index = hs_ep->index; int index = hs_ep->index;
unsigned maxsize; unsigned maxsize;
...@@ -508,7 +508,7 @@ static unsigned get_ep_limit(struct s3c_hsotg_ep *hs_ep) ...@@ -508,7 +508,7 @@ static unsigned get_ep_limit(struct s3c_hsotg_ep *hs_ep)
} }
/** /**
* s3c_hsotg_start_req - start a USB request from an endpoint's queue * dwc2_hsotg_start_req - start a USB request from an endpoint's queue
* @hsotg: The controller state. * @hsotg: The controller state.
* @hs_ep: The endpoint to process a request for * @hs_ep: The endpoint to process a request for
* @hs_req: The request to start. * @hs_req: The request to start.
...@@ -517,9 +517,9 @@ static unsigned get_ep_limit(struct s3c_hsotg_ep *hs_ep) ...@@ -517,9 +517,9 @@ static unsigned get_ep_limit(struct s3c_hsotg_ep *hs_ep)
* Start the given request running by setting the endpoint registers * Start the given request running by setting the endpoint registers
* appropriately, and writing any data to the FIFOs. * appropriately, and writing any data to the FIFOs.
*/ */
static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep, struct dwc2_hsotg_ep *hs_ep,
struct s3c_hsotg_req *hs_req, struct dwc2_hsotg_req *hs_req,
bool continuing) bool continuing)
{ {
struct usb_request *ureq = &hs_req->req; struct usb_request *ureq = &hs_req->req;
...@@ -625,7 +625,7 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg, ...@@ -625,7 +625,7 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg,
/* /*
* write DMA address to control register, buffer already * write DMA address to control register, buffer already
* synced by s3c_hsotg_ep_queue(). * synced by dwc2_hsotg_ep_queue().
*/ */
dma_reg = dir_in ? DIEPDMA(index) : DOEPDMA(index); dma_reg = dir_in ? DIEPDMA(index) : DOEPDMA(index);
...@@ -659,7 +659,7 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg, ...@@ -659,7 +659,7 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg,
/* set these anyway, we may need them for non-periodic in */ /* set these anyway, we may need them for non-periodic in */
hs_ep->fifo_load = 0; hs_ep->fifo_load = 0;
s3c_hsotg_write_fifo(hsotg, hs_ep, hs_req); dwc2_hsotg_write_fifo(hsotg, hs_ep, hs_req);
} }
/* /*
...@@ -685,11 +685,11 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg, ...@@ -685,11 +685,11 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg,
__func__, readl(hsotg->regs + epctrl_reg)); __func__, readl(hsotg->regs + epctrl_reg));
/* enable ep interrupts */ /* enable ep interrupts */
s3c_hsotg_ctrl_epint(hsotg, hs_ep->index, hs_ep->dir_in, 1); dwc2_hsotg_ctrl_epint(hsotg, hs_ep->index, hs_ep->dir_in, 1);
} }
/** /**
* s3c_hsotg_map_dma - map the DMA memory being used for the request * dwc2_hsotg_map_dma - map the DMA memory being used for the request
* @hsotg: The device state. * @hsotg: The device state.
* @hs_ep: The endpoint the request is on. * @hs_ep: The endpoint the request is on.
* @req: The request being processed. * @req: The request being processed.
...@@ -700,11 +700,11 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg, ...@@ -700,11 +700,11 @@ static void s3c_hsotg_start_req(struct dwc2_hsotg *hsotg,
* DMA memory, then we map the memory and mark our request to allow us to * DMA memory, then we map the memory and mark our request to allow us to
* cleanup on completion. * cleanup on completion.
*/ */
static int s3c_hsotg_map_dma(struct dwc2_hsotg *hsotg, static int dwc2_hsotg_map_dma(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep, struct dwc2_hsotg_ep *hs_ep,
struct usb_request *req) struct usb_request *req)
{ {
struct s3c_hsotg_req *hs_req = our_req(req); struct dwc2_hsotg_req *hs_req = our_req(req);
int ret; int ret;
/* if the length is zero, ignore the DMA data */ /* if the length is zero, ignore the DMA data */
...@@ -724,8 +724,8 @@ static int s3c_hsotg_map_dma(struct dwc2_hsotg *hsotg, ...@@ -724,8 +724,8 @@ static int s3c_hsotg_map_dma(struct dwc2_hsotg *hsotg,
return -EIO; return -EIO;
} }
static int s3c_hsotg_handle_unaligned_buf_start(struct dwc2_hsotg *hsotg, static int dwc2_hsotg_handle_unaligned_buf_start(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep, struct s3c_hsotg_req *hs_req) struct dwc2_hsotg_ep *hs_ep, struct dwc2_hsotg_req *hs_req)
{ {
void *req_buf = hs_req->req.buf; void *req_buf = hs_req->req.buf;
...@@ -755,8 +755,8 @@ static int s3c_hsotg_handle_unaligned_buf_start(struct dwc2_hsotg *hsotg, ...@@ -755,8 +755,8 @@ static int s3c_hsotg_handle_unaligned_buf_start(struct dwc2_hsotg *hsotg,
return 0; return 0;
} }
static void s3c_hsotg_handle_unaligned_buf_complete(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_handle_unaligned_buf_complete(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep, struct s3c_hsotg_req *hs_req) struct dwc2_hsotg_ep *hs_ep, struct dwc2_hsotg_req *hs_req)
{ {
/* If dma is not being used or buffer was aligned */ /* If dma is not being used or buffer was aligned */
if (!using_dma(hsotg) || !hs_req->saved_req_buf) if (!using_dma(hsotg) || !hs_req->saved_req_buf)
...@@ -777,11 +777,11 @@ static void s3c_hsotg_handle_unaligned_buf_complete(struct dwc2_hsotg *hsotg, ...@@ -777,11 +777,11 @@ static void s3c_hsotg_handle_unaligned_buf_complete(struct dwc2_hsotg *hsotg,
hs_req->saved_req_buf = NULL; hs_req->saved_req_buf = NULL;
} }
static int s3c_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req,
gfp_t gfp_flags) gfp_t gfp_flags)
{ {
struct s3c_hsotg_req *hs_req = our_req(req); struct dwc2_hsotg_req *hs_req = our_req(req);
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hs = hs_ep->parent; struct dwc2_hsotg *hs = hs_ep->parent;
bool first; bool first;
int ret; int ret;
...@@ -802,13 +802,13 @@ static int s3c_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, ...@@ -802,13 +802,13 @@ static int s3c_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req,
req->actual = 0; req->actual = 0;
req->status = -EINPROGRESS; req->status = -EINPROGRESS;
ret = s3c_hsotg_handle_unaligned_buf_start(hs, hs_ep, hs_req); ret = dwc2_hsotg_handle_unaligned_buf_start(hs, hs_ep, hs_req);
if (ret) if (ret)
return ret; return ret;
/* if we're using DMA, sync the buffers as necessary */ /* if we're using DMA, sync the buffers as necessary */
if (using_dma(hs)) { if (using_dma(hs)) {
ret = s3c_hsotg_map_dma(hs, hs_ep, req); ret = dwc2_hsotg_map_dma(hs, hs_ep, req);
if (ret) if (ret)
return ret; return ret;
} }
...@@ -817,51 +817,51 @@ static int s3c_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, ...@@ -817,51 +817,51 @@ static int s3c_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req,
list_add_tail(&hs_req->queue, &hs_ep->queue); list_add_tail(&hs_req->queue, &hs_ep->queue);
if (first) if (first)
s3c_hsotg_start_req(hs, hs_ep, hs_req, false); dwc2_hsotg_start_req(hs, hs_ep, hs_req, false);
return 0; return 0;
} }
static int s3c_hsotg_ep_queue_lock(struct usb_ep *ep, struct usb_request *req, static int dwc2_hsotg_ep_queue_lock(struct usb_ep *ep, struct usb_request *req,
gfp_t gfp_flags) gfp_t gfp_flags)
{ {
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hs = hs_ep->parent; struct dwc2_hsotg *hs = hs_ep->parent;
unsigned long flags = 0; unsigned long flags = 0;
int ret = 0; int ret = 0;
spin_lock_irqsave(&hs->lock, flags); spin_lock_irqsave(&hs->lock, flags);
ret = s3c_hsotg_ep_queue(ep, req, gfp_flags); ret = dwc2_hsotg_ep_queue(ep, req, gfp_flags);
spin_unlock_irqrestore(&hs->lock, flags); spin_unlock_irqrestore(&hs->lock, flags);
return ret; return ret;
} }
static void s3c_hsotg_ep_free_request(struct usb_ep *ep, static void dwc2_hsotg_ep_free_request(struct usb_ep *ep,
struct usb_request *req) struct usb_request *req)
{ {
struct s3c_hsotg_req *hs_req = our_req(req); struct dwc2_hsotg_req *hs_req = our_req(req);
kfree(hs_req); kfree(hs_req);
} }
/** /**
* s3c_hsotg_complete_oursetup - setup completion callback * dwc2_hsotg_complete_oursetup - setup completion callback
* @ep: The endpoint the request was on. * @ep: The endpoint the request was on.
* @req: The request completed. * @req: The request completed.
* *
* Called on completion of any requests the driver itself * Called on completion of any requests the driver itself
* submitted that need cleaning up. * submitted that need cleaning up.
*/ */
static void s3c_hsotg_complete_oursetup(struct usb_ep *ep, static void dwc2_hsotg_complete_oursetup(struct usb_ep *ep,
struct usb_request *req) struct usb_request *req)
{ {
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hsotg = hs_ep->parent; struct dwc2_hsotg *hsotg = hs_ep->parent;
dev_dbg(hsotg->dev, "%s: ep %p, req %p\n", __func__, ep, req); dev_dbg(hsotg->dev, "%s: ep %p, req %p\n", __func__, ep, req);
s3c_hsotg_ep_free_request(ep, req); dwc2_hsotg_ep_free_request(ep, req);
} }
/** /**
...@@ -872,10 +872,10 @@ static void s3c_hsotg_complete_oursetup(struct usb_ep *ep, ...@@ -872,10 +872,10 @@ static void s3c_hsotg_complete_oursetup(struct usb_ep *ep,
* Convert the given wIndex into a pointer to an driver endpoint * Convert the given wIndex into a pointer to an driver endpoint
* structure, or return NULL if it is not a valid endpoint. * structure, or return NULL if it is not a valid endpoint.
*/ */
static struct s3c_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg, static struct dwc2_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg,
u32 windex) u32 windex)
{ {
struct s3c_hsotg_ep *ep; struct dwc2_hsotg_ep *ep;
int dir = (windex & USB_DIR_IN) ? 1 : 0; int dir = (windex & USB_DIR_IN) ? 1 : 0;
int idx = windex & 0x7F; int idx = windex & 0x7F;
...@@ -894,12 +894,12 @@ static struct s3c_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg, ...@@ -894,12 +894,12 @@ static struct s3c_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg,
} }
/** /**
* s3c_hsotg_set_test_mode - Enable usb Test Modes * dwc2_hsotg_set_test_mode - Enable usb Test Modes
* @hsotg: The driver state. * @hsotg: The driver state.
* @testmode: requested usb test mode * @testmode: requested usb test mode
* Enable usb Test Mode requested by the Host. * Enable usb Test Mode requested by the Host.
*/ */
int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode) int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode)
{ {
int dctl = readl(hsotg->regs + DCTL); int dctl = readl(hsotg->regs + DCTL);
...@@ -920,7 +920,7 @@ int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode) ...@@ -920,7 +920,7 @@ int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode)
} }
/** /**
* s3c_hsotg_send_reply - send reply to control request * dwc2_hsotg_send_reply - send reply to control request
* @hsotg: The device state * @hsotg: The device state
* @ep: Endpoint 0 * @ep: Endpoint 0
* @buff: Buffer for request * @buff: Buffer for request
...@@ -929,8 +929,8 @@ int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode) ...@@ -929,8 +929,8 @@ int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode)
* Create a request and queue it on the given endpoint. This is useful as * Create a request and queue it on the given endpoint. This is useful as
* an internal method of sending replies to certain control requests, etc. * an internal method of sending replies to certain control requests, etc.
*/ */
static int s3c_hsotg_send_reply(struct dwc2_hsotg *hsotg, static int dwc2_hsotg_send_reply(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *ep, struct dwc2_hsotg_ep *ep,
void *buff, void *buff,
int length) int length)
{ {
...@@ -939,7 +939,7 @@ static int s3c_hsotg_send_reply(struct dwc2_hsotg *hsotg, ...@@ -939,7 +939,7 @@ static int s3c_hsotg_send_reply(struct dwc2_hsotg *hsotg,
dev_dbg(hsotg->dev, "%s: buff %p, len %d\n", __func__, buff, length); dev_dbg(hsotg->dev, "%s: buff %p, len %d\n", __func__, buff, length);
req = s3c_hsotg_ep_alloc_request(&ep->ep, GFP_ATOMIC); req = dwc2_hsotg_ep_alloc_request(&ep->ep, GFP_ATOMIC);
hsotg->ep0_reply = req; hsotg->ep0_reply = req;
if (!req) { if (!req) {
dev_warn(hsotg->dev, "%s: cannot alloc req\n", __func__); dev_warn(hsotg->dev, "%s: cannot alloc req\n", __func__);
...@@ -953,12 +953,12 @@ static int s3c_hsotg_send_reply(struct dwc2_hsotg *hsotg, ...@@ -953,12 +953,12 @@ static int s3c_hsotg_send_reply(struct dwc2_hsotg *hsotg,
* STATUS stage. * STATUS stage.
*/ */
req->zero = 0; req->zero = 0;
req->complete = s3c_hsotg_complete_oursetup; req->complete = dwc2_hsotg_complete_oursetup;
if (length) if (length)
memcpy(req->buf, buff, length); memcpy(req->buf, buff, length);
ret = s3c_hsotg_ep_queue(&ep->ep, req, GFP_ATOMIC); ret = dwc2_hsotg_ep_queue(&ep->ep, req, GFP_ATOMIC);
if (ret) { if (ret) {
dev_warn(hsotg->dev, "%s: cannot queue req\n", __func__); dev_warn(hsotg->dev, "%s: cannot queue req\n", __func__);
return ret; return ret;
...@@ -968,15 +968,15 @@ static int s3c_hsotg_send_reply(struct dwc2_hsotg *hsotg, ...@@ -968,15 +968,15 @@ static int s3c_hsotg_send_reply(struct dwc2_hsotg *hsotg,
} }
/** /**
* s3c_hsotg_process_req_status - process request GET_STATUS * dwc2_hsotg_process_req_status - process request GET_STATUS
* @hsotg: The device state * @hsotg: The device state
* @ctrl: USB control request * @ctrl: USB control request
*/ */
static int s3c_hsotg_process_req_status(struct dwc2_hsotg *hsotg, static int dwc2_hsotg_process_req_status(struct dwc2_hsotg *hsotg,
struct usb_ctrlrequest *ctrl) struct usb_ctrlrequest *ctrl)
{ {
struct s3c_hsotg_ep *ep0 = hsotg->eps_out[0]; struct dwc2_hsotg_ep *ep0 = hsotg->eps_out[0];
struct s3c_hsotg_ep *ep; struct dwc2_hsotg_ep *ep;
__le16 reply; __le16 reply;
int ret; int ret;
...@@ -1013,7 +1013,7 @@ static int s3c_hsotg_process_req_status(struct dwc2_hsotg *hsotg, ...@@ -1013,7 +1013,7 @@ static int s3c_hsotg_process_req_status(struct dwc2_hsotg *hsotg,
if (le16_to_cpu(ctrl->wLength) != 2) if (le16_to_cpu(ctrl->wLength) != 2)
return -EINVAL; return -EINVAL;
ret = s3c_hsotg_send_reply(hsotg, ep0, &reply, 2); ret = dwc2_hsotg_send_reply(hsotg, ep0, &reply, 2);
if (ret) { if (ret) {
dev_err(hsotg->dev, "%s: failed to send reply\n", __func__); dev_err(hsotg->dev, "%s: failed to send reply\n", __func__);
return ret; return ret;
...@@ -1022,7 +1022,7 @@ static int s3c_hsotg_process_req_status(struct dwc2_hsotg *hsotg, ...@@ -1022,7 +1022,7 @@ static int s3c_hsotg_process_req_status(struct dwc2_hsotg *hsotg,
return 1; return 1;
} }
static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value); static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value);
/** /**
* get_ep_head - return the first request on the endpoint * get_ep_head - return the first request on the endpoint
...@@ -1030,27 +1030,27 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value); ...@@ -1030,27 +1030,27 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value);
* *
* Get the first request on the endpoint. * Get the first request on the endpoint.
*/ */
static struct s3c_hsotg_req *get_ep_head(struct s3c_hsotg_ep *hs_ep) static struct dwc2_hsotg_req *get_ep_head(struct dwc2_hsotg_ep *hs_ep)
{ {
if (list_empty(&hs_ep->queue)) if (list_empty(&hs_ep->queue))
return NULL; return NULL;
return list_first_entry(&hs_ep->queue, struct s3c_hsotg_req, queue); return list_first_entry(&hs_ep->queue, struct dwc2_hsotg_req, queue);
} }
/** /**
* s3c_hsotg_process_req_feature - process request {SET,CLEAR}_FEATURE * dwc2_hsotg_process_req_feature - process request {SET,CLEAR}_FEATURE
* @hsotg: The device state * @hsotg: The device state
* @ctrl: USB control request * @ctrl: USB control request
*/ */
static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg, static int dwc2_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,
struct usb_ctrlrequest *ctrl) struct usb_ctrlrequest *ctrl)
{ {
struct s3c_hsotg_ep *ep0 = hsotg->eps_out[0]; struct dwc2_hsotg_ep *ep0 = hsotg->eps_out[0];
struct s3c_hsotg_req *hs_req; struct dwc2_hsotg_req *hs_req;
bool restart; bool restart;
bool set = (ctrl->bRequest == USB_REQ_SET_FEATURE); bool set = (ctrl->bRequest == USB_REQ_SET_FEATURE);
struct s3c_hsotg_ep *ep; struct dwc2_hsotg_ep *ep;
int ret; int ret;
bool halted; bool halted;
u32 recip; u32 recip;
...@@ -1074,7 +1074,7 @@ static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg, ...@@ -1074,7 +1074,7 @@ static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,
return -EINVAL; return -EINVAL;
hsotg->test_mode = wIndex >> 8; hsotg->test_mode = wIndex >> 8;
ret = s3c_hsotg_send_reply(hsotg, ep0, NULL, 0); ret = dwc2_hsotg_send_reply(hsotg, ep0, NULL, 0);
if (ret) { if (ret) {
dev_err(hsotg->dev, dev_err(hsotg->dev,
"%s: failed to send reply\n", __func__); "%s: failed to send reply\n", __func__);
...@@ -1098,9 +1098,9 @@ static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg, ...@@ -1098,9 +1098,9 @@ static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,
case USB_ENDPOINT_HALT: case USB_ENDPOINT_HALT:
halted = ep->halted; halted = ep->halted;
s3c_hsotg_ep_sethalt(&ep->ep, set); dwc2_hsotg_ep_sethalt(&ep->ep, set);
ret = s3c_hsotg_send_reply(hsotg, ep0, NULL, 0); ret = dwc2_hsotg_send_reply(hsotg, ep0, NULL, 0);
if (ret) { if (ret) {
dev_err(hsotg->dev, dev_err(hsotg->dev,
"%s: failed to send reply\n", __func__); "%s: failed to send reply\n", __func__);
...@@ -1134,7 +1134,7 @@ static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg, ...@@ -1134,7 +1134,7 @@ static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,
restart = !list_empty(&ep->queue); restart = !list_empty(&ep->queue);
if (restart) { if (restart) {
hs_req = get_ep_head(ep); hs_req = get_ep_head(ep);
s3c_hsotg_start_req(hsotg, ep, dwc2_hsotg_start_req(hsotg, ep,
hs_req, false); hs_req, false);
} }
} }
...@@ -1152,17 +1152,17 @@ static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg, ...@@ -1152,17 +1152,17 @@ static int s3c_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,
return 1; return 1;
} }
static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg); static void dwc2_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg);
/** /**
* s3c_hsotg_stall_ep0 - stall ep0 * dwc2_hsotg_stall_ep0 - stall ep0
* @hsotg: The device state * @hsotg: The device state
* *
* Set stall for ep0 as response for setup request. * Set stall for ep0 as response for setup request.
*/ */
static void s3c_hsotg_stall_ep0(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_stall_ep0(struct dwc2_hsotg *hsotg)
{ {
struct s3c_hsotg_ep *ep0 = hsotg->eps_out[0]; struct dwc2_hsotg_ep *ep0 = hsotg->eps_out[0];
u32 reg; u32 reg;
u32 ctrl; u32 ctrl;
...@@ -1187,11 +1187,11 @@ static void s3c_hsotg_stall_ep0(struct dwc2_hsotg *hsotg) ...@@ -1187,11 +1187,11 @@ static void s3c_hsotg_stall_ep0(struct dwc2_hsotg *hsotg)
* complete won't be called, so we enqueue * complete won't be called, so we enqueue
* setup request here * setup request here
*/ */
s3c_hsotg_enqueue_setup(hsotg); dwc2_hsotg_enqueue_setup(hsotg);
} }
/** /**
* s3c_hsotg_process_control - process a control request * dwc2_hsotg_process_control - process a control request
* @hsotg: The device state * @hsotg: The device state
* @ctrl: The control request received * @ctrl: The control request received
* *
...@@ -1199,10 +1199,10 @@ static void s3c_hsotg_stall_ep0(struct dwc2_hsotg *hsotg) ...@@ -1199,10 +1199,10 @@ static void s3c_hsotg_stall_ep0(struct dwc2_hsotg *hsotg)
* needs to work out what to do next (and whether to pass it on to the * needs to work out what to do next (and whether to pass it on to the
* gadget driver). * gadget driver).
*/ */
static void s3c_hsotg_process_control(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_process_control(struct dwc2_hsotg *hsotg,
struct usb_ctrlrequest *ctrl) struct usb_ctrlrequest *ctrl)
{ {
struct s3c_hsotg_ep *ep0 = hsotg->eps_out[0]; struct dwc2_hsotg_ep *ep0 = hsotg->eps_out[0];
int ret = 0; int ret = 0;
u32 dcfg; u32 dcfg;
...@@ -1233,16 +1233,16 @@ static void s3c_hsotg_process_control(struct dwc2_hsotg *hsotg, ...@@ -1233,16 +1233,16 @@ static void s3c_hsotg_process_control(struct dwc2_hsotg *hsotg,
dev_info(hsotg->dev, "new address %d\n", ctrl->wValue); dev_info(hsotg->dev, "new address %d\n", ctrl->wValue);
ret = s3c_hsotg_send_reply(hsotg, ep0, NULL, 0); ret = dwc2_hsotg_send_reply(hsotg, ep0, NULL, 0);
return; return;
case USB_REQ_GET_STATUS: case USB_REQ_GET_STATUS:
ret = s3c_hsotg_process_req_status(hsotg, ctrl); ret = dwc2_hsotg_process_req_status(hsotg, ctrl);
break; break;
case USB_REQ_CLEAR_FEATURE: case USB_REQ_CLEAR_FEATURE:
case USB_REQ_SET_FEATURE: case USB_REQ_SET_FEATURE:
ret = s3c_hsotg_process_req_feature(hsotg, ctrl); ret = dwc2_hsotg_process_req_feature(hsotg, ctrl);
break; break;
} }
} }
...@@ -1263,21 +1263,21 @@ static void s3c_hsotg_process_control(struct dwc2_hsotg *hsotg, ...@@ -1263,21 +1263,21 @@ static void s3c_hsotg_process_control(struct dwc2_hsotg *hsotg,
*/ */
if (ret < 0) if (ret < 0)
s3c_hsotg_stall_ep0(hsotg); dwc2_hsotg_stall_ep0(hsotg);
} }
/** /**
* s3c_hsotg_complete_setup - completion of a setup transfer * dwc2_hsotg_complete_setup - completion of a setup transfer
* @ep: The endpoint the request was on. * @ep: The endpoint the request was on.
* @req: The request completed. * @req: The request completed.
* *
* Called on completion of any requests the driver itself submitted for * Called on completion of any requests the driver itself submitted for
* EP0 setup packets * EP0 setup packets
*/ */
static void s3c_hsotg_complete_setup(struct usb_ep *ep, static void dwc2_hsotg_complete_setup(struct usb_ep *ep,
struct usb_request *req) struct usb_request *req)
{ {
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hsotg = hs_ep->parent; struct dwc2_hsotg *hsotg = hs_ep->parent;
if (req->status < 0) { if (req->status < 0) {
...@@ -1287,23 +1287,23 @@ static void s3c_hsotg_complete_setup(struct usb_ep *ep, ...@@ -1287,23 +1287,23 @@ static void s3c_hsotg_complete_setup(struct usb_ep *ep,
spin_lock(&hsotg->lock); spin_lock(&hsotg->lock);
if (req->actual == 0) if (req->actual == 0)
s3c_hsotg_enqueue_setup(hsotg); dwc2_hsotg_enqueue_setup(hsotg);
else else
s3c_hsotg_process_control(hsotg, req->buf); dwc2_hsotg_process_control(hsotg, req->buf);
spin_unlock(&hsotg->lock); spin_unlock(&hsotg->lock);
} }
/** /**
* s3c_hsotg_enqueue_setup - start a request for EP0 packets * dwc2_hsotg_enqueue_setup - start a request for EP0 packets
* @hsotg: The device state. * @hsotg: The device state.
* *
* Enqueue a request on EP0 if necessary to received any SETUP packets * Enqueue a request on EP0 if necessary to received any SETUP packets
* received from the host. * received from the host.
*/ */
static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg)
{ {
struct usb_request *req = hsotg->ctrl_req; struct usb_request *req = hsotg->ctrl_req;
struct s3c_hsotg_req *hs_req = our_req(req); struct dwc2_hsotg_req *hs_req = our_req(req);
int ret; int ret;
dev_dbg(hsotg->dev, "%s: queueing setup request\n", __func__); dev_dbg(hsotg->dev, "%s: queueing setup request\n", __func__);
...@@ -1311,7 +1311,7 @@ static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg) ...@@ -1311,7 +1311,7 @@ static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg)
req->zero = 0; req->zero = 0;
req->length = 8; req->length = 8;
req->buf = hsotg->ctrl_buff; req->buf = hsotg->ctrl_buff;
req->complete = s3c_hsotg_complete_setup; req->complete = dwc2_hsotg_complete_setup;
if (!list_empty(&hs_req->queue)) { if (!list_empty(&hs_req->queue)) {
dev_dbg(hsotg->dev, "%s already queued???\n", __func__); dev_dbg(hsotg->dev, "%s already queued???\n", __func__);
...@@ -1322,7 +1322,7 @@ static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg) ...@@ -1322,7 +1322,7 @@ static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg)
hsotg->eps_out[0]->send_zlp = 0; hsotg->eps_out[0]->send_zlp = 0;
hsotg->ep0_state = DWC2_EP0_SETUP; hsotg->ep0_state = DWC2_EP0_SETUP;
ret = s3c_hsotg_ep_queue(&hsotg->eps_out[0]->ep, req, GFP_ATOMIC); ret = dwc2_hsotg_ep_queue(&hsotg->eps_out[0]->ep, req, GFP_ATOMIC);
if (ret < 0) { if (ret < 0) {
dev_err(hsotg->dev, "%s: failed queue (%d)\n", __func__, ret); dev_err(hsotg->dev, "%s: failed queue (%d)\n", __func__, ret);
/* /*
...@@ -1332,8 +1332,8 @@ static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg) ...@@ -1332,8 +1332,8 @@ static void s3c_hsotg_enqueue_setup(struct dwc2_hsotg *hsotg)
} }
} }
static void s3c_hsotg_program_zlp(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_program_zlp(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep) struct dwc2_hsotg_ep *hs_ep)
{ {
u32 ctrl; u32 ctrl;
u8 index = hs_ep->index; u8 index = hs_ep->index;
...@@ -1359,7 +1359,7 @@ static void s3c_hsotg_program_zlp(struct dwc2_hsotg *hsotg, ...@@ -1359,7 +1359,7 @@ static void s3c_hsotg_program_zlp(struct dwc2_hsotg *hsotg,
} }
/** /**
* s3c_hsotg_complete_request - complete a request given to us * dwc2_hsotg_complete_request - complete a request given to us
* @hsotg: The device state. * @hsotg: The device state.
* @hs_ep: The endpoint the request was on. * @hs_ep: The endpoint the request was on.
* @hs_req: The request to complete. * @hs_req: The request to complete.
...@@ -1371,9 +1371,9 @@ static void s3c_hsotg_program_zlp(struct dwc2_hsotg *hsotg, ...@@ -1371,9 +1371,9 @@ static void s3c_hsotg_program_zlp(struct dwc2_hsotg *hsotg,
* *
* Note, expects the ep to already be locked as appropriate. * Note, expects the ep to already be locked as appropriate.
*/ */
static void s3c_hsotg_complete_request(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_complete_request(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep, struct dwc2_hsotg_ep *hs_ep,
struct s3c_hsotg_req *hs_req, struct dwc2_hsotg_req *hs_req,
int result) int result)
{ {
bool restart; bool restart;
...@@ -1394,13 +1394,13 @@ static void s3c_hsotg_complete_request(struct dwc2_hsotg *hsotg, ...@@ -1394,13 +1394,13 @@ static void s3c_hsotg_complete_request(struct dwc2_hsotg *hsotg,
if (hs_req->req.status == -EINPROGRESS) if (hs_req->req.status == -EINPROGRESS)
hs_req->req.status = result; hs_req->req.status = result;
s3c_hsotg_handle_unaligned_buf_complete(hsotg, hs_ep, hs_req); dwc2_hsotg_handle_unaligned_buf_complete(hsotg, hs_ep, hs_req);
hs_ep->req = NULL; hs_ep->req = NULL;
list_del_init(&hs_req->queue); list_del_init(&hs_req->queue);
if (using_dma(hsotg)) if (using_dma(hsotg))
s3c_hsotg_unmap_dma(hsotg, hs_ep, hs_req); dwc2_hsotg_unmap_dma(hsotg, hs_ep, hs_req);
/* /*
* call the complete request with the locks off, just in case the * call the complete request with the locks off, just in case the
...@@ -1423,13 +1423,13 @@ static void s3c_hsotg_complete_request(struct dwc2_hsotg *hsotg, ...@@ -1423,13 +1423,13 @@ static void s3c_hsotg_complete_request(struct dwc2_hsotg *hsotg,
restart = !list_empty(&hs_ep->queue); restart = !list_empty(&hs_ep->queue);
if (restart) { if (restart) {
hs_req = get_ep_head(hs_ep); hs_req = get_ep_head(hs_ep);
s3c_hsotg_start_req(hsotg, hs_ep, hs_req, false); dwc2_hsotg_start_req(hsotg, hs_ep, hs_req, false);
} }
} }
} }
/** /**
* s3c_hsotg_rx_data - receive data from the FIFO for an endpoint * dwc2_hsotg_rx_data - receive data from the FIFO for an endpoint
* @hsotg: The device state. * @hsotg: The device state.
* @ep_idx: The endpoint index for the data * @ep_idx: The endpoint index for the data
* @size: The size of data in the fifo, in bytes * @size: The size of data in the fifo, in bytes
...@@ -1438,10 +1438,10 @@ static void s3c_hsotg_complete_request(struct dwc2_hsotg *hsotg, ...@@ -1438,10 +1438,10 @@ static void s3c_hsotg_complete_request(struct dwc2_hsotg *hsotg,
* endpoint, so sort out whether we need to read the data into a request * endpoint, so sort out whether we need to read the data into a request
* that has been made for that endpoint. * that has been made for that endpoint.
*/ */
static void s3c_hsotg_rx_data(struct dwc2_hsotg *hsotg, int ep_idx, int size) static void dwc2_hsotg_rx_data(struct dwc2_hsotg *hsotg, int ep_idx, int size)
{ {
struct s3c_hsotg_ep *hs_ep = hsotg->eps_out[ep_idx]; struct dwc2_hsotg_ep *hs_ep = hsotg->eps_out[ep_idx];
struct s3c_hsotg_req *hs_req = hs_ep->req; struct dwc2_hsotg_req *hs_req = hs_ep->req;
void __iomem *fifo = hsotg->regs + EPFIFO(ep_idx); void __iomem *fifo = hsotg->regs + EPFIFO(ep_idx);
int to_read; int to_read;
int max_req; int max_req;
...@@ -1492,7 +1492,7 @@ static void s3c_hsotg_rx_data(struct dwc2_hsotg *hsotg, int ep_idx, int size) ...@@ -1492,7 +1492,7 @@ static void s3c_hsotg_rx_data(struct dwc2_hsotg *hsotg, int ep_idx, int size)
} }
/** /**
* s3c_hsotg_ep0_zlp - send/receive zero-length packet on control endpoint * dwc2_hsotg_ep0_zlp - send/receive zero-length packet on control endpoint
* @hsotg: The device instance * @hsotg: The device instance
* @dir_in: If IN zlp * @dir_in: If IN zlp
* *
...@@ -1503,17 +1503,17 @@ static void s3c_hsotg_rx_data(struct dwc2_hsotg *hsotg, int ep_idx, int size) ...@@ -1503,17 +1503,17 @@ static void s3c_hsotg_rx_data(struct dwc2_hsotg *hsotg, int ep_idx, int size)
* currently believed that we do not need to wait for any space in * currently believed that we do not need to wait for any space in
* the TxFIFO. * the TxFIFO.
*/ */
static void s3c_hsotg_ep0_zlp(struct dwc2_hsotg *hsotg, bool dir_in) static void dwc2_hsotg_ep0_zlp(struct dwc2_hsotg *hsotg, bool dir_in)
{ {
/* eps_out[0] is used in both directions */ /* eps_out[0] is used in both directions */
hsotg->eps_out[0]->dir_in = dir_in; hsotg->eps_out[0]->dir_in = dir_in;
hsotg->ep0_state = dir_in ? DWC2_EP0_STATUS_IN : DWC2_EP0_STATUS_OUT; hsotg->ep0_state = dir_in ? DWC2_EP0_STATUS_IN : DWC2_EP0_STATUS_OUT;
s3c_hsotg_program_zlp(hsotg, hsotg->eps_out[0]); dwc2_hsotg_program_zlp(hsotg, hsotg->eps_out[0]);
} }
/** /**
* s3c_hsotg_handle_outdone - handle receiving OutDone/SetupDone from RXFIFO * dwc2_hsotg_handle_outdone - handle receiving OutDone/SetupDone from RXFIFO
* @hsotg: The device instance * @hsotg: The device instance
* @epnum: The endpoint received from * @epnum: The endpoint received from
* *
...@@ -1521,11 +1521,11 @@ static void s3c_hsotg_ep0_zlp(struct dwc2_hsotg *hsotg, bool dir_in) ...@@ -1521,11 +1521,11 @@ static void s3c_hsotg_ep0_zlp(struct dwc2_hsotg *hsotg, bool dir_in)
* transfer for an OUT endpoint has been completed, either by a short * transfer for an OUT endpoint has been completed, either by a short
* packet or by the finish of a transfer. * packet or by the finish of a transfer.
*/ */
static void s3c_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum) static void dwc2_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum)
{ {
u32 epsize = readl(hsotg->regs + DOEPTSIZ(epnum)); u32 epsize = readl(hsotg->regs + DOEPTSIZ(epnum));
struct s3c_hsotg_ep *hs_ep = hsotg->eps_out[epnum]; struct dwc2_hsotg_ep *hs_ep = hsotg->eps_out[epnum];
struct s3c_hsotg_req *hs_req = hs_ep->req; struct dwc2_hsotg_req *hs_req = hs_ep->req;
struct usb_request *req = &hs_req->req; struct usb_request *req = &hs_req->req;
unsigned size_left = DXEPTSIZ_XFERSIZE_GET(epsize); unsigned size_left = DXEPTSIZ_XFERSIZE_GET(epsize);
int result = 0; int result = 0;
...@@ -1537,8 +1537,8 @@ static void s3c_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum) ...@@ -1537,8 +1537,8 @@ static void s3c_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum)
if (epnum == 0 && hsotg->ep0_state == DWC2_EP0_STATUS_OUT) { if (epnum == 0 && hsotg->ep0_state == DWC2_EP0_STATUS_OUT) {
dev_dbg(hsotg->dev, "zlp packet received\n"); dev_dbg(hsotg->dev, "zlp packet received\n");
s3c_hsotg_complete_request(hsotg, hs_ep, hs_req, 0); dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, 0);
s3c_hsotg_enqueue_setup(hsotg); dwc2_hsotg_enqueue_setup(hsotg);
return; return;
} }
...@@ -1562,7 +1562,7 @@ static void s3c_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum) ...@@ -1562,7 +1562,7 @@ static void s3c_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum)
/* if there is more request to do, schedule new transfer */ /* if there is more request to do, schedule new transfer */
if (req->actual < req->length && size_left == 0) { if (req->actual < req->length && size_left == 0) {
s3c_hsotg_start_req(hsotg, hs_ep, hs_req, true); dwc2_hsotg_start_req(hsotg, hs_ep, hs_req, true);
return; return;
} }
...@@ -1578,20 +1578,20 @@ static void s3c_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum) ...@@ -1578,20 +1578,20 @@ static void s3c_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum)
if (epnum == 0 && hsotg->ep0_state == DWC2_EP0_DATA_OUT) { if (epnum == 0 && hsotg->ep0_state == DWC2_EP0_DATA_OUT) {
/* Move to STATUS IN */ /* Move to STATUS IN */
s3c_hsotg_ep0_zlp(hsotg, true); dwc2_hsotg_ep0_zlp(hsotg, true);
return; return;
} }
s3c_hsotg_complete_request(hsotg, hs_ep, hs_req, result); dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, result);
} }
/** /**
* s3c_hsotg_read_frameno - read current frame number * dwc2_hsotg_read_frameno - read current frame number
* @hsotg: The device instance * @hsotg: The device instance
* *
* Return the current frame number * Return the current frame number
*/ */
static u32 s3c_hsotg_read_frameno(struct dwc2_hsotg *hsotg) static u32 dwc2_hsotg_read_frameno(struct dwc2_hsotg *hsotg)
{ {
u32 dsts; u32 dsts;
...@@ -1603,7 +1603,7 @@ static u32 s3c_hsotg_read_frameno(struct dwc2_hsotg *hsotg) ...@@ -1603,7 +1603,7 @@ static u32 s3c_hsotg_read_frameno(struct dwc2_hsotg *hsotg)
} }
/** /**
* s3c_hsotg_handle_rx - RX FIFO has data * dwc2_hsotg_handle_rx - RX FIFO has data
* @hsotg: The device instance * @hsotg: The device instance
* *
* The IRQ handler has detected that the RX FIFO has some data in it * The IRQ handler has detected that the RX FIFO has some data in it
...@@ -1618,7 +1618,7 @@ static u32 s3c_hsotg_read_frameno(struct dwc2_hsotg *hsotg) ...@@ -1618,7 +1618,7 @@ static u32 s3c_hsotg_read_frameno(struct dwc2_hsotg *hsotg)
* as the actual data should be sent to the memory directly and we turn * as the actual data should be sent to the memory directly and we turn
* on the completion interrupts to get notifications of transfer completion. * on the completion interrupts to get notifications of transfer completion.
*/ */
static void s3c_hsotg_handle_rx(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_handle_rx(struct dwc2_hsotg *hsotg)
{ {
u32 grxstsr = readl(hsotg->regs + GRXSTSP); u32 grxstsr = readl(hsotg->regs + GRXSTSP);
u32 epnum, status, size; u32 epnum, status, size;
...@@ -1641,55 +1641,55 @@ static void s3c_hsotg_handle_rx(struct dwc2_hsotg *hsotg) ...@@ -1641,55 +1641,55 @@ static void s3c_hsotg_handle_rx(struct dwc2_hsotg *hsotg)
case GRXSTS_PKTSTS_OUTDONE: case GRXSTS_PKTSTS_OUTDONE:
dev_dbg(hsotg->dev, "OutDone (Frame=0x%08x)\n", dev_dbg(hsotg->dev, "OutDone (Frame=0x%08x)\n",
s3c_hsotg_read_frameno(hsotg)); dwc2_hsotg_read_frameno(hsotg));
if (!using_dma(hsotg)) if (!using_dma(hsotg))
s3c_hsotg_handle_outdone(hsotg, epnum); dwc2_hsotg_handle_outdone(hsotg, epnum);
break; break;
case GRXSTS_PKTSTS_SETUPDONE: case GRXSTS_PKTSTS_SETUPDONE:
dev_dbg(hsotg->dev, dev_dbg(hsotg->dev,
"SetupDone (Frame=0x%08x, DOPEPCTL=0x%08x)\n", "SetupDone (Frame=0x%08x, DOPEPCTL=0x%08x)\n",
s3c_hsotg_read_frameno(hsotg), dwc2_hsotg_read_frameno(hsotg),
readl(hsotg->regs + DOEPCTL(0))); readl(hsotg->regs + DOEPCTL(0)));
/* /*
* Call s3c_hsotg_handle_outdone here if it was not called from * Call dwc2_hsotg_handle_outdone here if it was not called from
* GRXSTS_PKTSTS_OUTDONE. That is, if the core didn't * GRXSTS_PKTSTS_OUTDONE. That is, if the core didn't
* generate GRXSTS_PKTSTS_OUTDONE for setup packet. * generate GRXSTS_PKTSTS_OUTDONE for setup packet.
*/ */
if (hsotg->ep0_state == DWC2_EP0_SETUP) if (hsotg->ep0_state == DWC2_EP0_SETUP)
s3c_hsotg_handle_outdone(hsotg, epnum); dwc2_hsotg_handle_outdone(hsotg, epnum);
break; break;
case GRXSTS_PKTSTS_OUTRX: case GRXSTS_PKTSTS_OUTRX:
s3c_hsotg_rx_data(hsotg, epnum, size); dwc2_hsotg_rx_data(hsotg, epnum, size);
break; break;
case GRXSTS_PKTSTS_SETUPRX: case GRXSTS_PKTSTS_SETUPRX:
dev_dbg(hsotg->dev, dev_dbg(hsotg->dev,
"SetupRX (Frame=0x%08x, DOPEPCTL=0x%08x)\n", "SetupRX (Frame=0x%08x, DOPEPCTL=0x%08x)\n",
s3c_hsotg_read_frameno(hsotg), dwc2_hsotg_read_frameno(hsotg),
readl(hsotg->regs + DOEPCTL(0))); readl(hsotg->regs + DOEPCTL(0)));
WARN_ON(hsotg->ep0_state != DWC2_EP0_SETUP); WARN_ON(hsotg->ep0_state != DWC2_EP0_SETUP);
s3c_hsotg_rx_data(hsotg, epnum, size); dwc2_hsotg_rx_data(hsotg, epnum, size);
break; break;
default: default:
dev_warn(hsotg->dev, "%s: unknown status %08x\n", dev_warn(hsotg->dev, "%s: unknown status %08x\n",
__func__, grxstsr); __func__, grxstsr);
s3c_hsotg_dump(hsotg); dwc2_hsotg_dump(hsotg);
break; break;
} }
} }
/** /**
* s3c_hsotg_ep0_mps - turn max packet size into register setting * dwc2_hsotg_ep0_mps - turn max packet size into register setting
* @mps: The maximum packet size in bytes. * @mps: The maximum packet size in bytes.
*/ */
static u32 s3c_hsotg_ep0_mps(unsigned int mps) static u32 dwc2_hsotg_ep0_mps(unsigned int mps)
{ {
switch (mps) { switch (mps) {
case 64: case 64:
...@@ -1708,7 +1708,7 @@ static u32 s3c_hsotg_ep0_mps(unsigned int mps) ...@@ -1708,7 +1708,7 @@ static u32 s3c_hsotg_ep0_mps(unsigned int mps)
} }
/** /**
* s3c_hsotg_set_ep_maxpacket - set endpoint's max-packet field * dwc2_hsotg_set_ep_maxpacket - set endpoint's max-packet field
* @hsotg: The driver state. * @hsotg: The driver state.
* @ep: The index number of the endpoint * @ep: The index number of the endpoint
* @mps: The maximum packet size in bytes * @mps: The maximum packet size in bytes
...@@ -1716,10 +1716,10 @@ static u32 s3c_hsotg_ep0_mps(unsigned int mps) ...@@ -1716,10 +1716,10 @@ static u32 s3c_hsotg_ep0_mps(unsigned int mps)
* Configure the maximum packet size for the given endpoint, updating * Configure the maximum packet size for the given endpoint, updating
* the hardware control registers to reflect this. * the hardware control registers to reflect this.
*/ */
static void s3c_hsotg_set_ep_maxpacket(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_set_ep_maxpacket(struct dwc2_hsotg *hsotg,
unsigned int ep, unsigned int mps, unsigned int dir_in) unsigned int ep, unsigned int mps, unsigned int dir_in)
{ {
struct s3c_hsotg_ep *hs_ep; struct dwc2_hsotg_ep *hs_ep;
void __iomem *regs = hsotg->regs; void __iomem *regs = hsotg->regs;
u32 mpsval; u32 mpsval;
u32 mcval; u32 mcval;
...@@ -1731,7 +1731,7 @@ static void s3c_hsotg_set_ep_maxpacket(struct dwc2_hsotg *hsotg, ...@@ -1731,7 +1731,7 @@ static void s3c_hsotg_set_ep_maxpacket(struct dwc2_hsotg *hsotg,
if (ep == 0) { if (ep == 0) {
/* EP0 is a special case */ /* EP0 is a special case */
mpsval = s3c_hsotg_ep0_mps(mps); mpsval = dwc2_hsotg_ep0_mps(mps);
if (mpsval > 3) if (mpsval > 3)
goto bad_mps; goto bad_mps;
hs_ep->ep.maxpacket = mps; hs_ep->ep.maxpacket = mps;
...@@ -1766,11 +1766,11 @@ static void s3c_hsotg_set_ep_maxpacket(struct dwc2_hsotg *hsotg, ...@@ -1766,11 +1766,11 @@ static void s3c_hsotg_set_ep_maxpacket(struct dwc2_hsotg *hsotg,
} }
/** /**
* s3c_hsotg_txfifo_flush - flush Tx FIFO * dwc2_hsotg_txfifo_flush - flush Tx FIFO
* @hsotg: The driver state * @hsotg: The driver state
* @idx: The index for the endpoint (0..15) * @idx: The index for the endpoint (0..15)
*/ */
static void s3c_hsotg_txfifo_flush(struct dwc2_hsotg *hsotg, unsigned int idx) static void dwc2_hsotg_txfifo_flush(struct dwc2_hsotg *hsotg, unsigned int idx)
{ {
int timeout; int timeout;
int val; int val;
...@@ -1799,17 +1799,17 @@ static void s3c_hsotg_txfifo_flush(struct dwc2_hsotg *hsotg, unsigned int idx) ...@@ -1799,17 +1799,17 @@ static void s3c_hsotg_txfifo_flush(struct dwc2_hsotg *hsotg, unsigned int idx)
} }
/** /**
* s3c_hsotg_trytx - check to see if anything needs transmitting * dwc2_hsotg_trytx - check to see if anything needs transmitting
* @hsotg: The driver state * @hsotg: The driver state
* @hs_ep: The driver endpoint to check. * @hs_ep: The driver endpoint to check.
* *
* Check to see if there is a request that has data to send, and if so * Check to see if there is a request that has data to send, and if so
* make an attempt to write data into the FIFO. * make an attempt to write data into the FIFO.
*/ */
static int s3c_hsotg_trytx(struct dwc2_hsotg *hsotg, static int dwc2_hsotg_trytx(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep) struct dwc2_hsotg_ep *hs_ep)
{ {
struct s3c_hsotg_req *hs_req = hs_ep->req; struct dwc2_hsotg_req *hs_req = hs_ep->req;
if (!hs_ep->dir_in || !hs_req) { if (!hs_ep->dir_in || !hs_req) {
/** /**
...@@ -1817,7 +1817,7 @@ static int s3c_hsotg_trytx(struct dwc2_hsotg *hsotg, ...@@ -1817,7 +1817,7 @@ static int s3c_hsotg_trytx(struct dwc2_hsotg *hsotg,
* for endpoints, excepting ep0 * for endpoints, excepting ep0
*/ */
if (hs_ep->index != 0) if (hs_ep->index != 0)
s3c_hsotg_ctrl_epint(hsotg, hs_ep->index, dwc2_hsotg_ctrl_epint(hsotg, hs_ep->index,
hs_ep->dir_in, 0); hs_ep->dir_in, 0);
return 0; return 0;
} }
...@@ -1825,24 +1825,24 @@ static int s3c_hsotg_trytx(struct dwc2_hsotg *hsotg, ...@@ -1825,24 +1825,24 @@ static int s3c_hsotg_trytx(struct dwc2_hsotg *hsotg,
if (hs_req->req.actual < hs_req->req.length) { if (hs_req->req.actual < hs_req->req.length) {
dev_dbg(hsotg->dev, "trying to write more for ep%d\n", dev_dbg(hsotg->dev, "trying to write more for ep%d\n",
hs_ep->index); hs_ep->index);
return s3c_hsotg_write_fifo(hsotg, hs_ep, hs_req); return dwc2_hsotg_write_fifo(hsotg, hs_ep, hs_req);
} }
return 0; return 0;
} }
/** /**
* s3c_hsotg_complete_in - complete IN transfer * dwc2_hsotg_complete_in - complete IN transfer
* @hsotg: The device state. * @hsotg: The device state.
* @hs_ep: The endpoint that has just completed. * @hs_ep: The endpoint that has just completed.
* *
* An IN transfer has been completed, update the transfer's state and then * An IN transfer has been completed, update the transfer's state and then
* call the relevant completion routines. * call the relevant completion routines.
*/ */
static void s3c_hsotg_complete_in(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_complete_in(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep) struct dwc2_hsotg_ep *hs_ep)
{ {
struct s3c_hsotg_req *hs_req = hs_ep->req; struct dwc2_hsotg_req *hs_req = hs_ep->req;
u32 epsize = readl(hsotg->regs + DIEPTSIZ(hs_ep->index)); u32 epsize = readl(hsotg->regs + DIEPTSIZ(hs_ep->index));
int size_left, size_done; int size_left, size_done;
...@@ -1854,19 +1854,19 @@ static void s3c_hsotg_complete_in(struct dwc2_hsotg *hsotg, ...@@ -1854,19 +1854,19 @@ static void s3c_hsotg_complete_in(struct dwc2_hsotg *hsotg,
/* Finish ZLP handling for IN EP0 transactions */ /* Finish ZLP handling for IN EP0 transactions */
if (hs_ep->index == 0 && hsotg->ep0_state == DWC2_EP0_STATUS_IN) { if (hs_ep->index == 0 && hsotg->ep0_state == DWC2_EP0_STATUS_IN) {
dev_dbg(hsotg->dev, "zlp packet sent\n"); dev_dbg(hsotg->dev, "zlp packet sent\n");
s3c_hsotg_complete_request(hsotg, hs_ep, hs_req, 0); dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, 0);
if (hsotg->test_mode) { if (hsotg->test_mode) {
int ret; int ret;
ret = s3c_hsotg_set_test_mode(hsotg, hsotg->test_mode); ret = dwc2_hsotg_set_test_mode(hsotg, hsotg->test_mode);
if (ret < 0) { if (ret < 0) {
dev_dbg(hsotg->dev, "Invalid Test #%d\n", dev_dbg(hsotg->dev, "Invalid Test #%d\n",
hsotg->test_mode); hsotg->test_mode);
s3c_hsotg_stall_ep0(hsotg); dwc2_hsotg_stall_ep0(hsotg);
return; return;
} }
} }
s3c_hsotg_enqueue_setup(hsotg); dwc2_hsotg_enqueue_setup(hsotg);
return; return;
} }
...@@ -1895,13 +1895,13 @@ static void s3c_hsotg_complete_in(struct dwc2_hsotg *hsotg, ...@@ -1895,13 +1895,13 @@ static void s3c_hsotg_complete_in(struct dwc2_hsotg *hsotg,
if (!size_left && hs_req->req.actual < hs_req->req.length) { if (!size_left && hs_req->req.actual < hs_req->req.length) {
dev_dbg(hsotg->dev, "%s trying more for req...\n", __func__); dev_dbg(hsotg->dev, "%s trying more for req...\n", __func__);
s3c_hsotg_start_req(hsotg, hs_ep, hs_req, true); dwc2_hsotg_start_req(hsotg, hs_ep, hs_req, true);
return; return;
} }
/* Zlp for all endpoints, for ep0 only in DATA IN stage */ /* Zlp for all endpoints, for ep0 only in DATA IN stage */
if (hs_ep->send_zlp) { if (hs_ep->send_zlp) {
s3c_hsotg_program_zlp(hsotg, hs_ep); dwc2_hsotg_program_zlp(hsotg, hs_ep);
hs_ep->send_zlp = 0; hs_ep->send_zlp = 0;
/* transfer will be completed on next complete interrupt */ /* transfer will be completed on next complete interrupt */
return; return;
...@@ -1909,25 +1909,25 @@ static void s3c_hsotg_complete_in(struct dwc2_hsotg *hsotg, ...@@ -1909,25 +1909,25 @@ static void s3c_hsotg_complete_in(struct dwc2_hsotg *hsotg,
if (hs_ep->index == 0 && hsotg->ep0_state == DWC2_EP0_DATA_IN) { if (hs_ep->index == 0 && hsotg->ep0_state == DWC2_EP0_DATA_IN) {
/* Move to STATUS OUT */ /* Move to STATUS OUT */
s3c_hsotg_ep0_zlp(hsotg, false); dwc2_hsotg_ep0_zlp(hsotg, false);
return; return;
} }
s3c_hsotg_complete_request(hsotg, hs_ep, hs_req, 0); dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, 0);
} }
/** /**
* s3c_hsotg_epint - handle an in/out endpoint interrupt * dwc2_hsotg_epint - handle an in/out endpoint interrupt
* @hsotg: The driver state * @hsotg: The driver state
* @idx: The index for the endpoint (0..15) * @idx: The index for the endpoint (0..15)
* @dir_in: Set if this is an IN endpoint * @dir_in: Set if this is an IN endpoint
* *
* Process and clear any interrupt pending for an individual endpoint * Process and clear any interrupt pending for an individual endpoint
*/ */
static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx, static void dwc2_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
int dir_in) int dir_in)
{ {
struct s3c_hsotg_ep *hs_ep = index_to_ep(hsotg, idx, dir_in); struct dwc2_hsotg_ep *hs_ep = index_to_ep(hsotg, idx, dir_in);
u32 epint_reg = dir_in ? DIEPINT(idx) : DOEPINT(idx); u32 epint_reg = dir_in ? DIEPINT(idx) : DOEPINT(idx);
u32 epctl_reg = dir_in ? DIEPCTL(idx) : DOEPCTL(idx); u32 epctl_reg = dir_in ? DIEPCTL(idx) : DOEPCTL(idx);
u32 epsiz_reg = dir_in ? DIEPTSIZ(idx) : DOEPTSIZ(idx); u32 epsiz_reg = dir_in ? DIEPTSIZ(idx) : DOEPTSIZ(idx);
...@@ -1972,17 +1972,17 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx, ...@@ -1972,17 +1972,17 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
* at completing IN requests here * at completing IN requests here
*/ */
if (dir_in) { if (dir_in) {
s3c_hsotg_complete_in(hsotg, hs_ep); dwc2_hsotg_complete_in(hsotg, hs_ep);
if (idx == 0 && !hs_ep->req) if (idx == 0 && !hs_ep->req)
s3c_hsotg_enqueue_setup(hsotg); dwc2_hsotg_enqueue_setup(hsotg);
} else if (using_dma(hsotg)) { } else if (using_dma(hsotg)) {
/* /*
* We're using DMA, we need to fire an OutDone here * We're using DMA, we need to fire an OutDone here
* as we ignore the RXFIFO. * as we ignore the RXFIFO.
*/ */
s3c_hsotg_handle_outdone(hsotg, idx); dwc2_hsotg_handle_outdone(hsotg, idx);
} }
} }
...@@ -1992,7 +1992,7 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx, ...@@ -1992,7 +1992,7 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
if (dir_in) { if (dir_in) {
int epctl = readl(hsotg->regs + epctl_reg); int epctl = readl(hsotg->regs + epctl_reg);
s3c_hsotg_txfifo_flush(hsotg, hs_ep->fifo_index); dwc2_hsotg_txfifo_flush(hsotg, hs_ep->fifo_index);
if ((epctl & DXEPCTL_STALL) && if ((epctl & DXEPCTL_STALL) &&
(epctl & DXEPCTL_EPTYPE_BULK)) { (epctl & DXEPCTL_EPTYPE_BULK)) {
...@@ -2021,7 +2021,7 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx, ...@@ -2021,7 +2021,7 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
if (dir_in) if (dir_in)
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
else else
s3c_hsotg_handle_outdone(hsotg, 0); dwc2_hsotg_handle_outdone(hsotg, 0);
} }
} }
...@@ -2047,19 +2047,19 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx, ...@@ -2047,19 +2047,19 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx,
dev_dbg(hsotg->dev, "%s: ep%d: TxFIFOEmpty\n", dev_dbg(hsotg->dev, "%s: ep%d: TxFIFOEmpty\n",
__func__, idx); __func__, idx);
if (!using_dma(hsotg)) if (!using_dma(hsotg))
s3c_hsotg_trytx(hsotg, hs_ep); dwc2_hsotg_trytx(hsotg, hs_ep);
} }
} }
} }
/** /**
* s3c_hsotg_irq_enumdone - Handle EnumDone interrupt (enumeration done) * dwc2_hsotg_irq_enumdone - Handle EnumDone interrupt (enumeration done)
* @hsotg: The device state. * @hsotg: The device state.
* *
* Handle updating the device settings after the enumeration phase has * Handle updating the device settings after the enumeration phase has
* been completed. * been completed.
*/ */
static void s3c_hsotg_irq_enumdone(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_irq_enumdone(struct dwc2_hsotg *hsotg)
{ {
u32 dsts = readl(hsotg->regs + DSTS); u32 dsts = readl(hsotg->regs + DSTS);
int ep0_mps = 0, ep_mps = 8; int ep0_mps = 0, ep_mps = 8;
...@@ -2113,19 +2113,19 @@ static void s3c_hsotg_irq_enumdone(struct dwc2_hsotg *hsotg) ...@@ -2113,19 +2113,19 @@ static void s3c_hsotg_irq_enumdone(struct dwc2_hsotg *hsotg)
if (ep0_mps) { if (ep0_mps) {
int i; int i;
/* Initialize ep0 for both in and out directions */ /* Initialize ep0 for both in and out directions */
s3c_hsotg_set_ep_maxpacket(hsotg, 0, ep0_mps, 1); dwc2_hsotg_set_ep_maxpacket(hsotg, 0, ep0_mps, 1);
s3c_hsotg_set_ep_maxpacket(hsotg, 0, ep0_mps, 0); dwc2_hsotg_set_ep_maxpacket(hsotg, 0, ep0_mps, 0);
for (i = 1; i < hsotg->num_of_eps; i++) { for (i = 1; i < hsotg->num_of_eps; i++) {
if (hsotg->eps_in[i]) if (hsotg->eps_in[i])
s3c_hsotg_set_ep_maxpacket(hsotg, i, ep_mps, 1); dwc2_hsotg_set_ep_maxpacket(hsotg, i, ep_mps, 1);
if (hsotg->eps_out[i]) if (hsotg->eps_out[i])
s3c_hsotg_set_ep_maxpacket(hsotg, i, ep_mps, 0); dwc2_hsotg_set_ep_maxpacket(hsotg, i, ep_mps, 0);
} }
} }
/* ensure after enumeration our EP0 is active */ /* ensure after enumeration our EP0 is active */
s3c_hsotg_enqueue_setup(hsotg); dwc2_hsotg_enqueue_setup(hsotg);
dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n", dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n",
readl(hsotg->regs + DIEPCTL0), readl(hsotg->regs + DIEPCTL0),
...@@ -2142,34 +2142,34 @@ static void s3c_hsotg_irq_enumdone(struct dwc2_hsotg *hsotg) ...@@ -2142,34 +2142,34 @@ static void s3c_hsotg_irq_enumdone(struct dwc2_hsotg *hsotg)
* completed with the given result code. * completed with the given result code.
*/ */
static void kill_all_requests(struct dwc2_hsotg *hsotg, static void kill_all_requests(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *ep, struct dwc2_hsotg_ep *ep,
int result) int result)
{ {
struct s3c_hsotg_req *req, *treq; struct dwc2_hsotg_req *req, *treq;
unsigned size; unsigned size;
ep->req = NULL; ep->req = NULL;
list_for_each_entry_safe(req, treq, &ep->queue, queue) list_for_each_entry_safe(req, treq, &ep->queue, queue)
s3c_hsotg_complete_request(hsotg, ep, req, dwc2_hsotg_complete_request(hsotg, ep, req,
result); result);
if (!hsotg->dedicated_fifos) if (!hsotg->dedicated_fifos)
return; return;
size = (readl(hsotg->regs + DTXFSTS(ep->index)) & 0xffff) * 4; size = (readl(hsotg->regs + DTXFSTS(ep->index)) & 0xffff) * 4;
if (size < ep->fifo_size) if (size < ep->fifo_size)
s3c_hsotg_txfifo_flush(hsotg, ep->fifo_index); dwc2_hsotg_txfifo_flush(hsotg, ep->fifo_index);
} }
/** /**
* s3c_hsotg_disconnect - disconnect service * dwc2_hsotg_disconnect - disconnect service
* @hsotg: The device state. * @hsotg: The device state.
* *
* The device has been disconnected. Remove all current * The device has been disconnected. Remove all current
* transactions and signal the gadget driver that this * transactions and signal the gadget driver that this
* has happened. * has happened.
*/ */
void s3c_hsotg_disconnect(struct dwc2_hsotg *hsotg) void dwc2_hsotg_disconnect(struct dwc2_hsotg *hsotg)
{ {
unsigned ep; unsigned ep;
...@@ -2192,13 +2192,13 @@ void s3c_hsotg_disconnect(struct dwc2_hsotg *hsotg) ...@@ -2192,13 +2192,13 @@ void s3c_hsotg_disconnect(struct dwc2_hsotg *hsotg)
} }
/** /**
* s3c_hsotg_irq_fifoempty - TX FIFO empty interrupt handler * dwc2_hsotg_irq_fifoempty - TX FIFO empty interrupt handler
* @hsotg: The device state: * @hsotg: The device state:
* @periodic: True if this is a periodic FIFO interrupt * @periodic: True if this is a periodic FIFO interrupt
*/ */
static void s3c_hsotg_irq_fifoempty(struct dwc2_hsotg *hsotg, bool periodic) static void dwc2_hsotg_irq_fifoempty(struct dwc2_hsotg *hsotg, bool periodic)
{ {
struct s3c_hsotg_ep *ep; struct dwc2_hsotg_ep *ep;
int epno, ret; int epno, ret;
/* look through for any more data to transmit */ /* look through for any more data to transmit */
...@@ -2215,7 +2215,7 @@ static void s3c_hsotg_irq_fifoempty(struct dwc2_hsotg *hsotg, bool periodic) ...@@ -2215,7 +2215,7 @@ static void s3c_hsotg_irq_fifoempty(struct dwc2_hsotg *hsotg, bool periodic)
(!periodic && ep->periodic)) (!periodic && ep->periodic))
continue; continue;
ret = s3c_hsotg_trytx(hsotg, ep); ret = dwc2_hsotg_trytx(hsotg, ep);
if (ret < 0) if (ret < 0)
break; break;
} }
...@@ -2227,12 +2227,12 @@ static void s3c_hsotg_irq_fifoempty(struct dwc2_hsotg *hsotg, bool periodic) ...@@ -2227,12 +2227,12 @@ static void s3c_hsotg_irq_fifoempty(struct dwc2_hsotg *hsotg, bool periodic)
GINTSTS_RXFLVL) GINTSTS_RXFLVL)
/** /**
* s3c_hsotg_corereset - issue softreset to the core * dwc2_hsotg_corereset - issue softreset to the core
* @hsotg: The device state * @hsotg: The device state
* *
* Issue a soft reset to the core, and await the core finishing it. * Issue a soft reset to the core, and await the core finishing it.
*/ */
static int s3c_hsotg_corereset(struct dwc2_hsotg *hsotg) static int dwc2_hsotg_corereset(struct dwc2_hsotg *hsotg)
{ {
int timeout; int timeout;
u32 grstctl; u32 grstctl;
...@@ -2275,18 +2275,18 @@ static int s3c_hsotg_corereset(struct dwc2_hsotg *hsotg) ...@@ -2275,18 +2275,18 @@ static int s3c_hsotg_corereset(struct dwc2_hsotg *hsotg)
} }
/** /**
* s3c_hsotg_core_init - issue softreset to the core * dwc2_hsotg_core_init - issue softreset to the core
* @hsotg: The device state * @hsotg: The device state
* *
* Issue a soft reset to the core, and await the core finishing it. * Issue a soft reset to the core, and await the core finishing it.
*/ */
void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
bool is_usb_reset) bool is_usb_reset)
{ {
u32 val; u32 val;
if (!is_usb_reset) if (!is_usb_reset)
s3c_hsotg_corereset(hsotg); dwc2_hsotg_corereset(hsotg);
/* /*
* we must now enable ep0 ready for host detection and then * we must now enable ep0 ready for host detection and then
...@@ -2298,7 +2298,7 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, ...@@ -2298,7 +2298,7 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
writel(hsotg->phyif | GUSBCFG_TOUTCAL(7) | writel(hsotg->phyif | GUSBCFG_TOUTCAL(7) |
(val << GUSBCFG_USBTRDTIM_SHIFT), hsotg->regs + GUSBCFG); (val << GUSBCFG_USBTRDTIM_SHIFT), hsotg->regs + GUSBCFG);
s3c_hsotg_init_fifo(hsotg); dwc2_hsotg_init_fifo(hsotg);
if (!is_usb_reset) if (!is_usb_reset)
__orr32(hsotg->regs + DCTL, DCTL_SFTDISCON); __orr32(hsotg->regs + DCTL, DCTL_SFTDISCON);
...@@ -2359,7 +2359,7 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, ...@@ -2359,7 +2359,7 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
readl(hsotg->regs + DOEPCTL0)); readl(hsotg->regs + DOEPCTL0));
/* enable in and out endpoint interrupts */ /* enable in and out endpoint interrupts */
s3c_hsotg_en_gsint(hsotg, GINTSTS_OEPINT | GINTSTS_IEPINT); dwc2_hsotg_en_gsint(hsotg, GINTSTS_OEPINT | GINTSTS_IEPINT);
/* /*
* Enable the RXFIFO when in slave mode, as this is how we collect * Enable the RXFIFO when in slave mode, as this is how we collect
...@@ -2367,11 +2367,11 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, ...@@ -2367,11 +2367,11 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
* things we cannot process, so do not use it. * things we cannot process, so do not use it.
*/ */
if (!using_dma(hsotg)) if (!using_dma(hsotg))
s3c_hsotg_en_gsint(hsotg, GINTSTS_RXFLVL); dwc2_hsotg_en_gsint(hsotg, GINTSTS_RXFLVL);
/* Enable interrupts for EP0 in and out */ /* Enable interrupts for EP0 in and out */
s3c_hsotg_ctrl_epint(hsotg, 0, 0, 1); dwc2_hsotg_ctrl_epint(hsotg, 0, 0, 1);
s3c_hsotg_ctrl_epint(hsotg, 0, 1, 1); dwc2_hsotg_ctrl_epint(hsotg, 0, 1, 1);
if (!is_usb_reset) { if (!is_usb_reset) {
__orr32(hsotg->regs + DCTL, DCTL_PWRONPRGDONE); __orr32(hsotg->regs + DCTL, DCTL_PWRONPRGDONE);
...@@ -2390,16 +2390,16 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, ...@@ -2390,16 +2390,16 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
writel(DXEPTSIZ_MC(1) | DXEPTSIZ_PKTCNT(1) | writel(DXEPTSIZ_MC(1) | DXEPTSIZ_PKTCNT(1) |
DXEPTSIZ_XFERSIZE(8), hsotg->regs + DOEPTSIZ0); DXEPTSIZ_XFERSIZE(8), hsotg->regs + DOEPTSIZ0);
writel(s3c_hsotg_ep0_mps(hsotg->eps_out[0]->ep.maxpacket) | writel(dwc2_hsotg_ep0_mps(hsotg->eps_out[0]->ep.maxpacket) |
DXEPCTL_CNAK | DXEPCTL_EPENA | DXEPCTL_CNAK | DXEPCTL_EPENA |
DXEPCTL_USBACTEP, DXEPCTL_USBACTEP,
hsotg->regs + DOEPCTL0); hsotg->regs + DOEPCTL0);
/* enable, but don't activate EP0in */ /* enable, but don't activate EP0in */
writel(s3c_hsotg_ep0_mps(hsotg->eps_out[0]->ep.maxpacket) | writel(dwc2_hsotg_ep0_mps(hsotg->eps_out[0]->ep.maxpacket) |
DXEPCTL_USBACTEP, hsotg->regs + DIEPCTL0); DXEPCTL_USBACTEP, hsotg->regs + DIEPCTL0);
s3c_hsotg_enqueue_setup(hsotg); dwc2_hsotg_enqueue_setup(hsotg);
dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n", dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n",
readl(hsotg->regs + DIEPCTL0), readl(hsotg->regs + DIEPCTL0),
...@@ -2417,24 +2417,24 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, ...@@ -2417,24 +2417,24 @@ void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
hsotg->last_rst = jiffies; hsotg->last_rst = jiffies;
} }
static void s3c_hsotg_core_disconnect(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg)
{ {
/* set the soft-disconnect bit */ /* set the soft-disconnect bit */
__orr32(hsotg->regs + DCTL, DCTL_SFTDISCON); __orr32(hsotg->regs + DCTL, DCTL_SFTDISCON);
} }
void s3c_hsotg_core_connect(struct dwc2_hsotg *hsotg) void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg)
{ {
/* remove the soft-disconnect and let's go */ /* remove the soft-disconnect and let's go */
__bic32(hsotg->regs + DCTL, DCTL_SFTDISCON); __bic32(hsotg->regs + DCTL, DCTL_SFTDISCON);
} }
/** /**
* s3c_hsotg_irq - handle device interrupt * dwc2_hsotg_irq - handle device interrupt
* @irq: The IRQ number triggered * @irq: The IRQ number triggered
* @pw: The pw value when registered the handler. * @pw: The pw value when registered the handler.
*/ */
static irqreturn_t s3c_hsotg_irq(int irq, void *pw) static irqreturn_t dwc2_hsotg_irq(int irq, void *pw)
{ {
struct dwc2_hsotg *hsotg = pw; struct dwc2_hsotg *hsotg = pw;
int retry_count = 8; int retry_count = 8;
...@@ -2454,7 +2454,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2454,7 +2454,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
if (gintsts & GINTSTS_ENUMDONE) { if (gintsts & GINTSTS_ENUMDONE) {
writel(GINTSTS_ENUMDONE, hsotg->regs + GINTSTS); writel(GINTSTS_ENUMDONE, hsotg->regs + GINTSTS);
s3c_hsotg_irq_enumdone(hsotg); dwc2_hsotg_irq_enumdone(hsotg);
} }
if (gintsts & (GINTSTS_OEPINT | GINTSTS_IEPINT)) { if (gintsts & (GINTSTS_OEPINT | GINTSTS_IEPINT)) {
...@@ -2472,13 +2472,13 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2472,13 +2472,13 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
for (ep = 0; ep < hsotg->num_of_eps && daint_out; for (ep = 0; ep < hsotg->num_of_eps && daint_out;
ep++, daint_out >>= 1) { ep++, daint_out >>= 1) {
if (daint_out & 1) if (daint_out & 1)
s3c_hsotg_epint(hsotg, ep, 0); dwc2_hsotg_epint(hsotg, ep, 0);
} }
for (ep = 0; ep < hsotg->num_of_eps && daint_in; for (ep = 0; ep < hsotg->num_of_eps && daint_in;
ep++, daint_in >>= 1) { ep++, daint_in >>= 1) {
if (daint_in & 1) if (daint_in & 1)
s3c_hsotg_epint(hsotg, ep, 1); dwc2_hsotg_epint(hsotg, ep, 1);
} }
} }
...@@ -2505,7 +2505,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2505,7 +2505,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
writel(GINTSTS_USBRST, hsotg->regs + GINTSTS); writel(GINTSTS_USBRST, hsotg->regs + GINTSTS);
/* Report disconnection if it is not already done. */ /* Report disconnection if it is not already done. */
s3c_hsotg_disconnect(hsotg); dwc2_hsotg_disconnect(hsotg);
if (usb_status & GOTGCTL_BSESVLD) { if (usb_status & GOTGCTL_BSESVLD) {
if (time_after(jiffies, hsotg->last_rst + if (time_after(jiffies, hsotg->last_rst +
...@@ -2515,7 +2515,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2515,7 +2515,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
-ECONNRESET); -ECONNRESET);
hsotg->lx_state = DWC2_L0; hsotg->lx_state = DWC2_L0;
s3c_hsotg_core_init_disconnected(hsotg, true); dwc2_hsotg_core_init_disconnected(hsotg, true);
} }
} }
} }
...@@ -2531,8 +2531,8 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2531,8 +2531,8 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
* it needs re-enabling * it needs re-enabling
*/ */
s3c_hsotg_disable_gsint(hsotg, GINTSTS_NPTXFEMP); dwc2_hsotg_disable_gsint(hsotg, GINTSTS_NPTXFEMP);
s3c_hsotg_irq_fifoempty(hsotg, false); dwc2_hsotg_irq_fifoempty(hsotg, false);
} }
if (gintsts & GINTSTS_PTXFEMP) { if (gintsts & GINTSTS_PTXFEMP) {
...@@ -2540,18 +2540,18 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2540,18 +2540,18 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
/* See note in GINTSTS_NPTxFEmp */ /* See note in GINTSTS_NPTxFEmp */
s3c_hsotg_disable_gsint(hsotg, GINTSTS_PTXFEMP); dwc2_hsotg_disable_gsint(hsotg, GINTSTS_PTXFEMP);
s3c_hsotg_irq_fifoempty(hsotg, true); dwc2_hsotg_irq_fifoempty(hsotg, true);
} }
if (gintsts & GINTSTS_RXFLVL) { if (gintsts & GINTSTS_RXFLVL) {
/* /*
* note, since GINTSTS_RxFLvl doubles as FIFO-not-empty, * note, since GINTSTS_RxFLvl doubles as FIFO-not-empty,
* we need to retry s3c_hsotg_handle_rx if this is still * we need to retry dwc2_hsotg_handle_rx if this is still
* set. * set.
*/ */
s3c_hsotg_handle_rx(hsotg); dwc2_hsotg_handle_rx(hsotg);
} }
if (gintsts & GINTSTS_ERLYSUSP) { if (gintsts & GINTSTS_ERLYSUSP) {
...@@ -2570,7 +2570,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2570,7 +2570,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
writel(DCTL_CGOUTNAK, hsotg->regs + DCTL); writel(DCTL_CGOUTNAK, hsotg->regs + DCTL);
s3c_hsotg_dump(hsotg); dwc2_hsotg_dump(hsotg);
} }
if (gintsts & GINTSTS_GINNAKEFF) { if (gintsts & GINTSTS_GINNAKEFF) {
...@@ -2578,7 +2578,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2578,7 +2578,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
writel(DCTL_CGNPINNAK, hsotg->regs + DCTL); writel(DCTL_CGNPINNAK, hsotg->regs + DCTL);
s3c_hsotg_dump(hsotg); dwc2_hsotg_dump(hsotg);
} }
/* /*
...@@ -2595,16 +2595,16 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) ...@@ -2595,16 +2595,16 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
} }
/** /**
* s3c_hsotg_ep_enable - enable the given endpoint * dwc2_hsotg_ep_enable - enable the given endpoint
* @ep: The USB endpint to configure * @ep: The USB endpint to configure
* @desc: The USB endpoint descriptor to configure with. * @desc: The USB endpoint descriptor to configure with.
* *
* This is called from the USB gadget code's usb_ep_enable(). * This is called from the USB gadget code's usb_ep_enable().
*/ */
static int s3c_hsotg_ep_enable(struct usb_ep *ep, static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
const struct usb_endpoint_descriptor *desc) const struct usb_endpoint_descriptor *desc)
{ {
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hsotg = hs_ep->parent; struct dwc2_hsotg *hsotg = hs_ep->parent;
unsigned long flags; unsigned long flags;
unsigned int index = hs_ep->index; unsigned int index = hs_ep->index;
...@@ -2631,7 +2631,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, ...@@ -2631,7 +2631,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
mps = usb_endpoint_maxp(desc); mps = usb_endpoint_maxp(desc);
/* note, we handle this here instead of s3c_hsotg_set_ep_maxpacket */ /* note, we handle this here instead of dwc2_hsotg_set_ep_maxpacket */
epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index); epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
epctrl = readl(hsotg->regs + epctrl_reg); epctrl = readl(hsotg->regs + epctrl_reg);
...@@ -2660,7 +2660,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, ...@@ -2660,7 +2660,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
epctrl |= DXEPCTL_SNAK; epctrl |= DXEPCTL_SNAK;
/* update the endpoint state */ /* update the endpoint state */
s3c_hsotg_set_ep_maxpacket(hsotg, hs_ep->index, mps, dir_in); dwc2_hsotg_set_ep_maxpacket(hsotg, hs_ep->index, mps, dir_in);
/* default, set to non-periodic */ /* default, set to non-periodic */
hs_ep->isochronous = 0; hs_ep->isochronous = 0;
...@@ -2752,7 +2752,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, ...@@ -2752,7 +2752,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
__func__, readl(hsotg->regs + epctrl_reg)); __func__, readl(hsotg->regs + epctrl_reg));
/* enable the endpoint interrupt */ /* enable the endpoint interrupt */
s3c_hsotg_ctrl_epint(hsotg, index, dir_in, 1); dwc2_hsotg_ctrl_epint(hsotg, index, dir_in, 1);
error: error:
spin_unlock_irqrestore(&hsotg->lock, flags); spin_unlock_irqrestore(&hsotg->lock, flags);
...@@ -2760,12 +2760,12 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, ...@@ -2760,12 +2760,12 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
} }
/** /**
* s3c_hsotg_ep_disable - disable given endpoint * dwc2_hsotg_ep_disable - disable given endpoint
* @ep: The endpoint to disable. * @ep: The endpoint to disable.
*/ */
static int s3c_hsotg_ep_disable(struct usb_ep *ep) static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
{ {
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hsotg = hs_ep->parent; struct dwc2_hsotg *hsotg = hs_ep->parent;
int dir_in = hs_ep->dir_in; int dir_in = hs_ep->dir_in;
int index = hs_ep->index; int index = hs_ep->index;
...@@ -2797,7 +2797,7 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep) ...@@ -2797,7 +2797,7 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep)
writel(ctrl, hsotg->regs + epctrl_reg); writel(ctrl, hsotg->regs + epctrl_reg);
/* disable endpoint interrupts */ /* disable endpoint interrupts */
s3c_hsotg_ctrl_epint(hsotg, hs_ep->index, hs_ep->dir_in, 0); dwc2_hsotg_ctrl_epint(hsotg, hs_ep->index, hs_ep->dir_in, 0);
/* terminate all requests with shutdown */ /* terminate all requests with shutdown */
kill_all_requests(hsotg, hs_ep, -ESHUTDOWN); kill_all_requests(hsotg, hs_ep, -ESHUTDOWN);
...@@ -2811,9 +2811,9 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep) ...@@ -2811,9 +2811,9 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep)
* @ep: The endpoint to check. * @ep: The endpoint to check.
* @test: The request to test if it is on the endpoint. * @test: The request to test if it is on the endpoint.
*/ */
static bool on_list(struct s3c_hsotg_ep *ep, struct s3c_hsotg_req *test) static bool on_list(struct dwc2_hsotg_ep *ep, struct dwc2_hsotg_req *test)
{ {
struct s3c_hsotg_req *req, *treq; struct dwc2_hsotg_req *req, *treq;
list_for_each_entry_safe(req, treq, &ep->queue, queue) { list_for_each_entry_safe(req, treq, &ep->queue, queue) {
if (req == test) if (req == test)
...@@ -2824,14 +2824,14 @@ static bool on_list(struct s3c_hsotg_ep *ep, struct s3c_hsotg_req *test) ...@@ -2824,14 +2824,14 @@ static bool on_list(struct s3c_hsotg_ep *ep, struct s3c_hsotg_req *test)
} }
/** /**
* s3c_hsotg_ep_dequeue - dequeue given endpoint * dwc2_hsotg_ep_dequeue - dequeue given endpoint
* @ep: The endpoint to dequeue. * @ep: The endpoint to dequeue.
* @req: The request to be removed from a queue. * @req: The request to be removed from a queue.
*/ */
static int s3c_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req) static int dwc2_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req)
{ {
struct s3c_hsotg_req *hs_req = our_req(req); struct dwc2_hsotg_req *hs_req = our_req(req);
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hs = hs_ep->parent; struct dwc2_hsotg *hs = hs_ep->parent;
unsigned long flags; unsigned long flags;
...@@ -2844,20 +2844,20 @@ static int s3c_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req) ...@@ -2844,20 +2844,20 @@ static int s3c_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req)
return -EINVAL; return -EINVAL;
} }
s3c_hsotg_complete_request(hs, hs_ep, hs_req, -ECONNRESET); dwc2_hsotg_complete_request(hs, hs_ep, hs_req, -ECONNRESET);
spin_unlock_irqrestore(&hs->lock, flags); spin_unlock_irqrestore(&hs->lock, flags);
return 0; return 0;
} }
/** /**
* s3c_hsotg_ep_sethalt - set halt on a given endpoint * dwc2_hsotg_ep_sethalt - set halt on a given endpoint
* @ep: The endpoint to set halt. * @ep: The endpoint to set halt.
* @value: Set or unset the halt. * @value: Set or unset the halt.
*/ */
static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value) static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value)
{ {
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hs = hs_ep->parent; struct dwc2_hsotg *hs = hs_ep->parent;
int index = hs_ep->index; int index = hs_ep->index;
u32 epreg; u32 epreg;
...@@ -2868,7 +2868,7 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value) ...@@ -2868,7 +2868,7 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value)
if (index == 0) { if (index == 0) {
if (value) if (value)
s3c_hsotg_stall_ep0(hs); dwc2_hsotg_stall_ep0(hs);
else else
dev_warn(hs->dev, dev_warn(hs->dev,
"%s: can't clear halt on ep0\n", __func__); "%s: can't clear halt on ep0\n", __func__);
...@@ -2914,43 +2914,43 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value) ...@@ -2914,43 +2914,43 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value)
} }
/** /**
* s3c_hsotg_ep_sethalt_lock - set halt on a given endpoint with lock held * dwc2_hsotg_ep_sethalt_lock - set halt on a given endpoint with lock held
* @ep: The endpoint to set halt. * @ep: The endpoint to set halt.
* @value: Set or unset the halt. * @value: Set or unset the halt.
*/ */
static int s3c_hsotg_ep_sethalt_lock(struct usb_ep *ep, int value) static int dwc2_hsotg_ep_sethalt_lock(struct usb_ep *ep, int value)
{ {
struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hs = hs_ep->parent; struct dwc2_hsotg *hs = hs_ep->parent;
unsigned long flags = 0; unsigned long flags = 0;
int ret = 0; int ret = 0;
spin_lock_irqsave(&hs->lock, flags); spin_lock_irqsave(&hs->lock, flags);
ret = s3c_hsotg_ep_sethalt(ep, value); ret = dwc2_hsotg_ep_sethalt(ep, value);
spin_unlock_irqrestore(&hs->lock, flags); spin_unlock_irqrestore(&hs->lock, flags);
return ret; return ret;
} }
static struct usb_ep_ops s3c_hsotg_ep_ops = { static struct usb_ep_ops dwc2_hsotg_ep_ops = {
.enable = s3c_hsotg_ep_enable, .enable = dwc2_hsotg_ep_enable,
.disable = s3c_hsotg_ep_disable, .disable = dwc2_hsotg_ep_disable,
.alloc_request = s3c_hsotg_ep_alloc_request, .alloc_request = dwc2_hsotg_ep_alloc_request,
.free_request = s3c_hsotg_ep_free_request, .free_request = dwc2_hsotg_ep_free_request,
.queue = s3c_hsotg_ep_queue_lock, .queue = dwc2_hsotg_ep_queue_lock,
.dequeue = s3c_hsotg_ep_dequeue, .dequeue = dwc2_hsotg_ep_dequeue,
.set_halt = s3c_hsotg_ep_sethalt_lock, .set_halt = dwc2_hsotg_ep_sethalt_lock,
/* note, don't believe we have any call for the fifo routines */ /* note, don't believe we have any call for the fifo routines */
}; };
/** /**
* s3c_hsotg_phy_enable - enable platform phy dev * dwc2_hsotg_phy_enable - enable platform phy dev
* @hsotg: The driver state * @hsotg: The driver state
* *
* A wrapper for platform code responsible for controlling * A wrapper for platform code responsible for controlling
* low-level USB code * low-level USB code
*/ */
static void s3c_hsotg_phy_enable(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_phy_enable(struct dwc2_hsotg *hsotg)
{ {
struct platform_device *pdev = to_platform_device(hsotg->dev); struct platform_device *pdev = to_platform_device(hsotg->dev);
...@@ -2967,13 +2967,13 @@ static void s3c_hsotg_phy_enable(struct dwc2_hsotg *hsotg) ...@@ -2967,13 +2967,13 @@ static void s3c_hsotg_phy_enable(struct dwc2_hsotg *hsotg)
} }
/** /**
* s3c_hsotg_phy_disable - disable platform phy dev * dwc2_hsotg_phy_disable - disable platform phy dev
* @hsotg: The driver state * @hsotg: The driver state
* *
* A wrapper for platform code responsible for controlling * A wrapper for platform code responsible for controlling
* low-level USB code * low-level USB code
*/ */
static void s3c_hsotg_phy_disable(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_phy_disable(struct dwc2_hsotg *hsotg)
{ {
struct platform_device *pdev = to_platform_device(hsotg->dev); struct platform_device *pdev = to_platform_device(hsotg->dev);
...@@ -2988,10 +2988,10 @@ static void s3c_hsotg_phy_disable(struct dwc2_hsotg *hsotg) ...@@ -2988,10 +2988,10 @@ static void s3c_hsotg_phy_disable(struct dwc2_hsotg *hsotg)
} }
/** /**
* s3c_hsotg_init - initalize the usb core * dwc2_hsotg_init - initalize the usb core
* @hsotg: The driver state * @hsotg: The driver state
*/ */
static void s3c_hsotg_init(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_init(struct dwc2_hsotg *hsotg)
{ {
u32 trdtim; u32 trdtim;
/* unmask subset of endpoint interrupts */ /* unmask subset of endpoint interrupts */
...@@ -3015,7 +3015,7 @@ static void s3c_hsotg_init(struct dwc2_hsotg *hsotg) ...@@ -3015,7 +3015,7 @@ static void s3c_hsotg_init(struct dwc2_hsotg *hsotg)
readl(hsotg->regs + GRXFSIZ), readl(hsotg->regs + GRXFSIZ),
readl(hsotg->regs + GNPTXFSIZ)); readl(hsotg->regs + GNPTXFSIZ));
s3c_hsotg_init_fifo(hsotg); dwc2_hsotg_init_fifo(hsotg);
/* set the PLL on, remove the HNP/SRP and set the PHY */ /* set the PLL on, remove the HNP/SRP and set the PHY */
trdtim = (hsotg->phyif == GUSBCFG_PHYIF8) ? 9 : 5; trdtim = (hsotg->phyif == GUSBCFG_PHYIF8) ? 9 : 5;
...@@ -3028,14 +3028,14 @@ static void s3c_hsotg_init(struct dwc2_hsotg *hsotg) ...@@ -3028,14 +3028,14 @@ static void s3c_hsotg_init(struct dwc2_hsotg *hsotg)
} }
/** /**
* s3c_hsotg_udc_start - prepare the udc for work * dwc2_hsotg_udc_start - prepare the udc for work
* @gadget: The usb gadget state * @gadget: The usb gadget state
* @driver: The usb gadget driver * @driver: The usb gadget driver
* *
* Perform initialization to prepare udc device and driver * Perform initialization to prepare udc device and driver
* to work. * to work.
*/ */
static int s3c_hsotg_udc_start(struct usb_gadget *gadget, static int dwc2_hsotg_udc_start(struct usb_gadget *gadget,
struct usb_gadget_driver *driver) struct usb_gadget_driver *driver)
{ {
struct dwc2_hsotg *hsotg = to_hsotg(gadget); struct dwc2_hsotg *hsotg = to_hsotg(gadget);
...@@ -3077,13 +3077,13 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget, ...@@ -3077,13 +3077,13 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
goto err; goto err;
} }
s3c_hsotg_phy_enable(hsotg); dwc2_hsotg_phy_enable(hsotg);
if (!IS_ERR_OR_NULL(hsotg->uphy)) if (!IS_ERR_OR_NULL(hsotg->uphy))
otg_set_peripheral(hsotg->uphy->otg, &hsotg->gadget); otg_set_peripheral(hsotg->uphy->otg, &hsotg->gadget);
spin_lock_irqsave(&hsotg->lock, flags); spin_lock_irqsave(&hsotg->lock, flags);
s3c_hsotg_init(hsotg); dwc2_hsotg_init(hsotg);
s3c_hsotg_core_init_disconnected(hsotg, false); dwc2_hsotg_core_init_disconnected(hsotg, false);
hsotg->enabled = 0; hsotg->enabled = 0;
spin_unlock_irqrestore(&hsotg->lock, flags); spin_unlock_irqrestore(&hsotg->lock, flags);
...@@ -3100,13 +3100,13 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget, ...@@ -3100,13 +3100,13 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
} }
/** /**
* s3c_hsotg_udc_stop - stop the udc * dwc2_hsotg_udc_stop - stop the udc
* @gadget: The usb gadget state * @gadget: The usb gadget state
* @driver: The usb gadget driver * @driver: The usb gadget driver
* *
* Stop udc hw block and stay tunned for future transmissions * Stop udc hw block and stay tunned for future transmissions
*/ */
static int s3c_hsotg_udc_stop(struct usb_gadget *gadget) static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget)
{ {
struct dwc2_hsotg *hsotg = to_hsotg(gadget); struct dwc2_hsotg *hsotg = to_hsotg(gadget);
unsigned long flags = 0; unsigned long flags = 0;
...@@ -3120,9 +3120,9 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget) ...@@ -3120,9 +3120,9 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget)
/* all endpoints should be shutdown */ /* all endpoints should be shutdown */
for (ep = 1; ep < hsotg->num_of_eps; ep++) { for (ep = 1; ep < hsotg->num_of_eps; ep++) {
if (hsotg->eps_in[ep]) if (hsotg->eps_in[ep])
s3c_hsotg_ep_disable(&hsotg->eps_in[ep]->ep); dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
if (hsotg->eps_out[ep]) if (hsotg->eps_out[ep])
s3c_hsotg_ep_disable(&hsotg->eps_out[ep]->ep); dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
} }
spin_lock_irqsave(&hsotg->lock, flags); spin_lock_irqsave(&hsotg->lock, flags);
...@@ -3135,7 +3135,7 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget) ...@@ -3135,7 +3135,7 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget)
if (!IS_ERR_OR_NULL(hsotg->uphy)) if (!IS_ERR_OR_NULL(hsotg->uphy))
otg_set_peripheral(hsotg->uphy->otg, NULL); otg_set_peripheral(hsotg->uphy->otg, NULL);
s3c_hsotg_phy_disable(hsotg); dwc2_hsotg_phy_disable(hsotg);
regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
...@@ -3147,24 +3147,24 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget) ...@@ -3147,24 +3147,24 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget)
} }
/** /**
* s3c_hsotg_gadget_getframe - read the frame number * dwc2_hsotg_gadget_getframe - read the frame number
* @gadget: The usb gadget state * @gadget: The usb gadget state
* *
* Read the {micro} frame number * Read the {micro} frame number
*/ */
static int s3c_hsotg_gadget_getframe(struct usb_gadget *gadget) static int dwc2_hsotg_gadget_getframe(struct usb_gadget *gadget)
{ {
return s3c_hsotg_read_frameno(to_hsotg(gadget)); return dwc2_hsotg_read_frameno(to_hsotg(gadget));
} }
/** /**
* s3c_hsotg_pullup - connect/disconnect the USB PHY * dwc2_hsotg_pullup - connect/disconnect the USB PHY
* @gadget: The usb gadget state * @gadget: The usb gadget state
* @is_on: Current state of the USB PHY * @is_on: Current state of the USB PHY
* *
* Connect/Disconnect the USB PHY pullup * Connect/Disconnect the USB PHY pullup
*/ */
static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on) static int dwc2_hsotg_pullup(struct usb_gadget *gadget, int is_on)
{ {
struct dwc2_hsotg *hsotg = to_hsotg(gadget); struct dwc2_hsotg *hsotg = to_hsotg(gadget);
unsigned long flags = 0; unsigned long flags = 0;
...@@ -3176,11 +3176,11 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on) ...@@ -3176,11 +3176,11 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on)
if (is_on) { if (is_on) {
clk_enable(hsotg->clk); clk_enable(hsotg->clk);
hsotg->enabled = 1; hsotg->enabled = 1;
s3c_hsotg_core_init_disconnected(hsotg, false); dwc2_hsotg_core_init_disconnected(hsotg, false);
s3c_hsotg_core_connect(hsotg); dwc2_hsotg_core_connect(hsotg);
} else { } else {
s3c_hsotg_core_disconnect(hsotg); dwc2_hsotg_core_disconnect(hsotg);
s3c_hsotg_disconnect(hsotg); dwc2_hsotg_disconnect(hsotg);
hsotg->enabled = 0; hsotg->enabled = 0;
clk_disable(hsotg->clk); clk_disable(hsotg->clk);
} }
...@@ -3192,7 +3192,7 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on) ...@@ -3192,7 +3192,7 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on)
return 0; return 0;
} }
static int s3c_hsotg_vbus_session(struct usb_gadget *gadget, int is_active) static int dwc2_hsotg_vbus_session(struct usb_gadget *gadget, int is_active)
{ {
struct dwc2_hsotg *hsotg = to_hsotg(gadget); struct dwc2_hsotg *hsotg = to_hsotg(gadget);
unsigned long flags; unsigned long flags;
...@@ -3211,12 +3211,12 @@ static int s3c_hsotg_vbus_session(struct usb_gadget *gadget, int is_active) ...@@ -3211,12 +3211,12 @@ static int s3c_hsotg_vbus_session(struct usb_gadget *gadget, int is_active)
} }
/* Kill any ep0 requests as controller will be reinitialized */ /* Kill any ep0 requests as controller will be reinitialized */
kill_all_requests(hsotg, hsotg->eps_out[0], -ECONNRESET); kill_all_requests(hsotg, hsotg->eps_out[0], -ECONNRESET);
s3c_hsotg_core_init_disconnected(hsotg, false); dwc2_hsotg_core_init_disconnected(hsotg, false);
if (hsotg->enabled) if (hsotg->enabled)
s3c_hsotg_core_connect(hsotg); dwc2_hsotg_core_connect(hsotg);
} else { } else {
s3c_hsotg_core_disconnect(hsotg); dwc2_hsotg_core_disconnect(hsotg);
s3c_hsotg_disconnect(hsotg); dwc2_hsotg_disconnect(hsotg);
} }
spin_unlock_irqrestore(&hsotg->lock, flags); spin_unlock_irqrestore(&hsotg->lock, flags);
...@@ -3224,13 +3224,13 @@ static int s3c_hsotg_vbus_session(struct usb_gadget *gadget, int is_active) ...@@ -3224,13 +3224,13 @@ static int s3c_hsotg_vbus_session(struct usb_gadget *gadget, int is_active)
} }
/** /**
* s3c_hsotg_vbus_draw - report bMaxPower field * dwc2_hsotg_vbus_draw - report bMaxPower field
* @gadget: The usb gadget state * @gadget: The usb gadget state
* @mA: Amount of current * @mA: Amount of current
* *
* Report how much power the device may consume to the phy. * Report how much power the device may consume to the phy.
*/ */
static int s3c_hsotg_vbus_draw(struct usb_gadget *gadget, unsigned mA) static int dwc2_hsotg_vbus_draw(struct usb_gadget *gadget, unsigned mA)
{ {
struct dwc2_hsotg *hsotg = to_hsotg(gadget); struct dwc2_hsotg *hsotg = to_hsotg(gadget);
...@@ -3239,17 +3239,17 @@ static int s3c_hsotg_vbus_draw(struct usb_gadget *gadget, unsigned mA) ...@@ -3239,17 +3239,17 @@ static int s3c_hsotg_vbus_draw(struct usb_gadget *gadget, unsigned mA)
return usb_phy_set_power(hsotg->uphy, mA); return usb_phy_set_power(hsotg->uphy, mA);
} }
static const struct usb_gadget_ops s3c_hsotg_gadget_ops = { static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = {
.get_frame = s3c_hsotg_gadget_getframe, .get_frame = dwc2_hsotg_gadget_getframe,
.udc_start = s3c_hsotg_udc_start, .udc_start = dwc2_hsotg_udc_start,
.udc_stop = s3c_hsotg_udc_stop, .udc_stop = dwc2_hsotg_udc_stop,
.pullup = s3c_hsotg_pullup, .pullup = dwc2_hsotg_pullup,
.vbus_session = s3c_hsotg_vbus_session, .vbus_session = dwc2_hsotg_vbus_session,
.vbus_draw = s3c_hsotg_vbus_draw, .vbus_draw = dwc2_hsotg_vbus_draw,
}; };
/** /**
* s3c_hsotg_initep - initialise a single endpoint * dwc2_hsotg_initep - initialise a single endpoint
* @hsotg: The device state. * @hsotg: The device state.
* @hs_ep: The endpoint to be initialised. * @hs_ep: The endpoint to be initialised.
* @epnum: The endpoint number * @epnum: The endpoint number
...@@ -3258,8 +3258,8 @@ static const struct usb_gadget_ops s3c_hsotg_gadget_ops = { ...@@ -3258,8 +3258,8 @@ static const struct usb_gadget_ops s3c_hsotg_gadget_ops = {
* creation) to give to the gadget driver. Setup the endpoint name, any * creation) to give to the gadget driver. Setup the endpoint name, any
* direction information and other state that may be required. * direction information and other state that may be required.
*/ */
static void s3c_hsotg_initep(struct dwc2_hsotg *hsotg, static void dwc2_hsotg_initep(struct dwc2_hsotg *hsotg,
struct s3c_hsotg_ep *hs_ep, struct dwc2_hsotg_ep *hs_ep,
int epnum, int epnum,
bool dir_in) bool dir_in)
{ {
...@@ -3287,7 +3287,7 @@ static void s3c_hsotg_initep(struct dwc2_hsotg *hsotg, ...@@ -3287,7 +3287,7 @@ static void s3c_hsotg_initep(struct dwc2_hsotg *hsotg,
hs_ep->parent = hsotg; hs_ep->parent = hsotg;
hs_ep->ep.name = hs_ep->name; hs_ep->ep.name = hs_ep->name;
usb_ep_set_maxpacket_limit(&hs_ep->ep, epnum ? 1024 : EP0_MPS_LIMIT); usb_ep_set_maxpacket_limit(&hs_ep->ep, epnum ? 1024 : EP0_MPS_LIMIT);
hs_ep->ep.ops = &s3c_hsotg_ep_ops; hs_ep->ep.ops = &dwc2_hsotg_ep_ops;
if (epnum == 0) { if (epnum == 0) {
hs_ep->ep.caps.type_control = true; hs_ep->ep.caps.type_control = true;
...@@ -3317,12 +3317,12 @@ static void s3c_hsotg_initep(struct dwc2_hsotg *hsotg, ...@@ -3317,12 +3317,12 @@ static void s3c_hsotg_initep(struct dwc2_hsotg *hsotg,
} }
/** /**
* s3c_hsotg_hw_cfg - read HW configuration registers * dwc2_hsotg_hw_cfg - read HW configuration registers
* @param: The device state * @param: The device state
* *
* Read the USB core HW configuration registers * Read the USB core HW configuration registers
*/ */
static int s3c_hsotg_hw_cfg(struct dwc2_hsotg *hsotg) static int dwc2_hsotg_hw_cfg(struct dwc2_hsotg *hsotg)
{ {
u32 cfg; u32 cfg;
u32 ep_type; u32 ep_type;
...@@ -3335,11 +3335,11 @@ static int s3c_hsotg_hw_cfg(struct dwc2_hsotg *hsotg) ...@@ -3335,11 +3335,11 @@ static int s3c_hsotg_hw_cfg(struct dwc2_hsotg *hsotg)
/* Add ep0 */ /* Add ep0 */
hsotg->num_of_eps++; hsotg->num_of_eps++;
hsotg->eps_in[0] = devm_kzalloc(hsotg->dev, sizeof(struct s3c_hsotg_ep), hsotg->eps_in[0] = devm_kzalloc(hsotg->dev, sizeof(struct dwc2_hsotg_ep),
GFP_KERNEL); GFP_KERNEL);
if (!hsotg->eps_in[0]) if (!hsotg->eps_in[0])
return -ENOMEM; return -ENOMEM;
/* Same s3c_hsotg_ep is used in both directions for ep0 */ /* Same dwc2_hsotg_ep is used in both directions for ep0 */
hsotg->eps_out[0] = hsotg->eps_in[0]; hsotg->eps_out[0] = hsotg->eps_in[0];
cfg = readl(hsotg->regs + GHWCFG1); cfg = readl(hsotg->regs + GHWCFG1);
...@@ -3348,14 +3348,14 @@ static int s3c_hsotg_hw_cfg(struct dwc2_hsotg *hsotg) ...@@ -3348,14 +3348,14 @@ static int s3c_hsotg_hw_cfg(struct dwc2_hsotg *hsotg)
/* Direction in or both */ /* Direction in or both */
if (!(ep_type & 2)) { if (!(ep_type & 2)) {
hsotg->eps_in[i] = devm_kzalloc(hsotg->dev, hsotg->eps_in[i] = devm_kzalloc(hsotg->dev,
sizeof(struct s3c_hsotg_ep), GFP_KERNEL); sizeof(struct dwc2_hsotg_ep), GFP_KERNEL);
if (!hsotg->eps_in[i]) if (!hsotg->eps_in[i])
return -ENOMEM; return -ENOMEM;
} }
/* Direction out or both */ /* Direction out or both */
if (!(ep_type & 1)) { if (!(ep_type & 1)) {
hsotg->eps_out[i] = devm_kzalloc(hsotg->dev, hsotg->eps_out[i] = devm_kzalloc(hsotg->dev,
sizeof(struct s3c_hsotg_ep), GFP_KERNEL); sizeof(struct dwc2_hsotg_ep), GFP_KERNEL);
if (!hsotg->eps_out[i]) if (!hsotg->eps_out[i])
return -ENOMEM; return -ENOMEM;
} }
...@@ -3375,10 +3375,10 @@ static int s3c_hsotg_hw_cfg(struct dwc2_hsotg *hsotg) ...@@ -3375,10 +3375,10 @@ static int s3c_hsotg_hw_cfg(struct dwc2_hsotg *hsotg)
} }
/** /**
* s3c_hsotg_dump - dump state of the udc * dwc2_hsotg_dump - dump state of the udc
* @param: The device state * @param: The device state
*/ */
static void s3c_hsotg_dump(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_dump(struct dwc2_hsotg *hsotg)
{ {
#ifdef DEBUG #ifdef DEBUG
struct device *dev = hsotg->dev; struct device *dev = hsotg->dev;
...@@ -3427,7 +3427,7 @@ static void s3c_hsotg_dump(struct dwc2_hsotg *hsotg) ...@@ -3427,7 +3427,7 @@ static void s3c_hsotg_dump(struct dwc2_hsotg *hsotg)
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
static void s3c_hsotg_of_probe(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_of_probe(struct dwc2_hsotg *hsotg)
{ {
struct device_node *np = hsotg->dev->of_node; struct device_node *np = hsotg->dev->of_node;
u32 len = 0; u32 len = 0;
...@@ -3468,7 +3468,7 @@ static void s3c_hsotg_of_probe(struct dwc2_hsotg *hsotg) ...@@ -3468,7 +3468,7 @@ static void s3c_hsotg_of_probe(struct dwc2_hsotg *hsotg)
&hsotg->g_np_g_tx_fifo_sz); &hsotg->g_np_g_tx_fifo_sz);
} }
#else #else
static inline void s3c_hsotg_of_probe(struct dwc2_hsotg *hsotg) { } static inline void dwc2_hsotg_of_probe(struct dwc2_hsotg *hsotg) { }
#endif #endif
/** /**
...@@ -3479,7 +3479,7 @@ static inline void s3c_hsotg_of_probe(struct dwc2_hsotg *hsotg) { } ...@@ -3479,7 +3479,7 @@ static inline void s3c_hsotg_of_probe(struct dwc2_hsotg *hsotg) { }
int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
{ {
struct device *dev = hsotg->dev; struct device *dev = hsotg->dev;
struct s3c_hsotg_plat *plat = dev->platform_data; struct dwc2_hsotg_plat *plat = dev->platform_data;
int epnum; int epnum;
int ret; int ret;
int i; int i;
...@@ -3488,14 +3488,14 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3488,14 +3488,14 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
/* Set default UTMI width */ /* Set default UTMI width */
hsotg->phyif = GUSBCFG_PHYIF16; hsotg->phyif = GUSBCFG_PHYIF16;
s3c_hsotg_of_probe(hsotg); dwc2_hsotg_of_probe(hsotg);
/* Initialize to legacy fifo configuration values */ /* Initialize to legacy fifo configuration values */
hsotg->g_rx_fifo_sz = 2048; hsotg->g_rx_fifo_sz = 2048;
hsotg->g_np_g_tx_fifo_sz = 1024; hsotg->g_np_g_tx_fifo_sz = 1024;
memcpy(&hsotg->g_tx_fifo_sz[1], p_tx_fifo, sizeof(p_tx_fifo)); memcpy(&hsotg->g_tx_fifo_sz[1], p_tx_fifo, sizeof(p_tx_fifo));
/* Device tree specific probe */ /* Device tree specific probe */
s3c_hsotg_of_probe(hsotg); dwc2_hsotg_of_probe(hsotg);
/* Dump fifo information */ /* Dump fifo information */
dev_dbg(dev, "NonPeriodic TXFIFO size: %d\n", dev_dbg(dev, "NonPeriodic TXFIFO size: %d\n",
hsotg->g_np_g_tx_fifo_sz); hsotg->g_np_g_tx_fifo_sz);
...@@ -3531,7 +3531,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3531,7 +3531,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
} }
hsotg->gadget.max_speed = USB_SPEED_HIGH; hsotg->gadget.max_speed = USB_SPEED_HIGH;
hsotg->gadget.ops = &s3c_hsotg_gadget_ops; hsotg->gadget.ops = &dwc2_hsotg_gadget_ops;
hsotg->gadget.name = dev_name(dev); hsotg->gadget.name = dev_name(dev);
if (hsotg->dr_mode == USB_DR_MODE_OTG) if (hsotg->dr_mode == USB_DR_MODE_OTG)
hsotg->gadget.is_otg = 1; hsotg->gadget.is_otg = 1;
...@@ -3548,7 +3548,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3548,7 +3548,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
/* regulators */ /* regulators */
for (i = 0; i < ARRAY_SIZE(hsotg->supplies); i++) for (i = 0; i < ARRAY_SIZE(hsotg->supplies); i++)
hsotg->supplies[i].supply = s3c_hsotg_supply_names[i]; hsotg->supplies[i].supply = dwc2_hsotg_supply_names[i];
ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies), ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies),
hsotg->supplies); hsotg->supplies);
...@@ -3566,7 +3566,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3566,7 +3566,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
} }
/* usb phy enable */ /* usb phy enable */
s3c_hsotg_phy_enable(hsotg); dwc2_hsotg_phy_enable(hsotg);
/* /*
* Force Device mode before initialization. * Force Device mode before initialization.
...@@ -3581,14 +3581,14 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3581,14 +3581,14 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
*/ */
msleep(25); msleep(25);
s3c_hsotg_corereset(hsotg); dwc2_hsotg_corereset(hsotg);
ret = s3c_hsotg_hw_cfg(hsotg); ret = dwc2_hsotg_hw_cfg(hsotg);
if (ret) { if (ret) {
dev_err(hsotg->dev, "Hardware configuration failed: %d\n", ret); dev_err(hsotg->dev, "Hardware configuration failed: %d\n", ret);
goto err_clk; goto err_clk;
} }
s3c_hsotg_init(hsotg); dwc2_hsotg_init(hsotg);
/* Switch back to default configuration */ /* Switch back to default configuration */
__bic32(hsotg->regs + GUSBCFG, GUSBCFG_FORCEDEVMODE); __bic32(hsotg->regs + GUSBCFG, GUSBCFG_FORCEDEVMODE);
...@@ -3609,10 +3609,10 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3609,10 +3609,10 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
goto err_supplies; goto err_supplies;
} }
ret = devm_request_irq(hsotg->dev, irq, s3c_hsotg_irq, IRQF_SHARED, ret = devm_request_irq(hsotg->dev, irq, dwc2_hsotg_irq, IRQF_SHARED,
dev_name(hsotg->dev), hsotg); dev_name(hsotg->dev), hsotg);
if (ret < 0) { if (ret < 0) {
s3c_hsotg_phy_disable(hsotg); dwc2_hsotg_phy_disable(hsotg);
clk_disable_unprepare(hsotg->clk); clk_disable_unprepare(hsotg->clk);
regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),
hsotg->supplies); hsotg->supplies);
...@@ -3635,7 +3635,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3635,7 +3635,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
/* allocate EP0 request */ /* allocate EP0 request */
hsotg->ctrl_req = s3c_hsotg_ep_alloc_request(&hsotg->eps_out[0]->ep, hsotg->ctrl_req = dwc2_hsotg_ep_alloc_request(&hsotg->eps_out[0]->ep,
GFP_KERNEL); GFP_KERNEL);
if (!hsotg->ctrl_req) { if (!hsotg->ctrl_req) {
dev_err(dev, "failed to allocate ctrl req\n"); dev_err(dev, "failed to allocate ctrl req\n");
...@@ -3646,15 +3646,15 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3646,15 +3646,15 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
/* initialise the endpoints now the core has been initialised */ /* initialise the endpoints now the core has been initialised */
for (epnum = 0; epnum < hsotg->num_of_eps; epnum++) { for (epnum = 0; epnum < hsotg->num_of_eps; epnum++) {
if (hsotg->eps_in[epnum]) if (hsotg->eps_in[epnum])
s3c_hsotg_initep(hsotg, hsotg->eps_in[epnum], dwc2_hsotg_initep(hsotg, hsotg->eps_in[epnum],
epnum, 1); epnum, 1);
if (hsotg->eps_out[epnum]) if (hsotg->eps_out[epnum])
s3c_hsotg_initep(hsotg, hsotg->eps_out[epnum], dwc2_hsotg_initep(hsotg, hsotg->eps_out[epnum],
epnum, 0); epnum, 0);
} }
/* disable power and clock */ /* disable power and clock */
s3c_hsotg_phy_disable(hsotg); dwc2_hsotg_phy_disable(hsotg);
ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),
hsotg->supplies); hsotg->supplies);
...@@ -3667,12 +3667,12 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3667,12 +3667,12 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
if (ret) if (ret)
goto err_supplies; goto err_supplies;
s3c_hsotg_dump(hsotg); dwc2_hsotg_dump(hsotg);
return 0; return 0;
err_supplies: err_supplies:
s3c_hsotg_phy_disable(hsotg); dwc2_hsotg_phy_disable(hsotg);
err_clk: err_clk:
clk_disable_unprepare(hsotg->clk); clk_disable_unprepare(hsotg->clk);
...@@ -3680,10 +3680,10 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) ...@@ -3680,10 +3680,10 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
} }
/** /**
* s3c_hsotg_remove - remove function for hsotg driver * dwc2_hsotg_remove - remove function for hsotg driver
* @pdev: The platform information for the driver * @pdev: The platform information for the driver
*/ */
int s3c_hsotg_remove(struct dwc2_hsotg *hsotg) int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg)
{ {
usb_del_gadget_udc(&hsotg->gadget); usb_del_gadget_udc(&hsotg->gadget);
clk_disable_unprepare(hsotg->clk); clk_disable_unprepare(hsotg->clk);
...@@ -3691,7 +3691,7 @@ int s3c_hsotg_remove(struct dwc2_hsotg *hsotg) ...@@ -3691,7 +3691,7 @@ int s3c_hsotg_remove(struct dwc2_hsotg *hsotg)
return 0; return 0;
} }
int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg) int dwc2_hsotg_suspend(struct dwc2_hsotg *hsotg)
{ {
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
...@@ -3709,18 +3709,18 @@ int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg) ...@@ -3709,18 +3709,18 @@ int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg)
spin_lock_irqsave(&hsotg->lock, flags); spin_lock_irqsave(&hsotg->lock, flags);
if (hsotg->enabled) if (hsotg->enabled)
s3c_hsotg_core_disconnect(hsotg); dwc2_hsotg_core_disconnect(hsotg);
s3c_hsotg_disconnect(hsotg); dwc2_hsotg_disconnect(hsotg);
hsotg->gadget.speed = USB_SPEED_UNKNOWN; hsotg->gadget.speed = USB_SPEED_UNKNOWN;
spin_unlock_irqrestore(&hsotg->lock, flags); spin_unlock_irqrestore(&hsotg->lock, flags);
s3c_hsotg_phy_disable(hsotg); dwc2_hsotg_phy_disable(hsotg);
for (ep = 0; ep < hsotg->num_of_eps; ep++) { for (ep = 0; ep < hsotg->num_of_eps; ep++) {
if (hsotg->eps_in[ep]) if (hsotg->eps_in[ep])
s3c_hsotg_ep_disable(&hsotg->eps_in[ep]->ep); dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
if (hsotg->eps_out[ep]) if (hsotg->eps_out[ep])
s3c_hsotg_ep_disable(&hsotg->eps_out[ep]->ep); dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
} }
ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),
...@@ -3733,7 +3733,7 @@ int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg) ...@@ -3733,7 +3733,7 @@ int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg)
return ret; return ret;
} }
int s3c_hsotg_resume(struct dwc2_hsotg *hsotg) int dwc2_hsotg_resume(struct dwc2_hsotg *hsotg)
{ {
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
...@@ -3751,12 +3751,12 @@ int s3c_hsotg_resume(struct dwc2_hsotg *hsotg) ...@@ -3751,12 +3751,12 @@ int s3c_hsotg_resume(struct dwc2_hsotg *hsotg)
ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies),
hsotg->supplies); hsotg->supplies);
s3c_hsotg_phy_enable(hsotg); dwc2_hsotg_phy_enable(hsotg);
spin_lock_irqsave(&hsotg->lock, flags); spin_lock_irqsave(&hsotg->lock, flags);
s3c_hsotg_core_init_disconnected(hsotg, false); dwc2_hsotg_core_init_disconnected(hsotg, false);
if (hsotg->enabled) if (hsotg->enabled)
s3c_hsotg_core_connect(hsotg); dwc2_hsotg_core_connect(hsotg);
spin_unlock_irqrestore(&hsotg->lock, flags); spin_unlock_irqrestore(&hsotg->lock, flags);
} }
mutex_unlock(&hsotg->init_mutex); mutex_unlock(&hsotg->init_mutex);
......
drivers/usb/dwc2/hcd.c
View file @ 1f91b4cc
...@@ -1382,8 +1382,8 @@ static void dwc2_conn_id_status_change(struct work_struct *work) ...@@ -1382,8 +1382,8 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
hsotg->op_state = OTG_STATE_B_PERIPHERAL; hsotg->op_state = OTG_STATE_B_PERIPHERAL;
dwc2_core_init(hsotg, false, -1); dwc2_core_init(hsotg, false, -1);
dwc2_enable_global_interrupts(hsotg); dwc2_enable_global_interrupts(hsotg);
s3c_hsotg_core_init_disconnected(hsotg, false); dwc2_hsotg_core_init_disconnected(hsotg, false);
s3c_hsotg_core_connect(hsotg); dwc2_hsotg_core_connect(hsotg);
} else { } else {
/* A-Device connector (Host Mode) */ /* A-Device connector (Host Mode) */
dev_dbg(hsotg->dev, "connId A\n"); dev_dbg(hsotg->dev, "connId A\n");
......
drivers/usb/dwc2/platform.c
View file @ 1f91b4cc
...@@ -130,7 +130,7 @@ static int dwc2_driver_remove(struct platform_device *dev) ...@@ -130,7 +130,7 @@ static int dwc2_driver_remove(struct platform_device *dev)
if (hsotg->hcd_enabled) if (hsotg->hcd_enabled)
dwc2_hcd_remove(hsotg); dwc2_hcd_remove(hsotg);
if (hsotg->gadget_enabled) if (hsotg->gadget_enabled)
s3c_hsotg_remove(hsotg); dwc2_hsotg_remove(hsotg);
return 0; return 0;
} }
...@@ -269,7 +269,7 @@ static int dwc2_driver_probe(struct platform_device *dev) ...@@ -269,7 +269,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
retval = dwc2_hcd_init(hsotg, irq); retval = dwc2_hcd_init(hsotg, irq);
if (retval) { if (retval) {
if (hsotg->gadget_enabled) if (hsotg->gadget_enabled)
s3c_hsotg_remove(hsotg); dwc2_hsotg_remove(hsotg);
return retval; return retval;
} }
hsotg->hcd_enabled = 1; hsotg->hcd_enabled = 1;
...@@ -288,7 +288,7 @@ static int __maybe_unused dwc2_suspend(struct device *dev) ...@@ -288,7 +288,7 @@ static int __maybe_unused dwc2_suspend(struct device *dev)
int ret = 0; int ret = 0;
if (dwc2_is_device_mode(dwc2)) { if (dwc2_is_device_mode(dwc2)) {
ret = s3c_hsotg_suspend(dwc2); ret = dwc2_hsotg_suspend(dwc2);
} else { } else {
if (dwc2->lx_state == DWC2_L0) if (dwc2->lx_state == DWC2_L0)
return 0; return 0;
...@@ -305,7 +305,7 @@ static int __maybe_unused dwc2_resume(struct device *dev) ...@@ -305,7 +305,7 @@ static int __maybe_unused dwc2_resume(struct device *dev)
int ret = 0; int ret = 0;
if (dwc2_is_device_mode(dwc2)) { if (dwc2_is_device_mode(dwc2)) {
ret = s3c_hsotg_resume(dwc2); ret = dwc2_hsotg_resume(dwc2);
} else { } else {
phy_power_on(dwc2->phy); phy_power_on(dwc2->phy);
phy_init(dwc2->phy); phy_init(dwc2->phy);
......
include/linux/platform_data/s3c-hsotg.h
View file @ 1f91b4cc
...@@ -17,19 +17,19 @@ ...@@ -17,19 +17,19 @@
struct platform_device; struct platform_device;
enum s3c_hsotg_dmamode { enum dwc2_hsotg_dmamode {
S3C_HSOTG_DMA_NONE, /* do not use DMA at-all */ S3C_HSOTG_DMA_NONE, /* do not use DMA at-all */
S3C_HSOTG_DMA_ONLY, /* always use DMA */ S3C_HSOTG_DMA_ONLY, /* always use DMA */
S3C_HSOTG_DMA_DRV, /* DMA is chosen by driver */ S3C_HSOTG_DMA_DRV, /* DMA is chosen by driver */
}; };
/** /**
* struct s3c_hsotg_plat - platform data for high-speed otg/udc * struct dwc2_hsotg_plat - platform data for high-speed otg/udc
* @dma: Whether to use DMA or not. * @dma: Whether to use DMA or not.
* @is_osc: The clock source is an oscillator, not a crystal * @is_osc: The clock source is an oscillator, not a crystal
*/ */
struct s3c_hsotg_plat { struct dwc2_hsotg_plat {
enum s3c_hsotg_dmamode dma; enum dwc2_hsotg_dmamode dma;
unsigned int is_osc:1; unsigned int is_osc:1;
int phy_type; int phy_type;
...@@ -37,6 +37,6 @@ struct s3c_hsotg_plat { ...@@ -37,6 +37,6 @@ struct s3c_hsotg_plat {
int (*phy_exit)(struct platform_device *pdev, int type); int (*phy_exit)(struct platform_device *pdev, int type);
}; };
extern void s3c_hsotg_set_platdata(struct s3c_hsotg_plat *pd); extern void dwc2_hsotg_set_platdata(struct dwc2_hsotg_plat *pd);
#endif /* __LINUX_USB_S3C_HSOTG_H */ #endif /* __LINUX_USB_S3C_HSOTG_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7