ehci-omap.c (e3c55d406bd8df1a878546002c93db90c42be10c) ehci-omap.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b)
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>

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

99 */
100static int ehci_hcd_omap_probe(struct platform_device *pdev)
101{
102 struct device *dev = &pdev->dev;
103 struct usbhs_omap_platform_data *pdata = dev_get_platdata(dev);
104 struct resource *res;
105 struct usb_hcd *hcd;
106 void __iomem *regs;
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>

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

99 */
100static int ehci_hcd_omap_probe(struct platform_device *pdev)
101{
102 struct device *dev = &pdev->dev;
103 struct usbhs_omap_platform_data *pdata = dev_get_platdata(dev);
104 struct resource *res;
105 struct usb_hcd *hcd;
106 void __iomem *regs;
107 int ret = -ENODEV;
107 int ret;
108 int irq;
109 int i;
110 struct omap_hcd *omap;
111
112 if (usb_disabled())
113 return -ENODEV;
114
115 if (!dev->parent) {

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

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;
108 int irq;
109 int i;
110 struct omap_hcd *omap;
111
112 if (usb_disabled())
113 return -ENODEV;
114
115 if (!dev->parent) {

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

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 if (!dev->coherent_dma_mask)
150 dev->coherent_dma_mask = DMA_BIT_MASK(32);
149 ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
150 if (ret)
151 return ret;
151
152
153 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");
156 return -ENOMEM;
157 }
158
159 hcd->rsrc_start = res->start;

--- 167 unchanged lines hidden --- 		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");
158 return -ENOMEM;
159 }
160
161 hcd->rsrc_start = res->start;

--- 167 unchanged lines hidden ---