Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-s3c64xx/mach-crag6410.c

+2 −2
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static const struct gpio_led_platform_data gpio_leds_pdata = { 
	.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)

{
@@ -835,7 +835,7 @@ static void __init crag6410_machine_init(void) 
	s3c_i2c0_set_platdata(&i2c0_pdata);

	s3c_i2c1_set_platdata(&i2c1_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(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));

arch/arm/mach-s3c64xx/mach-smartq.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{
@@ -382,7 +382,7 @@ void __init smartq_map_io(void) 
void __init smartq_machine_init(void)

{

	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_sdhci1_set_platdata(&smartq_internal_hsmmc_pdata);

	s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata);

arch/arm/mach-s3c64xx/mach-smdk6410.c

+2 −2
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static struct platform_pwm_backlight_data smdk6410_bl_data = { 
	.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)

{
@@ -659,7 +659,7 @@ static void __init smdk6410_machine_init(void) 
	s3c_i2c0_set_platdata(NULL);

	s3c_i2c1_set_platdata(NULL);

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

arch/arm/plat-samsung/devs.c

+3 −3
Original line number Diff line number Diff line
@@ -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);



	if (!npd->phy_init)

drivers/usb/dwc2/core.h

+26 −26
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ static inline void do_write(u32 value, void *addr) 
/* Maximum number of Endpoints/HostChannels */

#define MAX_EPS_CHANNELS	16



/* s3c-hsotg declarations */

static const char * const s3c_hsotg_supply_names[] = {

/* dwc2-hsotg declarations */

static const char * const dwc2_hsotg_supply_names[] = {

	"vusb_d",               /* digital USB supply, 1.2V */

	"vusb_a",               /* analog USB supply, 1.1V */

};
@@ -85,10 +85,10 @@ static const char * const s3c_hsotg_supply_names[] = { 
#define EP0_MPS_LIMIT   64



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.

 * @name: The driver generated name for the endpoint.

 * @queue: Queue of requests for this endpoint.
@@ -127,11 +127,11 @@ struct s3c_hsotg_req; 
 * as in shared-fifo mode periodic in acts like a single-frame packet

 * buffer than a fifo)

 */

struct s3c_hsotg_ep {

struct dwc2_hsotg_ep {

	struct usb_ep           ep;

	struct list_head        queue;

	struct dwc2_hsotg       *parent;

	struct s3c_hsotg_req    *req;

	struct dwc2_hsotg_req    *req;

	struct dentry           *debugfs;



	unsigned long           total_data;
@@ -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

 * @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.

 */

struct s3c_hsotg_req {

struct dwc2_hsotg_req {

	struct usb_request      req;

	struct list_head        queue;

	void *saved_req_buf;
@@ -693,7 +693,7 @@ struct dwc2_hsotg { 


	struct phy *phy;

	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;

	struct mutex init_mutex;
@@ -796,7 +796,7 @@ struct dwc2_hsotg { 
#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)

	/* Gadget structures */

	struct usb_gadget_driver *driver;

	struct s3c_hsotg_plat *plat;

	struct dwc2_hsotg_plat *plat;



	u32 phyif;

	int fifo_mem;
@@ -815,8 +815,8 @@ struct dwc2_hsotg { 
	unsigned int enabled:1;

	unsigned int connected:1;

	unsigned long last_rst;

	struct s3c_hsotg_ep *eps_in[MAX_EPS_CHANNELS];

	struct s3c_hsotg_ep *eps_out[MAX_EPS_CHANNELS];

	struct dwc2_hsotg_ep *eps_in[MAX_EPS_CHANNELS];

	struct dwc2_hsotg_ep *eps_out[MAX_EPS_CHANNELS];

	u32 g_using_dma;

	u32 g_rx_fifo_sz;

	u32 g_np_g_tx_fifo_sz;
@@ -1104,30 +1104,30 @@ extern u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg); 


/* Gadget defines */

#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 s3c_hsotg_suspend(struct dwc2_hsotg *dwc2);

extern int s3c_hsotg_resume(struct dwc2_hsotg *dwc2);

extern int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg);

extern int dwc2_hsotg_suspend(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 void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,

extern void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,

		bool reset);

extern void s3c_hsotg_core_connect(struct dwc2_hsotg *hsotg);

extern void s3c_hsotg_disconnect(struct dwc2_hsotg *dwc2);

extern int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode);

extern void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg);

extern void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2);

extern int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode);

#define dwc2_is_device_connected(hsotg) (hsotg->connected)

#else

static inline int s3c_hsotg_remove(struct dwc2_hsotg *dwc2)

static inline int dwc2_hsotg_remove(struct dwc2_hsotg *dwc2)

{ return 0; }

static inline int s3c_hsotg_suspend(struct dwc2_hsotg *dwc2)

static inline int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2)

{ return 0; }

static inline int s3c_hsotg_resume(struct dwc2_hsotg *dwc2)

static inline int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2)

{ return 0; }

static inline int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)

{ 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) {}

static inline void s3c_hsotg_core_connect(struct dwc2_hsotg *hsotg) {}

static inline void s3c_hsotg_disconnect(struct dwc2_hsotg *dwc2) {}

static inline int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg,

static inline void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg) {}

static inline void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2) {}

static inline int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg,

							int testmode)

{ return 0; }

#define dwc2_is_device_connected(hsotg) (0)