ohci-pxa27x.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b) ohci-pxa27x.c (e1fd7341837238c6c5380c5073887d238f706cf0)
1/*
2 * OHCI HCD (Host Controller Driver) for USB.
3 *
4 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
5 * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
6 * (C) Copyright 2002 Hewlett-Packard Company
7 *
8 * Bus Glue for pxa27x

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

291
292 if (!np)
293 return 0;
294
295 /* Right now device-tree probed devices don't get dma_mask set.
296 * Since shared usb code relies on it, set it here for now.
297 * Once we have dma capability bindings this can go away.
298 */
1/*
2 * OHCI HCD (Host Controller Driver) for USB.
3 *
4 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
5 * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
6 * (C) Copyright 2002 Hewlett-Packard Company
7 *
8 * Bus Glue for pxa27x

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

291
292 if (!np)
293 return 0;
294
295 /* Right now device-tree probed devices don't get dma_mask set.
296 * Since shared usb code relies on it, set it here for now.
297 * Once we have dma capability bindings this can go away.
298 */
299 if (!pdev->dev.dma_mask)
300 pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
301 ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
299 ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
302 if (ret)
303 return ret;
304
305 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
306 if (!pdata)
307 return -ENOMEM;
308
309 if (of_get_property(np, "marvell,enable-port1", NULL))

--- 312 unchanged lines hidden --- 		300 if (ret)
301 return ret;
302
303 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
304 if (!pdata)
305 return -ENOMEM;
306
307 if (of_get_property(np, "marvell,enable-port1", NULL))

--- 312 unchanged lines hidden ---