usb: renesas_usbhs: use usb_gadget_{un}map_request_by_dev() for IPMMU

The previous code could use the first USB-DMAC with IPMMU if iommus
property was set into this device node. However, in this case, it
could not control the second USB-DMAC with IPMMU because a parameter
of IPMMU (micro-TLB id) is different with each USB-DMAC.

So, this patch uses the usb_gadget_{un}map_request_by_dev() APIs for
IPMMU. (Then, iommus property should be set into USB-DMAC node(s).)

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index d701ae643acecdf623ad60e9cc84ac1ca310a61d..30345c2d01be526aa4e8080b15c5cfc5ebdc8d3b 100644 (file)
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -197,8 +197,6 @@ static int usbhsg_dma_map_ctrl(struct device *dma_dev, struct usbhs_pkt *pkt,
        struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt);
        struct usb_request *req = &ureq->req;
        struct usbhs_pipe *pipe = pkt->pipe;
-       struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe);
-       struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep);
        enum dma_data_direction dir;
        int ret = 0;
 
@@ -208,13 +206,13 @@ static int usbhsg_dma_map_ctrl(struct device *dma_dev, struct usbhs_pkt *pkt,
                /* it can not use scatter/gather */
                WARN_ON(req->num_sgs);
 
-               ret = usb_gadget_map_request(&gpriv->gadget, req, dir);
+               ret = usb_gadget_map_request_by_dev(dma_dev, req, dir);
                if (ret < 0)
                        return ret;
 
                pkt->dma = req->dma;
        } else {
-               usb_gadget_unmap_request(&gpriv->gadget, req, dir);
+               usb_gadget_unmap_request_by_dev(dma_dev, req, dir);
        }
 
        return ret;