From bdaa38477e1fbd11e38bb99865e2e77348bebf5f Mon Sep 17 00:00:00 2001 From: Ido Shayevitz Date: Tue, 26 Jun 2012 15:21:09 +0300 Subject: [PATCH] usb: gadget: ci13xxx_udc: Set usb_core_id if exists Read usb_core_id from platfrom data. Change-Id: Ie2b57a12b2d97668efd097e0c55be630e98cc209 Signed-off-by: Ido Shayevitz --- drivers/usb/gadget/ci13xxx_udc.c | 5 +++++ drivers/usb/gadget/ci13xxx_udc.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c index 862fee16f37..aa33ada71a4 100644 --- a/drivers/usb/gadget/ci13xxx_udc.c +++ b/drivers/usb/gadget/ci13xxx_udc.c @@ -3332,6 +3332,8 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, void __iomem *regs) { struct ci13xxx *udc; + struct ci13xxx_platform_data *pdata = + (struct ci13xxx_platform_data *)(dev->platform_data); int retval = 0, i; trace("%p, %p, %p", dev, regs, driver->name); @@ -3360,6 +3362,9 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev, INIT_LIST_HEAD(&udc->gadget.ep_list); udc->gadget.ep0 = NULL; + if (pdata) + udc->gadget.usb_core_id = pdata->usb_core_id; + dev_set_name(&udc->gadget.dev, "gadget"); udc->gadget.dev.dma_mask = dev->dma_mask; udc->gadget.dev.coherent_dma_mask = dev->coherent_dma_mask; diff --git a/drivers/usb/gadget/ci13xxx_udc.h b/drivers/usb/gadget/ci13xxx_udc.h index b20ca97945c..ac09abe9947 100644 --- a/drivers/usb/gadget/ci13xxx_udc.h +++ b/drivers/usb/gadget/ci13xxx_udc.h @@ -158,6 +158,11 @@ struct ci13xxx { struct usb_phy *transceiver; /* Transceiver struct */ }; +struct ci13xxx_platform_data { + u8 usb_core_id; + void *prv_data; +}; + /****************************************************************************** * REGISTERS *****************************************************************************/