Commit aeb78cda authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

usb: chipidea: use bus->sysdev for DMA configuration

Set the dma for chipidea from sysdev. This is inherited from its
parent node. Also, do not set dma mask for child as it is not required
now.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSriram Dash <sriram.dash@nxp.com>
Acked-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8c06e40
...@@ -783,9 +783,6 @@ struct platform_device *ci_hdrc_add_device(struct device *dev, ...@@ -783,9 +783,6 @@ struct platform_device *ci_hdrc_add_device(struct device *dev,
} }
pdev->dev.parent = dev; pdev->dev.parent = dev;
pdev->dev.dma_mask = dev->dma_mask;
pdev->dev.dma_parms = dev->dma_parms;
dma_set_coherent_mask(&pdev->dev, dev->coherent_dma_mask);
ret = platform_device_add_resources(pdev, res, nres); ret = platform_device_add_resources(pdev, res, nres);
if (ret) if (ret)
......
...@@ -123,7 +123,8 @@ static int host_start(struct ci_hdrc *ci) ...@@ -123,7 +123,8 @@ static int host_start(struct ci_hdrc *ci)
if (usb_disabled()) if (usb_disabled())
return -ENODEV; return -ENODEV;
hcd = usb_create_hcd(&ci_ehci_hc_driver, ci->dev, dev_name(ci->dev)); hcd = __usb_create_hcd(&ci_ehci_hc_driver, ci->dev->parent,
ci->dev, dev_name(ci->dev), NULL);
if (!hcd) if (!hcd)
return -ENOMEM; return -ENOMEM;
......
...@@ -423,7 +423,8 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) ...@@ -423,7 +423,8 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
hwreq->req.status = -EALREADY; hwreq->req.status = -EALREADY;
ret = usb_gadget_map_request(&ci->gadget, &hwreq->req, hwep->dir); ret = usb_gadget_map_request_by_dev(ci->dev->parent,
&hwreq->req, hwep->dir);
if (ret) if (ret)
return ret; return ret;
...@@ -603,7 +604,8 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) ...@@ -603,7 +604,8 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
list_del_init(&node->td); list_del_init(&node->td);
} }
usb_gadget_unmap_request(&hwep->ci->gadget, &hwreq->req, hwep->dir); usb_gadget_unmap_request_by_dev(hwep->ci->dev->parent,
&hwreq->req, hwep->dir);
hwreq->req.actual += actual; hwreq->req.actual += actual;
...@@ -1899,13 +1901,13 @@ static int udc_start(struct ci_hdrc *ci) ...@@ -1899,13 +1901,13 @@ static int udc_start(struct ci_hdrc *ci)
INIT_LIST_HEAD(&ci->gadget.ep_list); INIT_LIST_HEAD(&ci->gadget.ep_list);
/* alloc resources */ /* alloc resources */
ci->qh_pool = dma_pool_create("ci_hw_qh", dev, ci->qh_pool = dma_pool_create("ci_hw_qh", dev->parent,
sizeof(struct ci_hw_qh), sizeof(struct ci_hw_qh),
64, CI_HDRC_PAGE_SIZE); 64, CI_HDRC_PAGE_SIZE);
if (ci->qh_pool == NULL) if (ci->qh_pool == NULL)
return -ENOMEM; return -ENOMEM;
ci->td_pool = dma_pool_create("ci_hw_td", dev, ci->td_pool = dma_pool_create("ci_hw_td", dev->parent,
sizeof(struct ci_hw_td), sizeof(struct ci_hw_td),
64, CI_HDRC_PAGE_SIZE); 64, CI_HDRC_PAGE_SIZE);
if (ci->td_pool == NULL) { if (ci->td_pool == NULL) {
......
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