ehci-spear.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b) | ehci-spear.c (e1fd7341837238c6c5380c5073887d238f706cf0) |
---|---|
1/* 2* Driver for EHCI HCD on SPEAr SOC 3* 4* Copyright (C) 2010 ST Micro Electronics, 5* Deepak Sikri <deepak.sikri@st.com> 6* 7* Based on various ehci-*.c drivers 8* --- 67 unchanged lines hidden (view full) --- 76 goto fail; 77 } 78 79 /* 80 * Right now device-tree probed devices don't get dma_mask set. 81 * Since shared usb code relies on it, set it here for now. 82 * Once we have dma capability bindings this can go away. 83 */ | 1/* 2* Driver for EHCI HCD on SPEAr SOC 3* 4* Copyright (C) 2010 ST Micro Electronics, 5* Deepak Sikri <deepak.sikri@st.com> 6* 7* Based on various ehci-*.c drivers 8* --- 67 unchanged lines hidden (view full) --- 76 goto fail; 77 } 78 79 /* 80 * Right now device-tree probed devices don't get dma_mask set. 81 * Since shared usb code relies on it, set it here for now. 82 * Once we have dma capability bindings this can go away. 83 */ |
84 if (!pdev->dev.dma_mask) 85 pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; 86 retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); | 84 retval = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); |
87 if (retval) 88 goto fail; 89 90 usbh_clk = devm_clk_get(&pdev->dev, NULL); 91 if (IS_ERR(usbh_clk)) { 92 dev_err(&pdev->dev, "Error getting interface clock\n"); 93 retval = PTR_ERR(usbh_clk); 94 goto fail; --- 109 unchanged lines hidden --- | 85 if (retval) 86 goto fail; 87 88 usbh_clk = devm_clk_get(&pdev->dev, NULL); 89 if (IS_ERR(usbh_clk)) { 90 dev_err(&pdev->dev, "Error getting interface clock\n"); 91 retval = PTR_ERR(usbh_clk); 92 goto fail; --- 109 unchanged lines hidden --- |