diff options
-rw-r--r-- | drivers/usb/host/xhci-plat.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 08d402b15482..0e11d61408ff 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c | |||
@@ -83,16 +83,6 @@ static int xhci_plat_probe(struct platform_device *pdev) | |||
83 | if (irq < 0) | 83 | if (irq < 0) |
84 | return -ENODEV; | 84 | return -ENODEV; |
85 | 85 | ||
86 | |||
87 | if (of_device_is_compatible(pdev->dev.of_node, | ||
88 | "marvell,armada-375-xhci") || | ||
89 | of_device_is_compatible(pdev->dev.of_node, | ||
90 | "marvell,armada-380-xhci")) { | ||
91 | ret = xhci_mvebu_mbus_init_quirk(pdev); | ||
92 | if (ret) | ||
93 | return ret; | ||
94 | } | ||
95 | |||
96 | /* Initialize dma_mask and coherent_dma_mask to 32-bits */ | 86 | /* Initialize dma_mask and coherent_dma_mask to 32-bits */ |
97 | ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); | 87 | ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
98 | if (ret) | 88 | if (ret) |
@@ -127,6 +117,15 @@ static int xhci_plat_probe(struct platform_device *pdev) | |||
127 | goto put_hcd; | 117 | goto put_hcd; |
128 | } | 118 | } |
129 | 119 | ||
120 | if (of_device_is_compatible(pdev->dev.of_node, | ||
121 | "marvell,armada-375-xhci") || | ||
122 | of_device_is_compatible(pdev->dev.of_node, | ||
123 | "marvell,armada-380-xhci")) { | ||
124 | ret = xhci_mvebu_mbus_init_quirk(pdev); | ||
125 | if (ret) | ||
126 | goto disable_clk; | ||
127 | } | ||
128 | |||
130 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); | 129 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
131 | if (ret) | 130 | if (ret) |
132 | goto disable_clk; | 131 | goto disable_clk; |