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

Commit 0f91349b authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman
Browse files

usb: gadget: convert all users to the new udc infrastructure 



peripheral drivers are using usb_add_gadget()/usb_del_gadget() to
register/unregister to the udc-core.

The udc-core will take the first available gadget driver and attach
function driver which is calling usb_gadget_register_driver(). This is
the same behaviour we have right now.

Only dummy_hcd was tested, the others were compiled tested.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Anton Tikhomirov <av.tikhomirov@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Dan Carpenter <error27@gmail.com>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Pavankumar Kondeti <pkondeti@codeaurora.org>
Cc: Roy Huang <roy.huang@analog.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Cc: Xiaochen Shen <xiaochen.shen@intel.com>
Cc: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Cc: Yuan-Hsin Chen <yhchen@faraday-tech.com>
Cc: cxie4 <cxie4@marvell.com>
Cc: linux-geode@lists.infradead.org
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2ccea03a

drivers/usb/gadget/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#

ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG



obj-$(CONFIG_USB_GADGET)	+= udc-core.o

obj-$(CONFIG_USB_DUMMY_HCD)	+= dummy_hcd.o

obj-$(CONFIG_USB_NET2272)	+= net2272.o

obj-$(CONFIG_USB_NET2280)	+= net2280.o

drivers/usb/gadget/amd5536udc.c

+13 −5
Original line number Diff line number Diff line
@@ -1438,10 +1438,15 @@ static int udc_wakeup(struct usb_gadget *gadget) 
	return 0;

}



static int amd5536_start(struct usb_gadget_driver *driver,

		int (*bind)(struct usb_gadget *));

static int amd5536_stop(struct usb_gadget_driver *driver);

/* gadget operations */

static const struct usb_gadget_ops udc_ops = {

	.wakeup		= udc_wakeup,

	.get_frame	= udc_get_frame,

	.start		= amd5536_start,

	.stop		= amd5536_stop,

};



/* Setups endpoint parameters, adds endpoints to linked list */
@@ -1955,7 +1960,7 @@ static int setup_ep0(struct udc *dev) 
}



/* Called by gadget driver to register itself */

int usb_gadget_probe_driver(struct usb_gadget_driver *driver,

static int amd5536_start(struct usb_gadget_driver *driver,

		int (*bind)(struct usb_gadget *))

{

	struct udc		*dev = udc;
@@ -2002,7 +2007,6 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, 


	return 0;

}

EXPORT_SYMBOL(usb_gadget_probe_driver);



/* shutdown requests and disconnect from gadget */

static void
@@ -2027,7 +2031,7 @@ __acquires(dev->lock) 
}



/* Called by gadget driver to unregister itself */

int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)

static int amd5536_stop(struct usb_gadget_driver *driver)

{

	struct udc	*dev = udc;

	unsigned long	flags;
@@ -2057,8 +2061,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) 


	return 0;

}

EXPORT_SYMBOL(usb_gadget_unregister_driver);





/* Clear pending NAK bits */

static void udc_process_cnak_queue(struct udc *dev)
@@ -3134,6 +3136,7 @@ static void udc_pci_remove(struct pci_dev *pdev) 


	dev = pci_get_drvdata(pdev);



	usb_del_gadget_udc(&udc->gadget);

	/* gadget driver must not be registered */

	BUG_ON(dev->driver != NULL);
@@ -3382,8 +3385,13 @@ static int udc_probe(struct udc *dev) 
		"driver version: %s(for Geode5536 B1)\n", tmp);

	udc = dev;



	retval = usb_add_gadget_udc(&udc->pdev->dev, &dev->gadget);

	if (retval)

		goto finished;



	retval = device_register(&dev->gadget.dev);

	if (retval) {

		usb_del_gadget_udc(&dev->gadget);

		put_device(&dev->gadget.dev);

		goto finished;

	}

drivers/usb/gadget/at91_udc.c

+15 −5
Original line number Diff line number Diff line
@@ -985,12 +985,18 @@ static int at91_set_selfpowered(struct usb_gadget *gadget, int is_on) 
	return 0;

}



static int at91_start(struct usb_gadget_driver *driver,

		int (*bind)(struct usb_gadget *));

static int at91_stop(struct usb_gadget_driver *driver);



