ehci-omap.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b) ehci-omap.c (e1fd7341837238c6c5380c5073887d238f706cf0)
1/*
2 * ehci-omap.c - driver for USBHOST on OMAP3/4 processors
3 *
4 * Bus Glue for the EHCI controllers in OMAP3/4
5 * Tested on several OMAP3 boards, and OMAP4 Pandaboard
6 *
7 * Copyright (C) 2007-2013 Texas Instruments, Inc.
8 * Author: Vikram Pandita <vikram.pandita@ti.com>

--- 130 unchanged lines hidden (view full) ---

139 if (IS_ERR(regs))
140 return PTR_ERR(regs);
141
142 /*
143 * Right now device-tree probed devices don't get dma_mask set.
144 * Since shared usb code relies on it, set it here for now.
145 * Once we have dma capability bindings this can go away.
146 */
1/*
2 * ehci-omap.c - driver for USBHOST on OMAP3/4 processors
3 *
4 * Bus Glue for the EHCI controllers in OMAP3/4
5 * Tested on several OMAP3 boards, and OMAP4 Pandaboard
6 *
7 * Copyright (C) 2007-2013 Texas Instruments, Inc.
8 * Author: Vikram Pandita <vikram.pandita@ti.com>

--- 130 unchanged lines hidden (view full) ---

139 if (IS_ERR(regs))
140 return PTR_ERR(regs);
141
142 /*
143 * Right now device-tree probed devices don't get dma_mask set.
144 * Since shared usb code relies on it, set it here for now.
145 * Once we have dma capability bindings this can go away.
146 */
147 if (!dev->dma_mask)
148 dev->dma_mask = &dev->coherent_dma_mask;
149 ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
147 ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
150 if (ret)
151 return ret;
152
153 ret = -ENODEV;
154 hcd = usb_create_hcd(&ehci_omap_hc_driver, dev,
155 dev_name(dev));
156 if (!hcd) {
157 dev_err(dev, "Failed to create HCD\n");

--- 171 unchanged lines hidden --- 		148 if (ret)
149 return ret;
150
151 ret = -ENODEV;
152 hcd = usb_create_hcd(&ehci_omap_hc_driver, dev,
153 dev_name(dev));
154 if (!hcd) {
155 dev_err(dev, "Failed to create HCD\n");

--- 171 unchanged lines hidden ---