static const struct usb_gadget_ops at91_udc_ops = {

	.get_frame		= at91_get_frame,

	.wakeup			= at91_wakeup,

	.set_selfpowered	= at91_set_selfpowered,

	.vbus_session		= at91_vbus_session,

	.pullup			= at91_pullup,

	.start			= at91_start,

	.stop			= at91_stop,



	/*

	 * VBUS-powered devices may also also want to support bigger
@@ -1628,7 +1634,7 @@ static void at91_vbus_timer(unsigned long data) 
		schedule_work(&udc->vbus_timer_work);

}



int usb_gadget_probe_driver(struct usb_gadget_driver *driver,

static int at91_start(struct usb_gadget_driver *driver,

		int (*bind)(struct usb_gadget *))

{

	struct at91_udc	*udc = &controller;
@@ -1672,9 +1678,8 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, 
	DBG("bound to %s\n", driver->driver.name);

	return 0;

}

EXPORT_SYMBOL(usb_gadget_probe_driver);



int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)

static int at91_stop(struct usb_gadget_driver *driver)

{

	struct at91_udc *udc = &controller;

	unsigned long	flags;
@@ -1696,7 +1701,6 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver) 
	DBG("unbound from %s\n", driver->driver.name);

	return 0;

}

EXPORT_SYMBOL (usb_gadget_unregister_driver);



/*-------------------------------------------------------------------------*/
@@ -1854,13 +1858,18 @@ static int __init at91udc_probe(struct platform_device *pdev) 
		DBG("no VBUS detection, assuming always-on\n");

		udc->vbus = 1;

	}

	retval = usb_add_gadget_udc(dev, &udc->gadget);

	if (retval)

		goto fail4;

	dev_set_drvdata(dev, udc);

	device_init_wakeup(dev, 1);

	create_debug_file(udc);



	INFO("%s version %s\n", driver_name, DRIVER_VERSION);

	return 0;



fail4:

	if (udc->board.vbus_pin > 0 && !udc->board.vbus_polled)

		free_irq(udc->board.vbus_pin, udc);

fail3:

	if (udc->board.vbus_pin > 0)

		gpio_free(udc->board.vbus_pin);
@@ -1887,6 +1896,7 @@ static int __exit at91udc_remove(struct platform_device *pdev) 


	DBG("remove\n");



	usb_del_gadget_udc(&udc->gadget);

	if (udc->driver)

		return -EBUSY;

drivers/usb/gadget/atmel_usba_udc.c

+22 −4
Original line number Diff line number Diff line
@@ -1007,10 +1007,16 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered) 
	return 0;

}



static int atmel_usba_start(struct usb_gadget_driver *driver,

		int (*bind)(struct usb_gadget *));

static int atmel_usba_stop(struct usb_gadget_driver *driver);



static const struct usb_gadget_ops usba_udc_ops = {

	.get_frame		= usba_udc_get_frame,

	.wakeup			= usba_udc_wakeup,

	.set_selfpowered	= usba_udc_set_selfpowered,

	.start			= atmel_usba_start,

	.stop			= atmel_usba_stop,

};



static struct usb_endpoint_descriptor usba_ep0_desc = {
@@ -1789,7 +1795,7 @@ static irqreturn_t usba_vbus_irq(int irq, void *devid) 
	return IRQ_HANDLED;

}



int usb_gadget_probe_driver(struct usb_gadget_driver *driver,

static int atmel_usba_start(struct usb_gadget_driver *driver,

		int (*bind)(struct usb_gadget *))

{

	struct usba_udc *udc = &the_udc;
@@ -1842,9 +1848,8 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, 
	udc->gadget.dev.driver = NULL;

	return ret;

}

EXPORT_SYMBOL(usb_gadget_probe_driver);



int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)

static int atmel_usba_stop(struct usb_gadget_driver *driver)

{

	struct usba_udc *udc = &the_udc;

	unsigned long flags;
@@ -1880,7 +1885,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) 


	return 0;

}

EXPORT_SYMBOL(usb_gadget_unregister_driver);



static int __init usba_udc_probe(struct platform_device *pdev)

{
@@ -2021,12 +2025,24 @@ static int __init usba_udc_probe(struct platform_device *pdev) 
		}

	}



	ret = usb_add_gadget_udc(&pdev->dev, &udc->gadget);

	if (ret)

		goto err_add_udc;



	usba_init_debugfs(udc);

	for (i = 1; i < pdata->num_ep; i++)

		usba_ep_init_debugfs(udc, &usba_ep[i]);



	return 0;



err_add_udc:

	if (gpio_is_valid(pdata->vbus_pin)) {

		free_irq(gpio_to_irq(udc->vbus_pin), udc);

		gpio_free(udc->vbus_pin);

	}



	device_unregister(&udc->gadget.dev);



err_device_add:

	free_irq(irq, udc);

err_request_irq:
@@ -2053,6 +2069,8 @@ static int __exit usba_udc_remove(struct platform_device *pdev) 


	udc = platform_get_drvdata(pdev);



	usb_del_gadget_udc(&udc->gadget);



	for (i = 1; i < pdata->num_ep; i++)

		usba_ep_cleanup_debugfs(&usba_ep[i]);

	usba_cleanup_debugfs(udc);

drivers/usb/gadget/ci13xxx_udc.c

+29 −14
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ static void dbg_print(u8 addr, const char *name, int status, const char *extra) 
	stamp = stamp * 1000000 + tval.tv_usec;



	scnprintf(dbg_data.buf[dbg_data.idx], DBG_DATA_MSG,

		  "%04X\t %02X %-7.7s %4i \t%s\n",

		  "%04X\t? %02X %-7.7s %4i ?\t%s\n",

		  stamp, addr, name, status, extra);



	dbg_inc(&dbg_data.idx);
@@ -865,7 +865,7 @@ static void dbg_print(u8 addr, const char *name, int status, const char *extra) 
	write_unlock_irqrestore(&dbg_data.lck, flags);



	if (dbg_data.tty != 0)

		pr_notice("%04X\t %02X %-7.7s %4i \t%s\n",

		pr_notice("%04X\t? %02X %-7.7s %4i ?\t%s\n",

			  stamp, addr, name, status, extra);

}
@@ -1025,15 +1025,15 @@ static ssize_t show_inters(struct device *dev, struct device_attribute *attr, 


	n += scnprintf(buf + n, PAGE_SIZE - n, "*test = %d\n",

		       isr_statistics.test);

	n += scnprintf(buf + n, PAGE_SIZE - n, " ui  = %d\n",

	n += scnprintf(buf + n, PAGE_SIZE - n, "? ui  = %d\n",

		       isr_statistics.ui);

	n += scnprintf(buf + n, PAGE_SIZE - n, " uei = %d\n",

	n += scnprintf(buf + n, PAGE_SIZE - n, "? uei = %d\n",

		       isr_statistics.uei);

	n += scnprintf(buf + n, PAGE_SIZE - n, " pci = %d\n",

	n += scnprintf(buf + n, PAGE_SIZE - n, "? pci = %d\n",

		       isr_statistics.pci);

	n += scnprintf(buf + n, PAGE_SIZE - n, " uri = %d\n",

	n += scnprintf(buf + n, PAGE_SIZE - n, "? uri = %d\n",

		       isr_statistics.uri);

	n += scnprintf(buf + n, PAGE_SIZE - n, " sli = %d\n",

	n += scnprintf(buf + n, PAGE_SIZE - n, "? sli = %d\n",

		       isr_statistics.sli);

	n += scnprintf(buf + n, PAGE_SIZE - n, "*none = %d\n",

		       isr_statistics.none);
@@ -2515,6 +2515,9 @@ static int ci13xxx_vbus_draw(struct usb_gadget *_gadget, unsigned mA) 
	return -ENOTSUPP;

}



static int ci13xxx_start(struct usb_gadget_driver *driver,

		int (*bind)(struct usb_gadget *));

static int ci13xxx_stop(struct usb_gadget_driver *driver);

/**

 * Device operations part of the API to the USB controller hardware,

 * which don't involve endpoints (or i/o)
@@ -2524,17 +2527,19 @@ static const struct usb_gadget_ops usb_gadget_ops = { 
	.vbus_session	= ci13xxx_vbus_session,

	.wakeup		= ci13xxx_wakeup,

	.vbus_draw	= ci13xxx_vbus_draw,

	.start		= ci13xxx_start,

	.stop		= ci13xxx_stop,

};



/**

 * usb_gadget_probe_driver: register a gadget driver

 * ci13xxx_start: register a gadget driver

 * @driver: the driver being registered

 * @bind: the driver's bind callback

 *

 * Check usb_gadget_probe_driver() at <linux/usb/gadget.h> for details.

 * Check ci13xxx_start() at <linux/usb/gadget.h> for details.

 * Interrupts are enabled here.

 */

int usb_gadget_probe_driver(struct usb_gadget_driver *driver,

static int ci13xxx_start(struct usb_gadget_driver *driver,

		int (*bind)(struct usb_gadget *))

{

	struct ci13xxx *udc = _udc;
@@ -2657,14 +2662,13 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, 
	spin_unlock_irqrestore(udc->lock, flags);

	return retval;

}

EXPORT_SYMBOL(usb_gadget_probe_driver);



/**

 * usb_gadget_unregister_driver: unregister a gadget driver

 * ci13xxx_stop: unregister a gadget driver

 *

 * Check usb_gadget_unregister_driver() at "usb_gadget.h" for details

 */

int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)

static int ci13xxx_stop(struct usb_gadget_driver *driver)

{

	struct ci13xxx *udc = _udc;

	unsigned long i, flags;
@@ -2726,7 +2730,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) 


	return 0;

}

EXPORT_SYMBOL(usb_gadget_unregister_driver);



/******************************************************************************

 * BUS block
@@ -2901,12 +2904,23 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, 
		if (retval)

			goto remove_dbg;

	}



	retval = usb_add_gadget_udc(dev, &udc->gadget);

	if (retval)

		goto remove_trans;



	pm_runtime_no_callbacks(&udc->gadget.dev);

	pm_runtime_enable(&udc->gadget.dev);



	_udc = udc;

	return retval;



remove_trans:

	if (udc->transceiver) {

		otg_set_peripheral(udc->transceiver, &udc->gadget);

		otg_put_transceiver(udc->transceiver);

	}



	err("error = %i", retval);

remove_dbg:

#ifdef CONFIG_USB_GADGET_DEBUG_FILES
@@ -2936,6 +2950,7 @@ static void udc_remove(void) 
		err("EINVAL");

		return;

	}

	usb_del_gadget_udc(&udc->gadget);



	if (udc->transceiver) {

		otg_set_peripheral(udc->transceiver, &udc->gadget);